update parent, plugins, remove timestamp
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index a7d8721..b1aa196 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/jaxb-api/pom.xml b/jaxb-api/pom.xml
index 0987905..a444514 100644
--- a/jaxb-api/pom.xml
+++ b/jaxb-api/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -65,62 +65,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
<configuration>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
<shortRevisionLength>7</shortRevisionLength>
<revisionOnScmFailure>false</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <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>${spec.version}.${impl.version}</Implementation-Version>
- <Specification-Version>${spec.version}</Specification-Version>
- <Export-Package>${api.package}.*; version=${spec.version}.${impl.version}</Export-Package>
- <Import-Package>
- javax.activation;version=!,
- javax.xml.bind;version="[${spec.version},3)",
- javax.xml.bind.annotation;version="[${spec.version},3)",
- javax.xml.bind.annotation.adapters;version="[${spec.version},3)",
- javax.xml.bind.attachment;version="[${spec.version},3)",
- javax.xml.bind.helpers;version="[${spec.version},3)",
- javax.xml.bind.util;version="[${spec.version},3)",
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.stream,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.validation,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
- </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>${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
- <Multi-Release>true</Multi-Release>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
@@ -137,6 +88,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<nodeprecated>false</nodeprecated>
+ <notimestamp>true</notimestamp>
<use>false</use>
<author>true</author>
<version>true</version>
@@ -148,7 +100,7 @@
<bottom>
<![CDATA[
Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.<br>
-Copyright © 2019 Eclipse Foundation. All rights reserved.<br>
+Copyright © 2019, 2020 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>
@@ -250,29 +202,17 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>9</source>
+ <target>9</target>
+ <compilerArgs>
+ <arg>-Xlint:all</arg>
+ </compilerArgs>
+ </configuration>
<executions>
<execution>
- <id>default-compile</id>
- <configuration>
- <excludes>
- <exclude>module-info.java</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>module-info-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <release>9</release>
- <includes>
- <include>module-info.java</include>
- </includes>
- </configuration>
- </execution>
- <execution>
<id>default-compile-mr</id>
<goals>
<goal>compile</goal>
@@ -285,6 +225,18 @@
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>base-compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>8</release>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -297,6 +249,32 @@
<goals>
<goal>manifest</goal>
</goals>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <instructions>
+ <_removeheaders>Bnd-LastModified,Built-By,Include-Resource,Private-Package</_removeheaders>
+ <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>${spec.version}.${impl.version}</Implementation-Version>
+ <Specification-Version>${spec.version}</Specification-Version>
+ <Export-Package>${api.package}.*; version=${spec.version}.${impl.version}</Export-Package>
+ <Import-Package>
+ !org.glassfish.hk2.osgiresourcelocator,
+ javax.activation;version=!,
+ *
+ </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>${scmBranch}-${buildNumber}</Implementation-Build-Id>
+ <Multi-Release>true</Multi-Release>
+ </instructions>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/pom.xml b/pom.xml
index 4da95f8..09d023f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6</version>
</parent>
<groupId>jakarta.xml.bind</groupId>
@@ -84,9 +84,9 @@
<extension.name>jakarta.xml.bind</extension.name>
<spec.version>2.3</spec.version>
<impl.version>3</impl.version>
- <activation.version>1.2.2</activation.version>
+ <activation.version>1.2.1</activation.version>
<config.dir>${project.basedir}/etc/config</config.dir>
- <vendor.name>Oracle Corporation</vendor.name>
+ <vendor.name>Eclipse Foundation</vendor.name>
</properties>
<modules>
@@ -109,6 +109,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
@@ -119,7 +124,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -131,15 +136,20 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>4.2.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -207,7 +217,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
- <Implementation-Build-Id>${project.version} - ${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
+ <Implementation-Build-Id>${project.version} - ${scmBranch}-${buildNumber}</Implementation-Build-Id>
</manifestEntries>
</archive>
</configuration>
