camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] git commit: CAMEL-6966: Avoid using 3rd party maven repo for camel-josql
Date Fri, 15 Nov 2013 08:17:51 GMT
CAMEL-6966: Avoid using 3rd party maven repo for camel-josql

Conflicts:
	components/camel-josql/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40e15490
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40e15490
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40e15490

Branch: refs/heads/camel-2.12.x
Commit: 40e15490abd43954c2700ef1ac093def077a034a
Parents: dd5d0cc
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Nov 15 09:15:13 2013 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Nov 15 09:19:07 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/40e15490/components/camel-josql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 57ecfb9..90cbd2a 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/40e15490/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a09634d..185f62f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,6 +138,7 @@
     <ftpserver-version>1.0.6</ftpserver-version>
     <freemarker-bundle-version>2.3.20_1</freemarker-bundle-version>
     <freemarker-version>2.3.20</freemarker-version>
+    <gentlyweb-bundle-version>1.5_1</gentlyweb-bundle-version>
     <geocoder-java-version>0.15</geocoder-java-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>


Mime
View raw message