You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/07 07:48:08 UTC
[1/2] camel git commit: Change the parent version of test modules
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x [created] 970ca3b04
refs/heads/master 9c1089f93 -> 970ca3b04
Change the parent version of test modules
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3698f515
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3698f515
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3698f515
Branch: refs/heads/master
Commit: 3698f51568bed27b150f33baa445dcfceeeb7912
Parents: 9c1089f
Author: Willem Jiang <wi...@gmail.com>
Authored: Sat Mar 7 14:40:24 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Mar 7 14:41:17 2015 +0800
----------------------------------------------------------------------
tests/camel-itest-karaf/pom.xml | 2 +-
tests/camel-itest-osgi/pom.xml | 6 +++---
tests/camel-itest-performance/pom.xml | 8 ++++----
tests/camel-performance/pom.xml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3698f515/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index a43d29c..cd2e82e 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>tests</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <version>2.15.1-SNAPSHOT</version>
</parent>
<artifactId>camel-itest-karaf</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/3698f515/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 66fa057..798a3ea 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>tests</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <version>2.15.1-SNAPSHOT</version>
</parent>
<artifactId>camel-itest-osgi</artifactId>
@@ -586,14 +586,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <!-- when the local repo location has been specified, we need to pass
+ <!-- when the local repo location has been specified, we need to pass
on this information to PAX mvn url -->
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
- <!--There are some conflicts of the JAXB OSGi bundle and Hudson System
+ <!--There are some conflicts of the JAXB OSGi bundle and Hudson System
jar so I comment out these JAXB related tests -->
<exclude>**/OSGiIntegrationSpringTest.*</exclude>
<exclude>**/JaxbFallbackConverterTest.*</exclude>
http://git-wip-us.apache.org/repos/asf/camel/blob/3698f515/tests/camel-itest-performance/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml
index 91f5b04..8b6ee69 100644
--- a/tests/camel-itest-performance/pom.xml
+++ b/tests/camel-itest-performance/pom.xml
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>tests</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <version>2.15.1-SNAPSHOT</version>
</parent>
<artifactId>camel-itest-performance</artifactId>
@@ -35,7 +35,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/3698f515/tests/camel-performance/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index fea12c3..46d721f 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>tests</artifactId>
- <version>2.15-SNAPSHOT</version>
+ <version>2.15.1-SNAPSHOT</version>
</parent>
<artifactId>camel-performance</artifactId>
[2/2] camel git commit: Fixed test module issue of release
Posted by ni...@apache.org.
Fixed test module issue of release
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/970ca3b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/970ca3b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/970ca3b0
Branch: refs/heads/master
Commit: 970ca3b04619c07722f245b5131fd7efe8c443be
Parents: 3698f51
Author: Willem Jiang <wi...@gmail.com>
Authored: Sat Mar 7 14:46:55 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Mar 7 14:46:55 2015 +0800
----------------------------------------------------------------------
pom.xml | 4 ++--
tests/pom.xml | 15 +++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/970ca3b0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3db52ff..869a3d7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<requireMavenVersion>
<version>${maven-enforcer-require-maven-version}</version>
</requireMavenVersion>
- </rules>
+ </rules>
</configuration>
</execution>
</executions>
@@ -260,7 +260,7 @@
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
<!-- The profile we want to use when doing the release -->
- <arguments>-Prelease,enable-schemagen,apt,sourcecheck,hibernate,osgi.test,performance.test</arguments>
+ <arguments>-Prelease,enable-schemagen,apt,sourcecheck,hibernate</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/970ca3b0/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index a38bc49..7073e08 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,6 +44,17 @@
</modules>
<profiles>
+ <!-- includes these modules when doing the release -->
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>camel-itest-karaf</module>
+ <module>camel-itest-osgi</module>
+ <module>camel-itest-performance</module>
+ <module>camel-performance</module>
+ </modules>
+ </profile>
+
<!-- osgi tests -->
<profile>
<id>osgi.test</id>