geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r832184 - in /geronimo/server/branches/2.2: framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE plugins/pluto/pluto-support/pom.xml plugins/pluto/pluto-support/src/main/history/dependencies.xml pom.xml
Date Mon, 02 Nov 2009 23:14:40 GMT
Author: kevan
Date: Mon Nov  2 23:14:40 2009
New Revision: 832184

URL: http://svn.apache.org/viewvc?rev=832184&view=rev
Log:
GERONIMO-4943 Use apache licensed portlet-api_1.0_spec from org.apache.portals rather than
portlet-api

Modified:
    geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE
    geronimo/server/branches/2.2/plugins/pluto/pluto-support/pom.xml
    geronimo/server/branches/2.2/plugins/pluto/pluto-support/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/pom.xml

Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE?rev=832184&r1=832183&r2=832184&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE
(original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/LICENSE
Mon Nov  2 23:14:40 2009
@@ -665,6 +665,7 @@
 ./repository/org/apache/pluto/pluto-portal-driver/1.1.6/pluto-portal-driver-1.1.6.jar
 ./repository/org/apache/pluto/pluto-portal-driver-impl/1.1.6/pluto-portal-driver-impl-1.1.6.jar
 ./repository/org/apache/pluto/pluto-taglib/1.1.6/pluto-taglib-1.1.6.jar
+./repository/org/apache/portals/portlet-api_1.0_spec/1.0/portlet-api_1.0_spec-1.0.jar
 ./repository/org/apache/santuario/xmlsec/1.4.2/xmlsec-1.4.2.jar
 ./repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar
 ./repository/org/apache/woden/woden-api/1.0M8/woden-api-1.0M8.jar
@@ -1623,7 +1624,6 @@
 ./repository/com/sun/xml/stream/buffer/streambuffer/0.8/streambuffer-0.8.jar
 ./repository/com/sun/xml/ws/jaxws-rt/2.1.4/jaxws-rt-2.1.4.jar
 ./repository/com/sun/xml/ws/jaxws-tools/2.1.4/jaxws-tools-2.1.4.jar
-./repository/javax/portlet/portlet-api/1.0/portlet-api-1.0.jar
 ./repository/javax/servlet/jstl/1.2/jstl-1.2.jar
 ./repository/org/jvnet/staxex/stax-ex/1.0/stax-ex-1.0.jar
 

Modified: geronimo/server/branches/2.2/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/pluto/pluto-support/pom.xml?rev=832184&r1=832183&r2=832184&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/pluto/pluto-support/pom.xml Mon Nov  2 23:14:40 2009
@@ -54,6 +54,12 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-container</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.portlet</groupId>
+                    <artifactId>portlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -77,8 +83,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
+          <groupId>org.apache.portals</groupId>
+          <artifactId>portlet-api_1.0_spec</artifactId>
+          <version>1.0</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.2/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=832184&r1=832183&r2=832184&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/pluto/pluto-support/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/pluto/pluto-support/src/main/history/dependencies.xml
Mon Nov  2 23:14:40 2009
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>spring</artifactId>
         <type>car</type>
@@ -67,6 +62,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>portlet-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.codehaus.castor</groupId>
         <artifactId>castor</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=832184&r1=832183&r2=832184&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Mon Nov  2 23:14:40 2009
@@ -1000,8 +1000,8 @@
             </dependency>
 
             <dependency>
-                <groupId>portlet-api</groupId>
-                <artifactId>portlet-api</artifactId>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_1.0_spec</artifactId>
                 <version>1.0</version>
             </dependency>
 



Mime
View raw message