Skip to content

GitLab

Commit ea2f3282 authored by Lukas Jungmann's avatar Lukas Jungmann
Browse files

update build plugins, 

release date
Signed-off-by: default avatarLukas Jungmann <lukas.jungmann@oracle.com>
parent cae38758
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 45 deletions
.github/workflows/maven.yml
View file @ ea2f3282
...@@ -23,7 +23,7 @@ jobs: ...@@ -23,7 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
java_version: [ 11, 17-ea ] java_version: [ 11, 17 ]
steps: steps:
- name: Checkout for build - name: Checkout for build
...@@ -33,5 +33,6 @@ jobs: ...@@ -33,5 +33,6 @@ jobs:
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: ${{ matrix.java_version }} java-version: ${{ matrix.java_version }}
cache: maven
- name: Verify - 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
api/pom.xml
View file @ ea2f3282
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<bottom> <bottom>
<![CDATA[ <![CDATA[
Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br> Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br>
Copyright &#169; 2019, 2021 Eclipse Foundation. All rights reserved.<br> Copyright &#169; 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>.]]> Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom> </bottom>
<detectJavaApiLink>false</detectJavaApiLink> <detectJavaApiLink>false</detectJavaApiLink>
...@@ -125,6 +125,18 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top"> ...@@ -125,6 +125,18 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <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> <execution>
<id>add-legal-resource</id> <id>add-legal-resource</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
...@@ -192,25 +204,32 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top"> ...@@ -192,25 +204,32 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </goals>
<configuration> <configuration>
<instructions> <archive>
<Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull --> <manifest>
<Bundle-Description> <addDefaultEntries>false</addDefaultEntries>
Jakarta XML Binding API ${spec.version} Design Specification </manifest>
</Bundle-Description> </archive>
<Extension-Name>${extension.name}</Extension-Name> <niceManifest>true</niceManifest>
<Implementation-Version>${project.version}</Implementation-Version> <instructions>
<Specification-Version>${spec.version}</Specification-Version> <Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull -->
<Import-Package> <Bundle-Description>
!org.glassfish.hk2.osgiresourcelocator, Jakarta XML Binding API ${spec.version} Design Specification
* </Bundle-Description>
</Import-Package> <Extension-Name>${extension.name}</Extension-Name>
<Bundle-SymbolicName>${extension.name}-api</Bundle-SymbolicName> <Implementation-Version>${project.version}</Implementation-Version>
<DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package> <Specification-Version>${spec.version}</Specification-Version>
<Specification-Vendor>${vendor.name}</Specification-Vendor> <Import-Package>
<Implementation-Build-Id>${buildNumber}</Implementation-Build-Id> !org.glassfish.hk2.osgiresourcelocator,
</instructions> *
</configuration> </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> </execution>
</executions> </executions>
</plugin> </plugin>
...@@ -233,13 +252,6 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top"> ...@@ -233,13 +252,6 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<excludeFilterFile>${spotbugs.exclude}</excludeFilterFile> <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
<failThreshold>High</failThreshold> <failThreshold>High</failThreshold>
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
api/src/main/java/jakarta/xml/bind/ContextFinder.java
View file @ ea2f3282
...@@ -342,7 +342,7 @@ class ContextFinder { ...@@ -342,7 +342,7 @@ class ContextFinder {
logger.fine("Trying to create the platform default provider"); logger.fine("Trying to create the platform default provider");
Class<?> ctxFactoryClass = Class<?> ctxFactoryClass =
(Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader(JAXBContext.JAXB_CONTEXT_FACTORY, logger); ServiceLoaderUtil.lookupUsingOSGiServiceLoader(JAXBContext.JAXB_CONTEXT_FACTORY, logger);
if (ctxFactoryClass != null) { if (ctxFactoryClass != null) {
return newInstance(classes, properties, ctxFactoryClass); return newInstance(classes, properties, ctxFactoryClass);
...@@ -413,7 +413,6 @@ class ContextFinder { ...@@ -413,7 +413,6 @@ class ContextFinder {
return which(clazz, getClassClassLoader(clazz)); return which(clazz, getClassClassLoader(clazz));
} }
@SuppressWarnings("unchecked")
private static ClassLoader getContextClassLoader() { private static ClassLoader getContextClassLoader() {
if (System.getSecurityManager() == null) { if (System.getSecurityManager() == null) {
return Thread.currentThread().getContextClassLoader(); return Thread.currentThread().getContextClassLoader();
...@@ -428,7 +427,6 @@ class ContextFinder { ...@@ -428,7 +427,6 @@ class ContextFinder {
} }
} }
@SuppressWarnings("unchecked")
private static ClassLoader getClassClassLoader(final Class<?> c) { private static ClassLoader getClassClassLoader(final Class<?> c) {
if (System.getSecurityManager() == null) { if (System.getSecurityManager() == null) {
return c.getClassLoader(); return c.getClassLoader();
......
pom.xml
View file @ ea2f3282
...@@ -76,12 +76,12 @@ ...@@ -76,12 +76,12 @@
<copyright.update>false</copyright.update> <copyright.update>false</copyright.update>
<spotbugs.skip>false</spotbugs.skip> <spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold> <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> <maven.compiler.release>11</maven.compiler.release>
<release.spec.feedback>jaxb-dev@eclipse.org</release.spec.feedback> <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> <api.package>jakarta.xml.bind</api.package>
<extension.name>jakarta.xml.bind</extension.name> <extension.name>jakarta.xml.bind</extension.name>
<spec.version>4.0</spec.version> <spec.version>4.0</spec.version>
...@@ -115,11 +115,11 @@ ...@@ -115,11 +115,11 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version> <version>3.3.0</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.9.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.glassfish.copyright</groupId> <groupId>org.glassfish.copyright</groupId>
...@@ -141,16 +141,11 @@ ...@@ -141,16 +141,11 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version> <version>5.1.4</version>
<configuration>
<instructions>
<_noextraheaders>true</_noextraheaders>
</instructions>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.2.2</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
...@@ -185,8 +180,6 @@ ...@@ -185,8 +180,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
</compilerArgs> </compilerArgs>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Powered by Integricloud