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 ms...@apache.org on 2015/01/27 17:26:50 UTC
[12/12] portals-pluto git commit: Additional changes for moving to
V3.0
Additional changes for moving to V3.0
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/49072ab4
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/49072ab4
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/49072ab4
Branch: refs/heads/V3Prototype
Commit: 49072ab4ad0a5e7a10dbebda419eb3e8e2b05154
Parents: 4fc3855
Author: Scott Nicklous <ms...@apache.org>
Authored: Tue Jan 27 14:09:49 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Tue Jan 27 14:09:49 2015 +0100
----------------------------------------------------------------------
PortletHubDemo/pom.xml | 2 +-
maven-pluto-plugin/pom.xml | 182 +++++++++----------
.../pluto/maven/InstallationDependency.java | 4 +-
.../src/main/resources/versions.properties | 110 +++++------
pluto-ant-tasks/pom.xml | 96 +++++-----
pluto-container-api/pom.xml | 2 +-
pluto-container-driver-api/pom.xml | 2 +-
pluto-container/pom.xml | 2 +-
pluto-portal-driver-impl/pom.xml | 2 +-
pluto-portal-driver/pom.xml | 2 +-
pluto-portal/pom.xml | 2 +-
pluto-site-skin/pom.xml | 92 +++++-----
pluto-taglib/pom.xml | 2 +-
pluto-testsuite/pom.xml | 2 +-
pluto-util/pom.xml | 176 +++++++++---------
pom.xml | 6 +-
portlet-api/pom.xml | 2 +-
17 files changed, 343 insertions(+), 343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/PortletHubDemo/pom.xml
----------------------------------------------------------------------
diff --git a/PortletHubDemo/pom.xml b/PortletHubDemo/pom.xml
index 2cd8865..60b0379 100644
--- a/PortletHubDemo/pom.xml
+++ b/PortletHubDemo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>PortletHubDemo</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/maven-pluto-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-pluto-plugin/pom.xml b/maven-pluto-plugin/pom.xml
index c0fcd94..aa19829 100644
--- a/maven-pluto-plugin/pom.xml
+++ b/maven-pluto-plugin/pom.xml
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>maven-pluto-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Maven Pluto Installer Plugin</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-util</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <!-- Do not remove this dep: See MNG-1178 -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/scripts</directory>
- <includes>
- <include>**/*.mmld</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>pluto2</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-pluto-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Maven Pluto Installer Plugin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+
+ <!-- Do not remove this dep: See MNG-1178 -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/scripts</directory>
+ <includes>
+ <include>**/*.mmld</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>pluto2</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
----------------------------------------------------------------------
diff --git a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
index 04fa256..af3a309 100644
--- a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
+++ b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
@@ -47,8 +47,8 @@ class InstallationDependency {
}
public static final InstallationDependency PORTLET_API =
- new InstallationDependency("org.apache.portals.pluto", "portlet-api_2.0_spec",
- VERSION_PROPERTIES.getProperty("portals.portlet2-api-spec.version"));
+ new InstallationDependency("org.apache.portals.pluto", "portlet-api",
+ VERSION_PROPERTIES.getProperty("portals.portlet-api.version"));
public static final InstallationDependency CONTAINER_API =
new InstallationDependency("org.apache.portals.pluto", "pluto-container-api",
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/maven-pluto-plugin/src/main/resources/versions.properties
----------------------------------------------------------------------
diff --git a/maven-pluto-plugin/src/main/resources/versions.properties b/maven-pluto-plugin/src/main/resources/versions.properties
index 9e567ee..1270d21 100644
--- a/maven-pluto-plugin/src/main/resources/versions.properties
+++ b/maven-pluto-plugin/src/main/resources/versions.properties
@@ -1,55 +1,55 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# The properties defined in this file should align with the names of the
-# <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.
-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}
-taglibs.standard.version=${taglibs.standard.version}
-xerces.version=${xerces.version}
-xercesImpl.version=${xerces.version}
-xmlParserAPIs.version=${xerces.version}
-castor.version=${castor.version}
-commons-digester.version=${commons-digester.version}
-commons-cli.version=${commons-cli.version}
-commons-httpclient.version=${commons-httpclient.version}
-commons-beanutils.version=${commons-beanutils.version}
-commons-logging.version=${commons-logging.version}
-log4j.version=${log4j.version}
-springframework.version=${springframework.version}
-plexus.version=${plexus.version}
-maven.version=${maven.version}
-ant.version=${ant.version}
-junit.version=${junit.version}
-jmock.version=${jmock.version}
-# The version of Pluto's parent POM.
-pluto.version=${pom.version}
-#pluto.version=${pom.parent.version}
-jaxb.version=${jaxb.version}
-jaxb-impl.version=${jaxb-impl.version}
-xalan.version=${xalan.version}
-activation.version=${activation.version}
-stax.api.version=${stax.api.version}
-stax.impl.version=${stax.impl.version}
-ccpp-api.version=${ccpp-api.version}
-ccpp-ri.version=${ccpp-ri.version}
-rdffilter.version=${rdffilter.version}
-jena.version=${jena.version}
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# The properties defined in this file should align with the names of the
+# <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.
+portals.portlet-api.version=${portals.portlet-api.version}
+servlet-api.version=${servlet-api.version}
+jsp-api.version=${jsp-api.version}
+jstl.version=${jstl.version}
+taglibs.standard.version=${taglibs.standard.version}
+xerces.version=${xerces.version}
+xercesImpl.version=${xerces.version}
+xmlParserAPIs.version=${xerces.version}
+castor.version=${castor.version}
+commons-digester.version=${commons-digester.version}
+commons-cli.version=${commons-cli.version}
+commons-httpclient.version=${commons-httpclient.version}
+commons-beanutils.version=${commons-beanutils.version}
+commons-logging.version=${commons-logging.version}
+log4j.version=${log4j.version}
+springframework.version=${springframework.version}
+plexus.version=${plexus.version}
+maven.version=${maven.version}
+ant.version=${ant.version}
+junit.version=${junit.version}
+jmock.version=${jmock.version}
+# The version of Pluto's parent POM.
+pluto.version=${pom.version}
+#pluto.version=${pom.parent.version}
+jaxb.version=${jaxb.version}
+jaxb-impl.version=${jaxb-impl.version}
+xalan.version=${xalan.version}
+activation.version=${activation.version}
+stax.api.version=${stax.api.version}
+stax.impl.version=${stax.impl.version}
+ccpp-api.version=${ccpp-api.version}
+ccpp-ri.version=${ccpp-ri.version}
+rdffilter.version=${rdffilter.version}
+jena.version=${jena.version}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-ant-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-ant-tasks/pom.xml b/pluto-ant-tasks/pom.xml
index 0e626e7..ac40de8 100644
--- a/pluto-ant-tasks/pom.xml
+++ b/pluto-ant-tasks/pom.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>pluto-ant-tasks</artifactId>
- <name>Apache Pluto Ant Tasks</name>
- <description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets to the Pluto Portal Driver.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-util</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>pluto-ant-tasks</artifactId>
+ <name>Apache Pluto Ant Tasks</name>
+ <description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets to the Pluto Portal Driver.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
+
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-container-api/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container-api/pom.xml b/pluto-container-api/pom.xml
index a81f706..0adb571 100644
--- a/pluto-container-api/pom.xml
+++ b/pluto-container-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-container-api</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-container-driver-api/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container-driver-api/pom.xml b/pluto-container-driver-api/pom.xml
index 1c8908d..a4bad16 100644
--- a/pluto-container-driver-api/pom.xml
+++ b/pluto-container-driver-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-container-driver-api</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-container/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index d92e1d3..437a0f3 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-container</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-portal-driver-impl/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal-driver-impl/pom.xml b/pluto-portal-driver-impl/pom.xml
index e05211f..786e16c 100644
--- a/pluto-portal-driver-impl/pom.xml
+++ b/pluto-portal-driver-impl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal-driver-impl</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-portal-driver/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal-driver/pom.xml b/pluto-portal-driver/pom.xml
index 70efd9b..8457627 100644
--- a/pluto-portal-driver/pom.xml
+++ b/pluto-portal-driver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal-driver</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-portal/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal/pom.xml b/pluto-portal/pom.xml
index eabb99a..0b94a43 100644
--- a/pluto-portal/pom.xml
+++ b/pluto-portal/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-portal</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-site-skin/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-site-skin/pom.xml b/pluto-site-skin/pom.xml
index f0b1c06..c36af1e 100644
--- a/pluto-site-skin/pom.xml
+++ b/pluto-site-skin/pom.xml
@@ -1,46 +1,46 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
- <parent>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>pluto-site-skin</artifactId>
- <name>Apache Pluto Website Skin</name>
- <packaging>jar</packaging>
- <description>Apache Pluto Website Resources (CSS, images)</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <parent>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>pluto-site-skin</artifactId>
+ <name>Apache Pluto Website Skin</name>
+ <packaging>jar</packaging>
+ <description>Apache Pluto Website Resources (CSS, images)</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-taglib/pom.xml b/pluto-taglib/pom.xml
index 10d037f..bb723df 100644
--- a/pluto-taglib/pom.xml
+++ b/pluto-taglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-taglib</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-testsuite/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index a03704a..bb4f09d 100644
--- a/pluto-testsuite/pom.xml
+++ b/pluto-testsuite/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>pluto-testsuite</artifactId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pluto-util/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-util/pom.xml b/pluto-util/pom.xml
index 14c1156..e119e4b 100644
--- a/pluto-util/pom.xml
+++ b/pluto-util/pom.xml
@@ -1,88 +1,88 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>pluto</artifactId>
- <groupId>org.apache.portals.pluto</groupId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>pluto-util</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Pluto Utilities</name>
-
- <!-- The dependencies for the ApplicationServerHook project
- are those which need to be installed!
- -->
- <dependencies>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/org/apache/pluto/util/descriptors/web/web-app_2_3.dtd</exclude>
- <exclude>src/test/resources/org/apache/pluto/util/assemble/web-app_2_3.dtd</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>pluto</artifactId>
+ <groupId>org.apache.portals.pluto</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>pluto-util</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Pluto Utilities</name>
+
+ <!-- The dependencies for the ApplicationServerHook project
+ are those which need to be installed!
+ -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/org/apache/pluto/util/descriptors/web/web-app_2_3.dtd</exclude>
+ <exclude>src/test/resources/org/apache/pluto/util/assemble/web-app_2_3.dtd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c60f82f..e355fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,9 +254,9 @@ generate mailto links. -->
-->
<properties>
<pluto.container.name>Pluto</pluto.container.name>
- <javax.portlet.version.major>2</javax.portlet.version.major>
+ <javax.portlet.version.major>3</javax.portlet.version.major>
<javax.portlet.version.minor>0</javax.portlet.version.minor>
- <portals.portlet2-api-spec.version>${project.version}</portals.portlet2-api-spec.version>
+ <portals.portlet-api.version>${project.version}</portals.portlet-api.version>
<servlet-api.version>7.0.50</servlet-api.version>
<jsp-api.version>7.0.50</jsp-api.version>
<jstl.version>7.0.50</jstl.version>
@@ -321,7 +321,7 @@ TODO: Check if we need all of them. -->
<dependency>
<groupId>org.apache.portals</groupId>
<artifactId>portlet-api</artifactId>
- <version>${portals.portlet2-api-spec.version}</version>
+ <version>${portals.portlet-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/49072ab4/portlet-api/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-api/pom.xml b/portlet-api/pom.xml
index 35e5c6f..647c050 100644
--- a/portlet-api/pom.xml
+++ b/portlet-api/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>portlet-api</artifactId>