update build plugins, release date Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6e668f7..617dfc2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -23,7 +23,7 @@ strategy: matrix: - java_version: [ 11, 17-ea ] + java_version: [ 11, 17 ] steps: - name: Checkout for build @@ -33,5 +33,6 @@ with: distribution: 'zulu' java-version: ${{ matrix.java_version }} + cache: maven - name: Verify - run: mvn -B -V -U -C -Poss-release -Pstaging clean verify -Dgpg.skip=true + run: mvn -B -V -U -C -Poss-release -Pstaging clean verify -Dgpg.skip=true org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dcopyright.ignoreyear=true
diff --git a/api/pom.xml b/api/pom.xml index f707cf8..ace2524 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -84,7 +84,7 @@ <bottom> <![CDATA[ Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br> -Copyright © 2019, 2021 Eclipse Foundation. All rights reserved.<br> +Copyright © 2019, ${current.year} Eclipse Foundation. All rights reserved.<br> Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]> </bottom> <detectJavaApiLink>false</detectJavaApiLink> @@ -126,6 +126,18 @@ <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> + <id>currentyear-property</id> + <goals> + <goal>timestamp-property</goal> + </goals> + <phase>validate</phase> + <configuration> + <name>current.year</name> + <locale>en,US</locale> + <pattern>yyyy</pattern> + </configuration> + </execution> + <execution> <id>add-legal-resource</id> <phase>generate-resources</phase> <goals> @@ -192,25 +204,32 @@ <goals> <goal>manifest</goal> </goals> - <configuration> - <instructions> - <Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull --> - <Bundle-Description> - Jakarta XML Binding API ${spec.version} Design Specification - </Bundle-Description> - <Extension-Name>${extension.name}</Extension-Name> - <Implementation-Version>${project.version}</Implementation-Version> - <Specification-Version>${spec.version}</Specification-Version> - <Import-Package> - !org.glassfish.hk2.osgiresourcelocator, - * - </Import-Package> - <Bundle-SymbolicName>${extension.name}-api</Bundle-SymbolicName> - <DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package> - <Specification-Vendor>${vendor.name}</Specification-Vendor> - <Implementation-Build-Id>${buildNumber}</Implementation-Build-Id> - </instructions> - </configuration> + <configuration> + <archive> + <manifest> + <addDefaultEntries>false</addDefaultEntries> + </manifest> + </archive> + <niceManifest>true</niceManifest> + <instructions> + <Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull --> + <Bundle-Description> + Jakarta XML Binding API ${spec.version} Design Specification + </Bundle-Description> + <Extension-Name>${extension.name}</Extension-Name> + <Implementation-Version>${project.version}</Implementation-Version> + <Specification-Version>${spec.version}</Specification-Version> + <Import-Package> + !org.glassfish.hk2.osgiresourcelocator, + * + </Import-Package> + <Bundle-SymbolicName>${extension.name}-api</Bundle-SymbolicName> + <DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package> + <Specification-Vendor>${vendor.name}</Specification-Vendor> + <Implementation-Build-Id>${buildNumber}</Implementation-Build-Id> + <_noextraheaders>true</_noextraheaders> + </instructions> + </configuration> </execution> </executions> </plugin> @@ -233,13 +252,6 @@ <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile> <failThreshold>High</failThreshold> </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build>
diff --git a/api/src/main/java/jakarta/xml/bind/ContextFinder.java b/api/src/main/java/jakarta/xml/bind/ContextFinder.java index cb614cb..c459bca 100644 --- a/api/src/main/java/jakarta/xml/bind/ContextFinder.java +++ b/api/src/main/java/jakarta/xml/bind/ContextFinder.java
@@ -342,7 +342,7 @@ logger.fine("Trying to create the platform default provider"); Class<?> ctxFactoryClass = - (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader(JAXBContext.JAXB_CONTEXT_FACTORY, logger); + ServiceLoaderUtil.lookupUsingOSGiServiceLoader(JAXBContext.JAXB_CONTEXT_FACTORY, logger); if (ctxFactoryClass != null) { return newInstance(classes, properties, ctxFactoryClass); @@ -413,7 +413,6 @@ return which(clazz, getClassClassLoader(clazz)); } - @SuppressWarnings("unchecked") private static ClassLoader getContextClassLoader() { if (System.getSecurityManager() == null) { return Thread.currentThread().getContextClassLoader(); @@ -428,7 +427,6 @@ } } - @SuppressWarnings("unchecked") private static ClassLoader getClassClassLoader(final Class<?> c) { if (System.getSecurityManager() == null) { return c.getClassLoader();
diff --git a/pom.xml b/pom.xml index eb07f3c..b7a8821 100644 --- a/pom.xml +++ b/pom.xml
@@ -76,12 +76,12 @@ <copyright.update>false</copyright.update> <spotbugs.skip>false</spotbugs.skip> <spotbugs.threshold>Low</spotbugs.threshold> - <spotbugs.version>4.5.0.0</spotbugs.version> + <spotbugs.version>4.5.3.0</spotbugs.version> <maven.compiler.release>11</maven.compiler.release> <release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback> - <release.spec.date>Jan 2022</release.spec.date> + <release.spec.date>Mar 2022</release.spec.date> <api.package>jakarta.xml.bind</api.package> <extension.name>jakarta.xml.bind</extension.name> <spec.version>4.0</spec.version> @@ -115,11 +115,11 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.2.0</version> + <version>3.3.0</version> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>3.9.0</version> </plugin> <plugin> <groupId>org.glassfish.copyright</groupId> @@ -141,16 +141,11 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>5.1.1</version> - <configuration> - <instructions> - <_noextraheaders>true</_noextraheaders> - </instructions> - </configuration> + <version>5.1.4</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>3.2.2</version> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> @@ -185,8 +180,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.8</source> - <target>1.8</target> <compilerArgs> <arg>-Xlint:all</arg> </compilerArgs>