This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 00608ab CAMEL-13548: Upgrade jaxb-maven-plugin to 2.5.0 and remove
temporal JDK11 workarounds
00608ab is described below
commit 00608ab1f9527d74dc4416f311f8fff92f163030
Author: Jan Bednář <[email protected]>
AuthorDate: Sun Jul 14 01:30:33 2019 +0200
CAMEL-13548: Upgrade jaxb-maven-plugin to 2.5.0 and remove temporal JDK11
workarounds
---
components/camel-blueprint/pom.xml | 97 ++++++++------------------------------
components/camel-spring/pom.xml | 89 ++++++++--------------------------
parent/pom.xml | 3 +-
3 files changed, 41 insertions(+), 148 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index d90d5bc..8fa489b 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -248,7 +248,26 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>schemagen</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/schema</outputDirectory>
+ <sources>
+ <source>${project.build.directory}/schema-src</source>
+ </sources>
+ <createJavaDocAnnotations>false</createJavaDocAnnotations>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -478,81 +497,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>(,1.8]</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-schema</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>schemagen</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<outputDirectory>${project.build.directory}/schema</outputDirectory>
- <sources>
-
<source>${project.build.directory}/schema-src</source>
- </sources>
-
<createJavaDocAnnotations>false</createJavaDocAnnotations>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- <property>
- <name>!os.unsupported.schemagen</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- </configuration>
- </plugin>
- <plugin>
- <!--Workaround until
https://github.com/mojohaus/jaxb2-maven-plugin/pull/126/ is resolved-->
- <groupId>com.github.davidmoten</groupId>
- <artifactId>jax-maven-plugin</artifactId>
- <version>${jax-maven-plugin-version}</version>
- <executions>
- <execution>
- <id>generate schema</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>schemagen</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <classpathScope>compile</classpathScope>
- <sources>
-
<source>${project.build.directory}/schema-src</source>
- </sources>
- <arguments>
- <argument>-d</argument>
-
<argument>${project.build.directory}/schema</argument>
- <argument>-episode</argument>
-
<argument>${project.build.directory}/schema/META-INF/JAXB/episode_generate-schema.xjb</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index d9efcae..d0e1a6f 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -274,7 +274,26 @@
</plugins>
</pluginManagement>
<plugins>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>schemagen</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/schema</outputDirectory>
+ <sources>
+ <source>${project.build.directory}/schema-src</source>
+ </sources>
+ <createJavaDocAnnotations>false</createJavaDocAnnotations>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
@@ -668,73 +687,5 @@
<platform.skip.tests>org/apache/camel/spring/management/**/*.java</platform.skip.tests>
</properties>
</profile>
-
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>(,1.8]</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate schema</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>schemagen</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<outputDirectory>${project.build.directory}/schema</outputDirectory>
- <sources>
-
<source>${project.build.directory}/schema-src</source>
- </sources>
-
<createJavaDocAnnotations>false</createJavaDocAnnotations>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Workaround until
https://github.com/mojohaus/jaxb2-maven-plugin/pull/126/ is resolved-->
- <groupId>com.github.davidmoten</groupId>
- <artifactId>jax-maven-plugin</artifactId>
- <version>${jax-maven-plugin-version}</version>
- <executions>
- <execution>
- <id>generate schema</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>schemagen</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sources>
-
<source>${project.build.directory}/schema-src</source>
- </sources>
- <arguments>
- <argument>-d</argument>
-
<argument>${project.build.directory}/schema</argument>
- <argument>-episode</argument>
-
<argument>${project.build.directory}/schema/META-INF/JAXB/episode_generate-schema.xjb</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index dc535f3..e6154ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -324,8 +324,7 @@
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
<glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
- <jax-maven-plugin-version>0.1.6</jax-maven-plugin-version>
- <jaxb2-maven-plugin-version>2.4</jaxb2-maven-plugin-version>
+ <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
<!-- Avoid upgrading to newer version for the moment: see
https://issues.apache.org/jira/browse/CAMEL-13654 -->
<jbpm-version>7.22.0.Final</jbpm-version>
<jboss-logging-version>3.3.2.Final</jboss-logging-version>
