Integrate activation 2.0.0 Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-api/pom.xml b/jaxb-api/pom.xml index 616f28d..6b2ab44 100644 --- a/jaxb-api/pom.xml +++ b/jaxb-api/pom.xml
@@ -30,9 +30,12 @@ </properties> <dependencies> + <!-- usign '-api' artifact here is causing issues for API consumers, + ie conflicts on JPMS, since one cannot have two artifacts having same + packages on the path and 'provided' scope is not transitive --> <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> </dependency> </dependencies>
diff --git a/pom.xml b/pom.xml index 0e2d8de..ce3a7c3 100644 --- a/pom.xml +++ b/pom.xml
@@ -77,7 +77,7 @@ <spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude> <spotbugs.skip>false</spotbugs.skip> <spotbugs.threshold>Low</spotbugs.threshold> - <spotbugs.version>4.0.0</spotbugs.version> + <spotbugs.version>4.0.4</spotbugs.version> <release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback> <release.spec.date>Jul 2017</release.spec.date> @@ -85,7 +85,7 @@ <extension.name>jakarta.xml.bind</extension.name> <spec.version>3.0</spec.version> <impl.version>0</impl.version> - <activation.version>2.0.0-RC3</activation.version> + <activation.version>2.0.0</activation.version> <config.dir>${project.basedir}/etc/config</config.dir> <vendor.name>Eclipse Foundation</vendor.name> </properties> @@ -102,6 +102,11 @@ <artifactId>jakarta.activation-api</artifactId> <version>${activation.version}</version> </dependency> + <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> + <version>${activation.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -116,7 +121,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -142,7 +147,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>4.2.1</version> + <version>5.1.1</version> <configuration> <instructions> <_noextraheaders>true</_noextraheaders> @@ -167,7 +172,7 @@ </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> </plugin> <plugin> <groupId>com.github.spotbugs</groupId>