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 2013/11/15 09:17:50 UTC
[2/3] git commit: CAMEL-6966: Avoid using 3rd party maven repo for
camel-josql
CAMEL-6966: Avoid using 3rd party maven repo for camel-josql
Conflicts:
components/camel-josql/pom.xml
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f3451c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f3451c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f3451c1
Branch: refs/heads/camel-2.11.x
Commit: 8f3451c111101cf33ba776fea4e8e5060df61d42
Parents: b814b20
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 15 09:15:13 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 15 09:18:16 2013 +0100
----------------------------------------------------------------------
components/camel-josql/pom.xml | 26 ++++++--------------------
parent/pom.xml | 1 +
2 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8f3451c1/components/camel-josql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 6c6c7fb..5ce0fc9 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -45,20 +45,6 @@
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=sql</camel.osgi.export.service>
</properties>
- <repositories>
- <repository>
- <id>jboss.fs</id>
- <name>JBoss FuseSource Public Release Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/fs-public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
@@ -67,14 +53,14 @@
</dependency>
<dependency>
- <groupId>net.sf.josql</groupId>
- <artifactId>josql</artifactId>
- <version>${josql-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.josql</artifactId>
+ <version>${josql-bundle-version}</version>
</dependency>
<dependency>
- <groupId>net.sf.josql</groupId>
- <artifactId>gentlyweb-utils</artifactId>
- <version>${josql-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.gentlyweb-utils</artifactId>
+ <version>${gentlyweb-bundle-version}</version>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/8f3451c1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index aa92d17..35eca0d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,6 +134,7 @@
<ftpserver-version>1.0.6</ftpserver-version>
<freemarker-bundle-version>2.3.19_1</freemarker-bundle-version>
<freemarker-version>2.3.19</freemarker-version>
+ <gentlyweb-bundle-version>1.5_1</gentlyweb-bundle-version>
<geronimo-annotation-spec-version>1.1.1</geronimo-annotation-spec-version>
<geronimo-atinject-1.0-spec-version>1.0</geronimo-atinject-1.0-spec-version>
<geronimo-ejb_3.1_spec-version>1.0.2</geronimo-ejb_3.1_spec-version>