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 2015/03/05 20:02:16 UTC
camel git commit: Fixed camel-scr testing as it rely on lucene 3
Repository: camel
Updated Branches:
refs/heads/master 30d5a53f6 -> 54e72d399
Fixed camel-scr testing as it rely on lucene 3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54e72d39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54e72d39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54e72d39
Branch: refs/heads/master
Commit: 54e72d399709d511335e844c7c1e30f09306b16f
Parents: 30d5a53
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 5 20:03:34 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 5 20:03:34 2015 +0100
----------------------------------------------------------------------
components/camel-jcr/pom.xml | 20 +++++++++++++-------
parent/pom.xml | 4 +++-
2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/54e72d39/components/camel-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index 184a66c..b7aff2a 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -51,6 +52,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- jackrabbit uses lucene 3.x -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene3-version}</version>
+ </dependency>
<!-- use rome 1.0 which is a valid Maven artifact -->
<dependency>
<groupId>rome</groupId>
@@ -62,11 +69,11 @@
<artifactId>jcr</artifactId>
<version>${jcr-version}</version>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -82,14 +89,13 @@
</dependencies>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <forkMode>always</forkMode>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/54e72d39/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 70efee7..bd71eac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -226,7 +226,7 @@
<jini-version>2.1</jini-version>
<jackson-version>1.9.12</jackson-version>
<jackson2-version>2.4.3</jackson2-version>
- <jackrabbit-version>2.8.0</jackrabbit-version>
+ <jackrabbit-version>2.9.1</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasper-bundle-version>6.0.36_1</jasper-bundle-version>
<jasypt-bundle-version>1.9.2_1</jasypt-bundle-version>
@@ -304,6 +304,8 @@
<!-- virtual dependency only used by Eclipse m2e -->
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<log4j-version>1.2.17</log4j-version>
+ <lucene3-bundle-version>3.6.0_1</lucene3-bundle-version>
+ <lucene3-version>3.6.0</lucene3-version>
<lucene-bundle-version>4.10.3_1</lucene-bundle-version>
<lucene-version>4.10.3</lucene-version>
<lucene-version-range>[4.5,5)</lucene-version-range>