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/03/18 08:57:29 UTC
[2/3] camel git commit: CAMEL-11009: Set the camel.schema.version
property earlier
CAMEL-11009: Set the camel.schema.version property earlier
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1737ded
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1737ded
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1737ded
Branch: refs/heads/master
Commit: f1737ded87c0c6cf994f99f780f9c5c4018ef901
Parents: 42c26f1
Author: aldettinger <al...@gmail.com>
Authored: Fri Mar 17 19:22:30 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 18 09:51:22 2017 +0100
----------------------------------------------------------------------
components/camel-spring/pom.xml | 46 ++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f1737ded/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 386b8c3..e44e5bf 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -278,12 +278,34 @@
</dependencies>
<executions>
<execution>
+ <id>store-camel-schema-version-in-file</id>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+ <property name="mv" value="${project.version}" />
+ <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+ <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+ <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+ <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+ <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
+ <mkdir dir="target" />
+ <echo file="target/camel.osgi.version.txt">
+ camel.schema.version = ${camel.schema.version}
+ </echo>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
<id>generate-sources</id>
<phase>process-classes</phase>
<configuration>
<target>
<taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
-
<echo>Copying code together for the XSD generation</echo>
<mkdir dir="${project.build.directory}/schema-src" />
<copy todir="${project.build.directory}/schema-src">
@@ -309,21 +331,6 @@
<include name="org/apache/camel/package-info.java" />
</fileset>
</copy>
-
-
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
- <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
- <property name="mv" value="${project.version}" />
- <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
- <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
- <mkdir dir="target" />
- <echo file="target/camel.osgi.version.txt">
- camel.schema.version = ${camel.schema.version}
- </echo>
-
<echo>Generating XSD schema</echo>
<mkdir dir="${project.build.directory}/schema" />
<schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
@@ -355,7 +362,7 @@
<goal>run</goal>
</goals>
</execution>
- <!-- after the eip-documentation-enricher we need to copy some shchema files -->
+ <!-- after the eip-documentation-enricher we need to copy some schema files -->
<execution>
<id>include-schemas</id>
<phase>prepare-package</phase>
@@ -377,12 +384,14 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<executions>
<execution>
- <phase>process-classes</phase>
+ <id>init-camel-schema-version-property-from-file</id>
+ <phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
@@ -394,6 +403,7 @@
</execution>
</executions>
</plugin>
+
<!-- add the sources from camel-core-osgi and camel-core-xml as source code in the camel-spring-sources.jar -->
<plugin>
<groupId>org.codehaus.mojo</groupId>