Author: woonsan
Date: Thu Apr 8 15:41:59 2010
New Revision: 931974
URL: http://svn.apache.org/viewvc?rev=931974&view=rev
Log:
JS2-1180: Reducing redundant dependencies and preferring using geronimo spec
jars.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml Thu Apr 8
15:41:59 2010
@@ -157,8 +157,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Thu
Apr 8 15:41:59 2010
@@ -39,9 +39,9 @@
<!-- Runtime container dependencies (for commandline or standalone maven
plugin executions) -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>${geronimo-servlet_2.4_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.portals</groupId>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
Thu Apr 8 15:41:59 2010
@@ -102,8 +102,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Apr
8 15:41:59 2010
@@ -128,8 +128,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -250,8 +250,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Thu
Apr 8 15:41:59 2010
@@ -94,8 +94,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml Thu Apr
8 15:41:59 2010
@@ -82,8 +82,8 @@
<artifactId>db-ojb</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Thu
Apr 8 15:41:59 2010
@@ -51,8 +51,31 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -92,8 +115,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Thu
Apr 8 15:41:59 2010
@@ -88,8 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Thu Apr 8
15:41:59 2010
@@ -75,8 +75,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Thu
Apr 8 15:41:59 2010
@@ -80,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Thu Apr 8 15:41:59 2010
@@ -36,7 +36,7 @@
<org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
<ccpp.version>1.0</ccpp.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
- <servlet-api.version>2.4</servlet-api.version>
+
<geronimo-servlet_2.4_spec.version>1.1.1</geronimo-servlet_2.4_spec.version>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
<portal.context.name>${artifactId}</portal.context.name>
@@ -59,9 +59,9 @@
<version>${dollar}{portals.portlet2-api-spec.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${dollar}{servlet-api.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>${dollar}{geronimo-servlet_2.4_spec.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -74,8 +74,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=931974&r1=931973&r2=931974&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Apr 8 15:41:59 2010
@@ -262,17 +262,21 @@
<ehcache.version>1.7.2</ehcache.version>
<hsqldb.version>1.8.0.2</hsqldb.version>
<javolution.version>4.0.2</javolution.version>
+
<geronimo-javamail_1.4_spec.version>1.6</geronimo-javamail_1.4_spec.version>
<javax.activation.version>1.1</javax.activation.version>
- <javax.mail.version>1.3.3</javax.mail.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
- <javax.servlet.version>2.4</javax.servlet.version>
- <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
+
<geronimo-servlet_2.4_spec.version>1.1.1</geronimo-servlet_2.4_spec.version>
+ <geronimo-jsp_2.0_spec.version>1.1</geronimo-jsp_2.0_spec.version>
<javax.sql.version>2.0</javax.sql.version>
- <javax.transaction.version>1.0.1B</javax.transaction.version>
+ <geronimo-jta_1.1_spec.version>1.1</geronimo-jta_1.1_spec.version>
<javax.ws.rs.version>1.0</javax.ws.rs.version>
<jaxen.version>1.0-FCS</jaxen.version>
- <jaxb.version>2.1</jaxb.version>
+ <geronimo-jaxb_2.1_spec.version>1.0</geronimo-jaxb_2.1_spec.version>
<jaxb-impl.version>2.1.9</jaxb-impl.version>
+
<geronimo-stax-api_1.0_spec.version>1.0.1</geronimo-stax-api_1.0_spec.version>
+ <stax.version>1.2.0</stax.version>
+
<geronimo-activation_1.1_spec.version>1.0.2</geronimo-activation_1.1_spec.version>
+
<jdom.version>1.1</jdom.version>
<log4j.version>1.2.14</log4j.version>
<lucene.version>2.3.2</lucene.version>
@@ -576,14 +580,14 @@
<version>${portals.portlet2-api-spec.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <version>${geronimo-servlet_2.4_spec.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${javax.servlet.jsp.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <version>${geronimo-jsp_2.0_spec.version}</version>
</dependency>
<dependency>
<groupId>javax.ccpp</groupId>
@@ -601,6 +605,12 @@
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-container</artifactId>
<version>${org.apache.pluto.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OJB -->
@@ -985,14 +995,36 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <version>${geronimo-jaxb_2.1_spec.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>${geronimo-stax-api_1.0_spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>${stax.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JAX-RS -->
@@ -1041,6 +1073,10 @@
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1147,9 +1183,9 @@
<!-- Database -->
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>${javax.transaction.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo-jta_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>javax.sql</groupId>
@@ -1192,9 +1228,14 @@
<!-- Email -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo-javamail_1.4_spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo-activation_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -1247,6 +1288,10 @@
<version>${velocity-tools.version}</version>
<exclusions>
<exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
@@ -1400,26 +1445,26 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>javax.ccpp</groupId>
<artifactId>ccpp</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-api</artifactId>
- <version>${org.apache.pluto.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${org.apache.pluto.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-common</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
