Author: jstrachan Date: Fri Aug 6 14:18:25 2010 New Revision: 982979 URL: http://svn.apache.org/viewvc?rev=982979&view=rev Log: fix old versions of jersey in pom for CAMEL-3028
Modified:
camel/trunk/components/camel-web/pom.xml
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=982979&r1=982978&r2=982979&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Fri Aug 6 14:18:25 2010
@@ -357,10 +357,10 @@
<goals>
<goal>javadoc</goal>
</goals>
+ <phase>package</phase>
<!--
- <phase>compile</phase>
+ <phase>compile</phase>
-->
- <phase>package</phase>
</execution>
</executions>
@@ -376,12 +376,12 @@
<docletArtifact>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>maven-wadl-plugin</artifactId>
-
<version>1.1.4.1</version>
+ <version>${jersey-version}</version>
</docletArtifact>
<docletArtifact>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>wadl-resourcedoc-doclet</artifactId>
-
<version>1.1.4.1</version>
+ <version>${jersey-version}</version>
</docletArtifact>
<!--
Also specify jersey and
xerces as doclet artifacts as the
@@ -408,11 +408,13 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-version}</version>
</docletArtifact>
+<!--
<docletArtifact>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
</docletArtifact>
+-->
<docletArtifact>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -428,7 +430,7 @@
<plugin>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>maven-wadl-plugin</artifactId>
- <version>1.1.4.1</version>
+ <version>${jersey-version}</version>
<executions>
<execution>
<id>generate</id>
@@ -436,9 +438,11 @@
<goal>generate</goal>
</goals>
<!--
- <phase>compile</phase>
+ TODO - for some reason using a compile phase with maven 2.2.1 and
jetty:run causes an odd classloader bug
+
+ <phase>compile</phase>
-->
- <phase>package</phase>
+ <phase>package</phase>
</execution>
</executions>
<configuration>
