Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensured the core and the httpnio projects use the same version of jetty 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2451 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
sharedocs1@gmail.com 2009-12-17 15:15:26 +00:00
parent 8c5f3bec4a
commit 7a42009f0e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/pom.xml
View File

@ -94,7 +94,6 @@
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty</artifactId>
<version>7.0.0pre3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -142,11 +141,15 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
<jarjar destfile="${build.directory}/${build.finalName}-jar-with-dependencies.jar" <jarjar destfile="${build.directory}/${build.finalName}-jar-with-dependencies.jar"
update="true"> update="true">
<!-- Replace "javax.x.y.." with "org.jclouds.repackaged.javax.x.y..". <!-- Replace "x.y.." with "org.jclouds.repackaged.x.y..". Note: can't deal with package-info.class files.
See http://code.google.com/p/jarjar/wiki/CommandLineDocs for more informtion on jarjar rules. --> See http://code.google.com/p/jarjar/wiki/CommandLineDocs for more informtion on jarjar rules. -->
<rule pattern="javax.annotation.**" result="${groupId}.repackaged.@0"/> <rule pattern="javax.annotation.**" result="${groupId}.repackaged.@0"/>
<rule pattern="javax.inject.**" result="${groupId}.repackaged.@0"/> <rule pattern="javax.inject.**" result="${groupId}.repackaged.@0"/>
<rule pattern="javax.ws.**" result="${groupId}.repackaged.@0"/> <rule pattern="javax.ws.**" result="${groupId}.repackaged.@0"/>
<!-- google-guava and google-collections -->
<rule pattern="com.google.common.**" result="${groupId}.repackaged.@0"/>
<!-- guice -->
<rule pattern="com.google.inject.**" result="${groupId}.repackaged.@0"/>
</jarjar> </jarjar>
</tasks> </tasks>
</configuration> </configuration>

3
extensions/httpnio/pom.xml
View File

@ -43,11 +43,9 @@
</scm> </scm>
<dependencies> <dependencies>
<!-- TODO find out how to get this transatively from core -->
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty</artifactId>
<version>6.1.16</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -56,4 +54,5 @@
<version>4.1-alpha1</version> <version>4.1-alpha1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

10
project/pom.xml
View File

@ -175,6 +175,15 @@
<jclouds.test.listener>org.jclouds.test.testng.UnitTestStatusListener</jclouds.test.listener> <jclouds.test.listener>org.jclouds.test.testng.UnitTestStatusListener</jclouds.test.listener>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>7.0.0pre3</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
@ -192,7 +201,6 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>