You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/10/15 08:07:51 UTC
camel git commit: Upgade jaxb-core from '2.2.11' to '2.3.0'
Repository: camel
Updated Branches:
refs/heads/master 2355265a5 -> 2368653ca
Upgade jaxb-core from '2.2.11' to '2.3.0'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2368653c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2368653c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2368653c
Branch: refs/heads/master
Commit: 2368653ca93a39d7ee818cc10f7239caf45fffeb
Parents: 2355265
Author: Ramu <kk...@redhat.com>
Authored: Fri Oct 13 19:57:14 2017 +0530
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 15 09:27:27 2017 +0200
----------------------------------------------------------------------
camel-core/pom.xml | 4 +-
components/camel-blueprint/pom.xml | 144 ++++++++++++-------
components/camel-spring/pom.xml | 53 +++++--
parent/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 6 +-
pom.xml | 2 +-
6 files changed, 139 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f0a4c07..3c1bf09 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -695,12 +695,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/components/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 6ce1dc1..d23ef1d 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -324,6 +324,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
<inherited>true</inherited>
<dependencies>
<!-- need JAXB on the classpath to use the xjc SchemaGenTask -->
@@ -359,7 +360,7 @@
<phase>process-classes</phase>
<configuration>
<target>
- <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
<echo>Copying to code together for the XSD generation</echo>
<mkdir dir="${project.build.directory}/schema-src" />
@@ -384,62 +385,95 @@
</fileset>
</copy>
- <echo>Generating XSD schema</echo>
- <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
- <schema namespace="http://camel.apache.org/schema/spring" file="camel-blueprint.xsd" />
- <compilerarg line="-target ${jdk.version}"/>
- <compilerarg line="-source ${jdk.version}"/>
- <classpath refid="maven.compile.classpath" />
- </schemagen>
-
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>include-sources</id>
- <phase>package</phase>
- <configuration>
- <target>
- <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
- <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true">
- <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*" />
- <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*" />
- </jar>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <!-- after the eip-documentation-enricher we need to copy some shchema files -->
- <execution>
- <id>include-schemas</id>
- <phase>prepare-package</phase>
+ <path id ="source.files.list">
+ <fileset dir="${project.build.directory}/schema-src">
+ <include name="**/*.java" />
+ </fileset>
+ </path>
+ <property name="source.files.property" refid="source.files.list"/>
+ <propertyregex property="schema.source.formatted" input="${source.files.property}" regexp=":" replace=" " global="true" />
+ <property name="schema.source.files" value="${schema.source.formatted}"/>
+ <echo>Schema files ${schema.source.files}</echo>
+ </target>
+ <exportAntProperties>true</exportAntProperties>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>include-sources</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo>
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true">
+ <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*" />
+ <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*" />
+ </jar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-schema</id>
+ <phase>process-test-sources</phase>
+ <configuration>
+ <target>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.basedir}/schema1.xsd" tofile="${project.build.directory}/schema/camel-blueprint.xsd" />
+ <delete file="${project.basedir}/schema2.xsd"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <!-- after the eip-documentation-enricher we need to copy some shchema files -->
+ <execution>
+ <id>include-schemas</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <replace file="${project.build.directory}/schema/camel-blueprint.xsd" token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint" />
+ <copy todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/schema" />
+ </copy>
+ <!-- copy modified schemas back again in classes so they are included in the JAR -->
+ <copy todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/schema" />
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <replace file="${project.build.directory}/schema/camel-blueprint.xsd" token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint" />
- <copy todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/schema" />
- </copy>
- <!-- copy modified schemas back again in classes so they are included in the JAR -->
- <copy todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/schema" />
- </copy>
- </target>
+ <executable>schemagen</executable>
+ <commandlineArgs>-cp %classpath ${schema.source.files}</commandlineArgs>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>on-ibmjdk</id>
<activation>
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 455ebce..795e651 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -573,7 +573,7 @@
</dependencies>
</profile>
- <profile>
+ <profile>
<id>jdk8</id>
<activation>
<jdk>(,1.8]</jdk>
@@ -597,17 +597,33 @@
<execution>
<id>generate-schema</id>
<phase>process-classes</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <path id ="source.files.list">
+ <fileset dir="${project.build.directory}/schema-src">
+ <include name="**/*.java" />
+ </fileset>
+ </path>
+ <property name="source.files.property" refid="source.files.list"/>
+ <propertyregex property="schema.source.formatted" input="${source.files.property}" regexp=":" replace=" " global="true" />
+ <property name="schema.source.files" value="${schema.source.formatted}"/>
+ <echo>Schema files ${schema.source.files}</echo>
+ </target>
+ <exportAntProperties>true</exportAntProperties>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cpy-schema</id>
+ <phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Generating XSD schema</echo>
- <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
- <mkdir dir="${project.build.directory}/schema" />
- <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
- <schema namespace="http://camel.apache.org/schema/spring" file="camel-spring.xsd" />
- <compilerarg line="-target ${jdk.version}"/>
- <compilerarg line="-source ${jdk.version}"/>
- <classpath refid="maven.compile.classpath" />
- </schemagen>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.basedir}/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
+ <delete file="${project.basedir}/schema2.xsd"/>
</target>
</configuration>
<goals>
@@ -616,6 +632,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate schema</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>schemagen</executable>
+ <commandlineArgs>-cp %classpath ${schema.source.files}</commandlineArgs>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a7ced90..980d6a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5387,7 +5387,7 @@
<!-- Update JAXB version here -->
<properties>
- <jaxb-version>2.2.11</jaxb-version>
+ <jaxb-version>2.3.0</jaxb-version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 2bb397b..6af9949 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -93,12 +93,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
<exclusions>
<exclusion>
<groupId>javax.jws</groupId>
@@ -109,7 +109,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.parsers</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/2368653c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14853a0..23b1694 100755
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
- <jaxb-version>2.2.11</jaxb-version>
+ <jaxb-version>2.3.0</jaxb-version>
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.5</gmavenplus-plugin-version>