You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/02/20 11:56:55 UTC
[camel] branch jenkins-pipeline updated (11842f5 -> 54dfb45)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 11842f5 CAMEL-11930: pipeline e-mail support
add 4576c1b CAMEL-11930: pipeline e-mail support
new 0f85182 CAMEL-11930: camel-spring and camel-blueprint: ...
new 54dfb45 CAMEL-11930: camel-box and camel-linkedin make ...
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 1 -
components/camel-blueprint/pom.xml | 14 +++++++---
components/camel-box/camel-box-api/pom.xml | 1 +
.../camel-linkedin/camel-linkedin-api/pom.xml | 1 +
components/camel-spring/pom.xml | 30 +++++++++++++++-------
5 files changed, 33 insertions(+), 14 deletions(-)
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 01/02: CAMEL-11930: camel-spring and camel-blueprint: ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0f85182663769890cb8837c3174812f62035c1e2
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 20 12:41:46 2018 +0100
CAMEL-11930: camel-spring and camel-blueprint: ...
...make `test` goal execute successfully
Ant task to manipulate schemas fails if the `schema1.xsd` doesn't exist
and this could be because it was moved by previous execution. That is
running `mvn test` after `mvn install` fails because `schema1.xsd` no
longer exists.
This adds a condition so if `schema1.xsd` is not present schema
manipulation is skipped.
Affected components are `camel-spring` and `camel-blueprint`.
---
components/camel-blueprint/pom.xml | 14 ++++++++++----
components/camel-spring/pom.xml | 30 +++++++++++++++++++++---------
2 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 53e0021..91f14ba 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -387,10 +387,16 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <move file="${project.build.directory}/schema/schema1.xsd"
- tofile="${project.build.directory}/schema/camel-blueprint.xsd"/>
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.build.directory}/schema/schema1.xsd"
+ tofile="${project.build.directory}/schema/camel-blueprint.xsd"/>
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index cbcb8cb..00d0026 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -581,9 +581,15 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
@@ -649,12 +655,18 @@
<phase>process-test-sources</phase>
<configuration>
<target>
- <echo>Copying XSD schema to be included in JAR</echo>
- <replace file="${project.build.directory}/schema/schema1.xsd"
- token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
- value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""/>
- <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
- <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <if>
+ <available file="${project.build.directory}/schema/schema1.xsd" />
+ <then>
+ <echo>Copying XSD schema to be included in JAR</echo>
+ <replace file="${project.build.directory}/schema/schema1.xsd"
+ token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
+ value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""/>
+ <move file="${project.build.directory}/schema/schema1.xsd" tofile="${project.build.directory}/schema/camel-spring.xsd" />
+ <delete file="${project.build.directory}/schema/schema2.xsd"/>
+ </then>
+ </if>
</target>
</configuration>
<goals>
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 02/02: CAMEL-11930: camel-box and camel-linkedin make ...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch jenkins-pipeline
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 54dfb4517d43e07468b712da95d9d88914d93f89
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 20 12:46:21 2018 +0100
CAMEL-11930: camel-box and camel-linkedin make ...
...`test` goal execute successfully
`camel-box` and `camel-linkedin` components uses
`camel-api-component-maven-plugin` to generate sources, this fails if
javadoc is not present.
If run via `mvn install` this works as the javadoc dependency is present
in the reactor. If run with just `mvn test` this fails as it is not.
This moves the `maven-javadoc-plugin` to phase `generate-test-resources`
so that it will be present when running `mvn test`.
---
components/camel-box/camel-box-api/pom.xml | 1 +
components/camel-linkedin/camel-linkedin-api/pom.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index cc10aa8..b52ffa6 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -50,6 +50,7 @@
<executions>
<execution>
<id>add-javadoc</id>
+ <phase>generate-test-resources</phase>
<goals>
<goal>jar</goal>
</goals>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 4c42720..3a49d71 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -191,6 +191,7 @@
<executions>
<execution>
<id>add-javadoc</id>
+ <phase>generate-test-resources</phase>
<goals>
<goal>jar</goal>
</goals>
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.