You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/09/23 22:42:03 UTC
svn commit: r818247 - in /servicemix/smx4: features/trunk/pom.xml
nmr/trunk/pom.xml
Author: ccustine
Date: Wed Sep 23 20:42:03 2009
New Revision: 818247
URL: http://svn.apache.org/viewvc?rev=818247&view=rev
Log:
SMXCOMP-636 Upgrade components to use Jencks 2.2
-Fixing jencks 2.1 transient repo issue
Modified:
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=818247&r1=818246&r2=818247&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Sep 23 20:42:03 2009
@@ -245,6 +245,19 @@
</properties>
<repositories>
+ <!--This is a hack to short circuit the jencks 2.1 problem with servicemix.org repo
+ It can probably be deleted if we update to jencks 2.2 in ServiceMix 3.3.x -->
+ <repository>
+ <id>servicemix-repo</id>
+ <name>ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<!-- Default repository -->
<repository>
<id>central</id>
@@ -530,18 +543,7 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
- <!-- do not use ${jencks.version} for this - is SMX4 OSGi bundle version -->
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jencks</groupId>
- <artifactId>xapool-without-pool</artifactId>
- </exclusion>
- </exclusions>
+ <version>${jencks.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=818247&r1=818246&r2=818247&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Sep 23 20:42:03 2009
@@ -138,6 +138,19 @@
</properties>
<repositories>
+ <!--This is a hack to short circuit the jencks 2.1 problem with servicemix.org repo
+ It can probably be deleted if we update to jencks 2.2 in ServiceMix 3.3.x -->
+ <repository>
+ <id>servicemix-repo</id>
+ <name>ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<!-- Default repository -->
<repository>
<id>central</id>