portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r773767 - in /portals/jetspeed-2: applications/j2-admin/trunk/ portal/trunk/ portal/trunk/applications/jetspeed-demo/ portal/trunk/components/jetspeed-db-tools/ portal/trunk/enterprise/ portal/trunk/enterprise/ear-full/ portal/trunk/enterpr...
Date Tue, 12 May 2009 02:32:27 GMT
Author: ate
Date: Tue May 12 02:32:26 2009
New Revision: 773767

URL: http://svn.apache.org/viewvc?rev=773767&view=rev
Log:
JS2-1004: Replace dependency on JCP provided JSR-286 portlet-api-2.0 with Apache Portals maintained
portlet-api_2.0_spec-1.0
See: http://issues.apache.org/jira/browse/JS2-1004

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
    portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Tue May 12 02:32:26 2009
@@ -82,7 +82,7 @@
     <javax.servlet.version>2.4</javax.servlet.version>
     <javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
     <log4j.version>1.2.14</log4j.version>
-    <portlet-api.version>2.0</portlet-api.version>
+    <portals.portlet2-api-spec.version>1.0-SNAPSHOT</portals.portlet2-api-spec.version>
     <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
     <spring.version>2.5.6</spring.version>
     <taglibs-request.version>1.0.1</taglibs-request.version>
@@ -100,9 +100,9 @@
 
     <!-- Standard APIs -->
     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${portlet-api.version}</version>
