You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/10/16 20:08:26 UTC

svn commit: r705304 - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-db-tools/pom.xml pom.xml

Author: ate
Date: Thu Oct 16 11:08:25 2008
New Revision: 705304

URL: http://svn.apache.org/viewvc?rev=705304&view=rev
Log:
Big jump: switching dependencies to be Pluto 2.0 based.
Note: this is going to break this branch *completely* for some time...  

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/pom.xml
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/pom.xml?rev=705304&r1=705303&r2=705304&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-db-tools/pom.xml Thu Oct 16 11:08:25 2008
@@ -44,15 +44,15 @@
       <version>${javax.servlet.version}</version>
     </dependency>
     <dependency>
-      <groupId>portlet-api</groupId>
+      <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
       <version>${portlet-api.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto</artifactId>
-      <version>${org.apache.pluto.version}</version>
-    </dependency>
+      <dependency>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-container-api</artifactId>
+        <version>${org.apache.pluto.version}</version>
+      </dependency>
 
     <!-- Build Dependencies -->
     <dependency>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml?rev=705304&r1=705303&r2=705304&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/pom.xml Thu Oct 16 11:08:25 2008
@@ -289,7 +289,7 @@
     <ehcache.version>1.2.4</ehcache.version>
     <hsqldb.version>1.8.0.2</hsqldb.version>
     <javolution.version>4.0.2</javolution.version>
-    <javax.activation.version>1.0.2</javax.activation.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>
@@ -297,6 +297,8 @@
     <javax.sql.version>2.0</javax.sql.version>
     <javax.transaction.version>1.0.1B</javax.transaction.version>
     <jaxen.version>1.0-FCS</jaxen.version>
+    <jaxb.version>2.1</jaxb.version>
+    <jaxb-impl.version>2.1.8</jaxb-impl.version>
     <jdom.version>1.0</jdom.version>
     <log4j.version>1.2.14</log4j.version>
     <lucene.version>2.0.0</lucene.version>
@@ -304,7 +306,7 @@
     <nekohtml.version>0.9.5</nekohtml.version>
     <ojb.version>1.0.3</ojb.version>
     <org.apache.derby.version>10.3.2.1</org.apache.derby.version>
-    <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
+    <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
     <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
     <org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
     <org.apache.portals.bridges.jpetstore.version>1.0.4</org.apache.portals.bridges.jpetstore.version>
@@ -314,7 +316,7 @@
     <org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
     <org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
     <oro.version>2.0.8</oro.version>
-    <portlet-api.version>1.0</portlet-api.version>
+    <portlet-api.version>2.0</portlet-api.version>
     <regexp.version>1.2</regexp.version>
     <rome.version>0.8</rome.version>
     <saxpath.version>1.0-FCS</saxpath.version>
@@ -566,7 +568,7 @@
 
       <!-- Standard APIs -->
       <dependency>
-        <groupId>portlet-api</groupId>
+        <groupId>javax.portlet</groupId>
         <artifactId>portlet-api</artifactId>
         <version>${portlet-api.version}</version>
       </dependency>
@@ -584,7 +586,12 @@
       <!-- Pluto Container -->
       <dependency>
         <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto</artifactId>
+        <artifactId>pluto-container-api</artifactId>
+        <version>${org.apache.pluto.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-container</artifactId>
         <version>${org.apache.pluto.version}</version>
       </dependency>
 
@@ -826,6 +833,16 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>${jaxb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${jaxb-impl.version}</version>
+      </dependency>
 
       <!-- Test -->
       <dependency>
@@ -1177,7 +1194,7 @@
 
     <!-- Provided Dependencies -->
     <dependency>
-      <groupId>portlet-api</groupId>
+      <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -1191,11 +1208,12 @@
         <artifactId>jsp-api</artifactId>
         <scope>provided</scope>
       </dependency>
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto</artifactId>
-      <scope>provided</scope>
-    </dependency>
+      <dependency>
+        <groupId>org.apache.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: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org