Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Replace embedded jsr305 dependency with OSGi bundle #1279

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Replace embedded jsr305 dependency with OSGi bundle #1279

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
541a7fd
chore(deps): replace jsr305 embedded jars with dedicated OSGi bundle
cmark Apr 17, 2024
3e9a669
fix(cis): use `jakarta.validation.constraints.PositiveOrZero` instead of
cmark Apr 17, 2024
cccc9c3
chore(dev): launch configuration sync after jsr305 dep changes
cmark Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...om/b2international/snowowl/snomed/cis/request/AbstractSnomedIdentifierCountedRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*/
package com.b2international.snowowl.snomed.cis.request;

import javax.annotation.Nonnegative;
import jakarta.validation.constraints.NotNull;

import com.b2international.snowowl.core.ServiceProvider;
import com.b2international.snowowl.core.events.Request;
import com.b2international.snowowl.core.terminology.ComponentCategory;
import com.b2international.snowowl.snomed.cis.domain.SctIds;
import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.PositiveOrZero;

/**
* @since 5.5
*/
Expand All @@ -37,7 +37,7 @@ abstract class AbstractSnomedIdentifierCountedRequest implements Request<Service
private final String namespace;

@JsonProperty
@Nonnegative
@PositiveOrZero
private final int quantity;

AbstractSnomedIdentifierCountedRequest(ComponentCategory category, String namespace, int quantity) {
Expand Down
1 change: 0 additions & 1 deletion commons/com.b2international.commons/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<classpathentry exported="true" kind="lib" path="lib/simpleclient_tracer_common-0.16.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-8.0.1.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.4.3.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/picocli-3.5.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/javax.annotation-api-1.3.1.jar"/>
<classpathentry kind="src" output="target/classes" path="src">
Expand Down
8 changes: 2 additions & 6 deletions commons/com.b2international.commons/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ Export-Package: com.b2international.commons,
io.prometheus.client,
io.prometheus.client.exporter.common,
javax.annotation,
javax.annotation.concurrent,
javax.annotation.meta,
javax.annotation.security,
javax.annotation.sql,
org.LatencyUtils,
org.hibernate.validator,
org.hibernate.validator.cfg,
Expand Down Expand Up @@ -106,7 +102,8 @@ Require-Bundle: com.google.inject;bundle-version="7.0.0";visibility:=reexport,
org.hdrhistogram.HdrHistogram;bundle-version="2.1.12",
com.fasterxml.classmate;bundle-version="1.3.4",
com.b2international.collections.api;visibility:=reexport,
org.glassfish.expressly;bundle-version="[5.0.0,6.0.0)"
org.glassfish.expressly;bundle-version="[5.0.0,6.0.0)",
org.jsr-305;bundle-version="3.0.2";visibility:=reexport
Import-Package: jakarta.el;version="[5.0.1,6.0.0)",
jakarta.inject;version="[2.0.1,3.0.0)",
jakarta.validation;version="3.0.2",
Expand Down Expand Up @@ -136,7 +133,6 @@ Bundle-ClassPath: .,
lib/LatencyUtils-2.0.3.jar,
lib/hibernate-validator-8.0.1.Final.jar,
lib/jboss-logging-3.4.3.Final.jar,
lib/jsr305-1.3.9.jar,
lib/picocli-3.5.1.jar,
lib/javax.annotation-api-1.3.1.jar
Bundle-ActivationPolicy: lazy
7 changes: 0 additions & 7 deletions commons/com.b2international.commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<!-- Console Lib -->
<picocli.version>3.5.1</picocli.version>
<!-- Java Annotations -->
<jsr305.version>1.3.9</jsr305.version>
<javax.annotation.version>1.3.1</javax.annotation.version>
</properties>

Expand Down Expand Up @@ -68,12 +67,6 @@
<version>${hibernate.validator.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
Expand Down
1 change: 0 additions & 1 deletion commons/com.b2international.index.es8/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-java-8.12.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-client-8.12.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta.json-api-2.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jsr305-3.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/opentelemetry-api-1.29.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/opentelemetry-context-1.29.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/parsson-1.0.5.jar"/>
Expand Down
1 change: 0 additions & 1 deletion commons/com.b2international.index.es8/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Bundle-ClassPath: .,
lib/elasticsearch-java-8.12.2.jar,
lib/elasticsearch-rest-client-8.12.2.jar,
lib/jakarta.json-api-2.0.2.jar,
lib/jsr305-3.0.2.jar,
lib/opentelemetry-api-1.29.0.jar,
lib/opentelemetry-context-1.29.0.jar,
lib/parsson-1.0.5.jar
Expand Down
1 change: 0 additions & 1 deletion commons/com.b2international.index.es8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
elasticsearch-java,
elasticsearch-rest-client,
jakarta.json-api,
jsr305,
parsson,
opentelemetry-context,
opentelemetry-api
Expand Down
7 changes: 7 additions & 0 deletions releng/target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,13 @@
<version>1.26.0</version>
<type>jar</type>
</dependency>
<!-- jsr305 (javax.annotations) -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<type>jar</type>
</dependency>
</dependencies>
<repositories>
<repository>
Expand Down
Loading