+      <groupId>org.apache.portals</groupId>
+      <artifactId>portlet-api_2.0_spec</artifactId>
+      <version>${portals.portlet2-api-spec.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Tue
May 12 02:32:26 2009
@@ -306,7 +306,7 @@
                   <deployments>
                     <!-- shared/lib -->
                     <deployment>
-                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
                     <deployment>
                       <artifact>javax.ccpp:ccpp:jar</artifact>
@@ -355,9 +355,9 @@
             <dependencies>
               <!-- shared/lib deps -->
               <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${portlet-api.version}</version>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>${portals.portlet2-api-spec.version}</version>
               </dependency>
               <dependency>
                 <groupId>javax.ccpp</groupId>
@@ -536,7 +536,7 @@
                   <deployments>
                     <!-- shared/lib -->
                     <deployment>
-                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
                     <deployment>
                       <artifact>javax.ccpp:ccpp:jar</artifact>
@@ -604,9 +604,9 @@
             <dependencies>
               <!-- shared/lib deps -->
               <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${portlet-api.version}</version>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>${portals.portlet2-api-spec.version}</version>
               </dependency>
               <dependency>
                 <groupId>javax.ccpp</groupId>

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=773767&r1=773766&r2=773767&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 Tue May 12 02:32:26
2009
@@ -44,9 +44,9 @@
       <version>${javax.servlet.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${portlet-api.version}</version>
+      <groupId>org.apache.portals</groupId>
+      <artifactId>portlet-api_2.0_spec</artifactId>
+      <version>${portals.portlet2-api-spec.version}</version>
     </dependency>
       <dependency>
         <groupId>org.apache.portals.pluto</groupId>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Tue May 12 02:32:26 2009
@@ -116,8 +116,8 @@
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>                      
-              <groupId>javax.portlet</groupId>
-              <artifactId>portlet-api</artifactId>
+              <groupId>org.apache.portals</groupId>
+              <artifactId>portlet-api_2.0_spec</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>                      

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Tue May 12 02:32:26 2009
@@ -86,8 +86,8 @@
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>                      
-              <groupId>javax.portlet</groupId>
-              <artifactId>portlet-api</artifactId>
+              <groupId>org.apache.portals</groupId>
+              <artifactId>portlet-api_2.0_spec</artifactId>
               <bundleDir>/lib</bundleDir>
             </jarModule>
             <jarModule>                      

Modified: portals/jetspeed-2/portal/trunk/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/pom.xml Tue May 12 02:32:26 2009
@@ -75,8 +75,8 @@
       <artifactId>jetspeed-commons</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
+      <groupId>org.apache.portals</groupId>
+      <artifactId>portlet-api_2.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.portals.pluto</groupId>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-database-pom.xml Tue May
12 02:32:26 2009
@@ -83,8 +83,8 @@
           <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.portlet</groupId>
-          <artifactId>portlet-api</artifactId>
+          <groupId>org.apache.portals</groupId>
+          <artifactId>portlet-api_2.0_spec</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.portals.pluto</groupId>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Tue May 12 02:32:26 2009
@@ -150,7 +150,7 @@
                   </destinations>
                   <deployments>
                     <deployment>
-                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
                     <deployment>
                       <artifact>javax.ccpp:ccpp:jar</artifact>
@@ -196,9 +196,9 @@
             <dependencies>
 
               <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${portlet-api.version}</version>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>${portals.portlet2-api-spec.version}</version>
               </dependency>
               <dependency>
                 <groupId>javax.ccpp</groupId>
@@ -316,7 +316,7 @@
                   </destinations>
                   <deployments>
                     <deployment>
-                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
                     <deployment>
                       <artifact>javax.ccpp:ccpp:jar</artifact>
@@ -380,9 +380,9 @@
 
             <dependencies>
               <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${portlet-api.version}</version>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>${portals.portlet2-api-spec.version}</version>
               </dependency>
               <dependency>
                 <groupId>javax.ccpp</groupId>

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
Tue May 12 02:32:26 2009
@@ -221,7 +221,7 @@
                   <deployments>
                     <!-- shared/lib -->
                     <deployment>
-                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                      <artifact>org.apache.portals:portlet-api_2.0_spec:jar</artifact>
                     </deployment>
                     <deployment>
                       <artifact>javax.ccpp:ccpp:jar</artifact>
@@ -278,9 +278,9 @@
                 <type>war</type>
               </dependency>
               <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${dollar}{portlet-api.version}</version>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>${dollar}{portals.portlet2-api-spec.version}</version>
               </dependency>
               <dependency>
                 <groupId>javax.ccpp</groupId>

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Tue May 12 02:32:26 2009
@@ -36,7 +36,7 @@
     <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>
-    <portlet-api.version>2.0</portlet-api.version>
+    <portals.portlet2-api-spec.version>1.0-SNAPSHOT</portals.portlet2-api-spec.version>
     <javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
     <portal.context.name>${artifactId}</portal.context.name>
     <org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.27/</org.apache.jetspeed.server.home>
@@ -53,9 +53,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${dollar}{portlet-api.version}</version>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>portlet-api_2.0_spec</artifactId>
+        <version>${dollar}{portals.portlet2-api-spec.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -68,8 +68,8 @@
   <dependencies>
     <!-- Provided Dependencies -->
     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
+      <groupId>org.apache.portals</groupId>
+      <artifactId>portlet-api_2.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=773767&r1=773766&r2=773767&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue May 12 02:32:26 2009
@@ -318,7 +318,7 @@
     <org.apache.portals.applications.apa-demo.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-demo.version>
     <org.apache.portals.applications.apa-webcontent.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
     <oro.version>2.0.8</oro.version>
-    <portlet-api.version>2.0</portlet-api.version>
+    <portals.portlet2-api-spec.version>1.0-SNAPSHOT</portals.portlet2-api-spec.version>
     <regexp.version>1.2</regexp.version>
     <rome.version>0.8</rome.version>
     <saxpath.version>1.0-FCS</saxpath.version>
@@ -566,9 +566,9 @@
 
       <!-- Standard APIs -->
       <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${portlet-api.version}</version>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>portlet-api_2.0_spec</artifactId>
+        <version>${portals.portlet2-api-spec.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -1329,8 +1329,8 @@
 
     <!-- Provided Dependencies -->
     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
+      <groupId>org.apache.portals</groupId>
+      <artifactId>portlet-api_2.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message