Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Migrate Plugins to Jakarta EE 9 #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate Plugins to Jakarta EE 9 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.idea
*.iml
target/
17 changes: 9 additions & 8 deletions commons-lang-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<artifactId>jaxb2-commons-lang</artifactId>
<packaging>jar</packaging>

<version>2.5-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<!-- <version>2.5-SNAPSHOT</version>-->

<name>JAXB2 Commons - Commons Lang Plugin</name>

Expand Down Expand Up @@ -50,16 +51,16 @@
</scm>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.13</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2.1</version>
<version>3.12.0</version>
</dependency>
</dependencies>

Expand All @@ -70,8 +71,8 @@
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down
15 changes: 8 additions & 7 deletions default-value-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<artifactId>jaxb2-default-value</artifactId>
<packaging>jar</packaging>

<version>1.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<!-- <version>1.2-SNAPSHOT</version>-->

<name>JAXB2 Commons - Default Value Plugin</name>

Expand Down Expand Up @@ -50,12 +51,12 @@
</scm>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.13</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependency>
</dependencies>

<build>
Expand All @@ -65,8 +66,8 @@
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down
17 changes: 10 additions & 7 deletions fluent-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<artifactId>jaxb2-fluent-api</artifactId>
<packaging>jar</packaging>

<version>3.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<!-- <version>3.1-SNAPSHOT</version>-->

<name>JAXB2 Commons - Fluent API Plugin</name>

Expand Down Expand Up @@ -50,30 +51,32 @@
</scm>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.13</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<version>3.10.1</version>
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-source</id>
Expand Down
12 changes: 7 additions & 5 deletions namespace-prefix/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<artifactId>jaxb2-namespace-prefix</artifactId>
<packaging>jar</packaging>

<version>1.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<!-- <version>1.2-SNAPSHOT</version>-->

<name>JAXB2 - Namespace Prefix Plugin</name>

Expand Down Expand Up @@ -47,9 +48,9 @@

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.13</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -61,8 +62,8 @@
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -93,6 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.jvnet.jaxb2_commons.plugin.namespace_prefix;

import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import jakarta.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlSchema;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -33,9 +33,9 @@
import org.xml.sax.ErrorHandler;

/**
* This plugin adds {@link javax.xml.bind.annotation.XmlNs} annotations to <i>package-info.java</i> files. Those annotations tells Jaxb2 to generate XML schema's instances with specific namespaces
* This plugin adds {@link jakarta.xml.bind.annotation.XmlNs} annotations to <i>package-info.java</i> files. Those annotations tells Jaxb2 to generate XML schema's instances with specific namespaces
* prefixes, instead of the auto-generated (ns1, ns2, ...) prefixes. Definition of thoses prefixes is done in the bindings.xml file.
* <p/>
* <p>
* Bindings.xml file example:
* <pre>
* &lt;?xml version=&quot;1.0&quot;?&gt;
Expand Down
17 changes: 9 additions & 8 deletions value-constructor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-value-constructor</artifactId>
<packaging>jar</packaging>
<version>3.1-SNAPSHOT</version>

<version>4.0.0-SNAPSHOT</version>
<!-- <version>3.1-SNAPSHOT</version>-->

<name>JAXB2 Commons - Value Constructor Plugin</name>

<url>http://java.net/projects/jaxb2-commons/pages/value-constructor</url>
Expand Down Expand Up @@ -50,12 +51,12 @@
</scm>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.13</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependency>
</dependencies>

<build>
Expand All @@ -65,8 +66,8 @@
<inherited>true</inherited>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down