Fix artifactId. (#76)
Fixes #75
Signed-off-by: Tomas Kraus <Tomas.Kraus@oracle.com>
diff --git a/jaxb-api-test/pom.xml b/jaxb-api-test/pom.xml
index 5f17aab..0d5a0f7 100644
--- a/jaxb-api-test/pom.xml
+++ b/jaxb-api-test/pom.xml
@@ -13,13 +13,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>jaxb-api-parent</artifactId>
+ <artifactId>jakarta.xml.bind-api-parent</artifactId>
<groupId>jakarta.xml.bind</groupId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jaxb-api-test</artifactId>
+ <artifactId>jakarta.xml.bind-api-test</artifactId>
<packaging>jar</packaging>
<properties>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -84,7 +84,7 @@
<artifactItems>
<artifactItem>
<groupId>jakarta.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/modules</outputDirectory>
@@ -130,7 +130,7 @@
<!--module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar -->
<argLine>
--add-modules java.xml.bind
- --upgrade-module-path ${project.build.directory}/modules/jaxb-api-${project.version}.jar
+ --upgrade-module-path ${project.build.directory}/modules/jakarta.xml.bind-api-${project.version}.jar
--module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar
--add-reads java.xml.bind=ALL-UNNAMED
</argLine>
diff --git a/jaxb-api/pom.xml b/jaxb-api/pom.xml
index e5ebbd6..0d0c982 100644
--- a/jaxb-api/pom.xml
+++ b/jaxb-api/pom.xml
@@ -13,13 +13,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>jaxb-api-parent</artifactId>
+ <artifactId>jakarta.xml.bind-api-parent</artifactId>
<groupId>jakarta.xml.bind</groupId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jaxb-api</artifactId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<packaging>jar</packaging>
<properties>
@@ -46,7 +46,7 @@
<configuration>
<stagingRepos>
<stagingRepo>
- <ref>jakarta.xml.bind:jaxb-api:${project.version}:jar</ref>
+ <ref>jakarta.xml.bind:jakarta.xml.bind-api:${project.version}:jar</ref>
<profile>jakarta.xml.bind</profile>
</stagingRepo>
</stagingRepos>
@@ -166,7 +166,7 @@
org.xml.sax.ext,
org.xml.sax.helpers
</Import-Package>
- <Bundle-SymbolicName>jaxb-api</Bundle-SymbolicName>
+ <Bundle-SymbolicName>jakarta.xml.bind-api</Bundle-SymbolicName>
<DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package>
<Specification-Vendor>${vendor.name}</Specification-Vendor>
</instructions>
@@ -197,6 +197,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <doclint>none</doclint>
<nodeprecated>false</nodeprecated>
<use>false</use>
<author>true</author>
@@ -213,16 +214,10 @@
<header><![CDATA[JAXB<br>v${project.version}]]>
</header>
<bottom>
- <![CDATA[<br>Copyright © {inceptionYear}–{currentYear} {organizationName}.
+ <![CDATA[<br>Copyright © {inceptionYear}–{currentYear} Oracle and/or its affiliates.
All rights reserved.<br>Comments to : <a href="mailto:${release.spec.feedback}">${release.spec.feedback}</a>.]]>
</bottom>
<detectJavaApiLink>false</detectJavaApiLink>
- <offlineLinks>
- <offlineLink>
- <url>http://download.oracle.com/javase/8/docs/api/</url>
- <location>${basedir}/offline-javadoc</location>
- </offlineLink>
- </offlineLinks>
<tags>
<tag>
<name>apiNote</name>
@@ -409,7 +404,7 @@
<id>compile-java9</id>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<echo>${ant.version}</echo>
<!-- Build Java 9+classes -->
<mkdir dir="${java9.build.outputDirectory}"/>
@@ -419,7 +414,7 @@
modulepath="${project.build.directory}/modules"
includeantruntime="false" source="9" target="9">
</javac>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -429,11 +424,11 @@
<id>update-source-jar</id>
<phase>verify</phase>
<configuration>
- <tasks>
- <jar destfile="${project.build.directory}/jaxb-api-${project.version}-sources.jar" update="true">
+ <target>
+ <jar destfile="${project.build.directory}/jakarta.xml.bind-api-${project.version}-sources.jar" update="true">
<fileset dir="${project.build.directory}/mr-jar/" />
</jar>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -444,9 +439,9 @@
<id>update-target-classes</id>
<phase>prepare-package</phase>
<configuration>
- <tasks>
+ <target>
<delete file="${project.build.outputDirectory}/module-info.class"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/pom.xml b/pom.xml
index 70f3416..5b29cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<groupId>jakarta.xml.bind</groupId>
- <artifactId>jaxb-api-parent</artifactId>
+ <artifactId>jakarta.xml.bind-api-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Java Architecture for XML Binding</name>
@@ -79,7 +79,7 @@
<impl.version>0</impl.version>
<activation.version>1.2.1</activation.version>
<config.dir>${project.basedir}/etc/config</config.dir>
- <vendor.name>Eclipse Project for JAXB</vendor.name>
+ <vendor.name>Oracle Corporation</vendor.name>
</properties>
<modules>
