You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/06/08 19:32:54 UTC
svn commit: r1133477 - in /incubator/isis/trunk: core/runtime/pom.xml
core/webapp/pom.xml pom.xml
quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml
viewer/restful/pom.xml viewer/restful/viewer/pom.xml viewer/scimpi/pom.xml
Author: danhaywood
Date: Wed Jun 8 17:32:54 2011
New Revision: 1133477
URL: http://svn.apache.org/viewvc?rev=1133477&view=rev
Log:
fixing javax.* references to use geronimo instead
Modified:
incubator/isis/trunk/core/runtime/pom.xml
incubator/isis/trunk/core/webapp/pom.xml
incubator/isis/trunk/pom.xml
incubator/isis/trunk/quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml
incubator/isis/trunk/viewer/restful/pom.xml
incubator/isis/trunk/viewer/restful/viewer/pom.xml
incubator/isis/trunk/viewer/scimpi/pom.xml
Modified: incubator/isis/trunk/core/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/pom.xml (original)
+++ incubator/isis/trunk/core/runtime/pom.xml Wed Jun 8 17:32:54 2011
@@ -80,12 +80,12 @@
<artifactId>commons-cli</artifactId>
</dependency>
+ <!-- to resolve log4j's optional dependency on javax.mail:mail:1.4 -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
<optional>true</optional>
- <scope>provided</scope> <!-- Used by log4j extended appended, and provided by log4j -->
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/core/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/pom.xml (original)
+++ incubator/isis/trunk/core/webapp/pom.xml Wed Jun 8 17:32:54 2011
@@ -100,6 +100,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Wed Jun 8 17:32:54 2011
@@ -1073,13 +1073,39 @@ BDD-Viewer module.
<version>1.1</version>
</dependency>
-
+ <!-- Scimpi dependencies -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
+
+ <!-- RestEasy -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>1.0.2.GA</version>
+ <exclusions>
+ <!-- instead use org.apache.geronimo.specs:geronimo-servlet_2.5_spec -->
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <!-- instead use org.apache.geronimo.specs:geronimo-annotation_1.0_spec -->
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ <!-- org.apache.geronimo.specs:geronimo-activation_1.1_spec -->
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
<!-- predicate libraries -->
<dependency>
<groupId>org.hamcrest</groupId>
@@ -1161,8 +1187,23 @@ BDD-Viewer module.
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
- <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: incubator/isis/trunk/quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml (original)
+++ incubator/isis/trunk/quickstart-archetype/src/main/resources/archetype-resources/tests-bdd/pom.xml Wed Jun 8 17:32:54 2011
@@ -62,6 +62,7 @@
<scope>test</scope>
</dependency>
+ <!-- NB: XOM is licensed under LGPL. -->
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
Modified: incubator/isis/trunk/viewer/restful/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/pom.xml Wed Jun 8 17:32:54 2011
@@ -111,24 +111,6 @@
<version>0.1.2-incubating-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
-
-
- <!-- 3rd party dependencies -->
-
- <!-- RestEasy -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>1.0.2.GA</version>
- </dependency>
-
- <!-- XOM (XML library) -->
- <dependency>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.2.5</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
Modified: incubator/isis/trunk/viewer/restful/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/viewer/pom.xml Wed Jun 8 17:32:54 2011
@@ -64,5 +64,25 @@
<artifactId>resteasy-jaxrs</artifactId>
</dependency>
+ <!-- the javax:* equivalents of these are excluded in
+ dependencyManagement of resteasy-jaxrs, so
+ are required here -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/isis/trunk/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/pom.xml?rev=1133477&r1=1133476&r2=1133477&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/pom.xml Wed Jun 8 17:32:54 2011
@@ -102,11 +102,6 @@
<version>0.1.2-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>1.6</version>
- </dependency>
</dependencies>
</dependencyManagement>