You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/05/12 04:28:01 UTC
svn commit: r773764 - in /portals/pluto/trunk: ./
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
maven-pluto-plugin/src/main/resources/ pluto-container-api/
pluto-container-driver-api/ pluto-container/ pluto-portal-driver-impl/
pluto-portal-d...
Author: ate
Date: Tue May 12 02:28:01 2009
New Revision: 773764
URL: http://svn.apache.org/viewvc?rev=773764&view=rev
Log:
PLUTO-562: 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/PLUTO-562
Modified:
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
portals/pluto/trunk/maven-pluto-plugin/src/main/resources/versions.properties
portals/pluto/trunk/pluto-container-api/pom.xml
portals/pluto/trunk/pluto-container-driver-api/pom.xml
portals/pluto/trunk/pluto-container/pom.xml
portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
portals/pluto/trunk/pluto-portal-driver/pom.xml
portals/pluto/trunk/pluto-portal/pom.xml
portals/pluto/trunk/pluto-taglib/pom.xml
portals/pluto/trunk/pluto-testsuite/pom.xml
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java Tue May 12 02:28:01 2009
@@ -47,8 +47,8 @@
}
public static final InstallationDependency PORTLET_API =
- new InstallationDependency("javax.portlet", "portlet-api",
- VERSION_PROPERTIES.getProperty("portlet-api.version"));
+ new InstallationDependency("org.apache.portals", "portlet-api_2.0_spec",
+ VERSION_PROPERTIES.getProperty("portals.portlet2-api-spec.version"));
public static final InstallationDependency CONTAINER_API =
new InstallationDependency("org.apache.portals.pluto", "pluto-container-api",
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/resources/versions.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/resources/versions.properties?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/resources/versions.properties (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/resources/versions.properties Tue May 12 02:28:01 2009
@@ -19,7 +19,7 @@
# <property> elements of Pluto's parent POM. This property file is
# interpolated and placed in the maven-pluto-plugin jar, and is
# used by the InstallationDependency class.
-portlet-api.version=${portlet-api.version}
+portals.portlet2-api-spec.version=${portals.portlet2-api-spec.version}
servlet-api.version=${servlet-api.version}
jsp-api.version=${jsp-api.version}
jstl.version=${jstl.version}
Modified: portals/pluto/trunk/pluto-container-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-api/pom.xml Tue May 12 02:28:01 2009
@@ -35,9 +35,9 @@
<dependencies>
<!-- Specification Libraries =========================================== -->
<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/pluto/trunk/pluto-container-driver-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-driver-api/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-driver-api/pom.xml (original)
+++ portals/pluto/trunk/pluto-container-driver-api/pom.xml Tue May 12 02:28:01 2009
@@ -35,9 +35,9 @@
<dependencies>
<!-- Specification Libraries =========================================== -->
<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/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Tue May 12 02:28:01 2009
@@ -53,9 +53,9 @@
<!-- Specification Libraries =========================================== -->
<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/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Tue May 12 02:28:01 2009
@@ -79,9 +79,9 @@
</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>
<scope>provided</scope>
</dependency>
Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Tue May 12 02:28:01 2009
@@ -58,9 +58,9 @@
<scope>provided</scope>
</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>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue May 12 02:28:01 2009
@@ -59,8 +59,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>xml-apis</groupId>
Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Tue May 12 02:28:01 2009
@@ -34,9 +34,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>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Tue May 12 02:28:01 2009
@@ -33,9 +33,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>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=773764&r1=773763&r2=773764&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue May 12 02:28:01 2009
@@ -251,7 +251,7 @@
<pluto.container.name>Pluto</pluto.container.name>
<javax.portlet.version.major>2</javax.portlet.version.major>
<javax.portlet.version.minor>0</javax.portlet.version.minor>
- <portlet-api.version>2.0</portlet-api.version>
+ <portals.portlet2-api-spec.version>1.0-SNAPSHOT</portals.portlet2-api-spec.version>
<servlet-api.version>2.4</servlet-api.version>
<jsp-api.version>2.0</jsp-api.version>
<jstl.version>1.1.2</jstl.version>