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 as...@apache.org on 2019/04/10 19:22:56 UTC
[portals-pluto] branch master updated: PLUTO-777 Release
Preparation 3.1.0
This is an automated email from the ASF dual-hosted git repository.
asfgriff pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/portals-pluto.git
The following commit(s) were added to refs/heads/master by this push:
new da46af0 PLUTO-777 Release Preparation 3.1.0
da46af0 is described below
commit da46af01ceecd598aaddb6b51302247563e5e91d
Author: Neil Griffin <ne...@gmail.com>
AuthorDate: Wed Apr 10 15:22:30 2019 -0400
PLUTO-777 Release Preparation 3.1.0
---
RELEASE-PROCEDURE.txt | 4 +-
demo-integration-tests/pom.xml | 2 +-
demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml | 2 +-
.../pom.xml | 2 +-
demo/chat-room-demo-portlet/pom.xml | 2 +-
demo/hub-demo-portlet/pom.xml | 2 +-
demo/pom.xml | 2 +-
demo/v3-annotated-demo-portlet/pom.xml | 2 +-
demo/v3-demo-portlet/pom.xml | 2 +-
maven-archetypes/bean-portlet-archetype/pom.xml | 2 +-
maven-archetypes/generic-portlet-archetype/pom.xml | 2 +-
.../mvcbean-jsp-portlet-archetype/pom.xml | 2 +-
.../mvcbean-thymeleaf-portlet-archetype/pom.xml | 2 +-
.../resources/archetype-resources/build.gradle | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
maven-pluto-plugin/pom.xml | 2 +-
pluto-ant-tasks/pom.xml | 2 +-
pluto-common/pom.xml | 2 +-
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 | 2 +-
pluto-taglib/pom.xml | 2 +-
pluto-testsuite/pom.xml | 2 +-
pluto-util/pom.xml | 2 +-
pom.xml | 59 ++++++++++++----------
portlet-api/pom.xml | 47 +++++++++++------
portlet-servlet-adapter/pom.xml | 2 +-
portlet-tck_3.0/driver/pom.xml | 2 +-
portlet-tck_3.0/pom.xml | 6 ++-
portlet-templating/pom.xml | 2 +-
.../thymeleaf-mvc-portlet-api/pom.xml | 2 +-
.../thymeleaf-mvc-portlet-cdi/pom.xml | 2 +-
.../thymeleaf-mvc-portlet-spring/pom.xml | 2 +-
portlet-templating/thymeleaf-portlet-api/pom.xml | 2 +-
test-base/pom.xml | 2 +-
39 files changed, 105 insertions(+), 81 deletions(-)
diff --git a/RELEASE-PROCEDURE.txt b/RELEASE-PROCEDURE.txt
index 870e6be..c4a479d 100644
--- a/RELEASE-PROCEDURE.txt
+++ b/RELEASE-PROCEDURE.txt
@@ -43,7 +43,7 @@ Since 3.0.0
2. Prepare the source for release
* Cleanup JIRA so the Fix Version in issues resolved since the last release includes this release version correctly.
* Create a JIRA issue for release maintenance for example see
- https://issues.apache.org/jira/browse/JS2-1355
+ https://issues.apache.org/jira/browse/PLUTO-777
* Checkout a clean copy of the trunk (on the specific branch if needed) to release using command line git.
cd ~/apache/releases
git clone https://github.com/apache/portals-pluto
@@ -57,7 +57,7 @@ Since 3.0.0
4. DRY RUN
Do a dry run of the release:prepare step:
- $ mvn -P all,apache-release -DrunOnlyAtExecutionRoot=true release:prepare -DdryRun=true
+ $ mvn -P apache-release -DrunOnlyAtExecutionRoot=true release:prepare -DdryRun=true
The dry run will not commit any changes back to Git and gives you the opportunity to verify that the release process will complete as expected.
You will be prompted for the following information :
diff --git a/demo-integration-tests/pom.xml b/demo-integration-tests/pom.xml
index 74874dc..2b981a6 100644
--- a/demo-integration-tests/pom.xml
+++ b/demo-integration-tests/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml b/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
index 211e303..e52639d 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
index 27d6e56..839eee9 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
diff --git a/demo/chat-room-demo-portlet/pom.xml b/demo/chat-room-demo-portlet/pom.xml
index fda7d37..3881296 100644
--- a/demo/chat-room-demo-portlet/pom.xml
+++ b/demo/chat-room-demo-portlet/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/demo/hub-demo-portlet/pom.xml b/demo/hub-demo-portlet/pom.xml
index c365d5c..a0c8c04 100644
--- a/demo/hub-demo-portlet/pom.xml
+++ b/demo/hub-demo-portlet/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/demo/pom.xml b/demo/pom.xml
index eb6b8ab..cd0d53d 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>demo</artifactId>
diff --git a/demo/v3-annotated-demo-portlet/pom.xml b/demo/v3-annotated-demo-portlet/pom.xml
index 2c384c4..9832262 100644
--- a/demo/v3-annotated-demo-portlet/pom.xml
+++ b/demo/v3-annotated-demo-portlet/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/demo/v3-demo-portlet/pom.xml b/demo/v3-demo-portlet/pom.xml
index ec168e4..87549ce 100644
--- a/demo/v3-demo-portlet/pom.xml
+++ b/demo/v3-demo-portlet/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>demo</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/maven-archetypes/bean-portlet-archetype/pom.xml b/maven-archetypes/bean-portlet-archetype/pom.xml
index 12ff11a..c23ab8f 100755
--- a/maven-archetypes/bean-portlet-archetype/pom.xml
+++ b/maven-archetypes/bean-portlet-archetype/pom.xml
@@ -28,7 +28,7 @@
<artifactId>bean-portlet-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>bean-portlet-archetype</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<description>Maven archetype for a bean portlet</description>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/portals-pluto.git</connection>
diff --git a/maven-archetypes/generic-portlet-archetype/pom.xml b/maven-archetypes/generic-portlet-archetype/pom.xml
index 0f7131f..ab4279a 100755
--- a/maven-archetypes/generic-portlet-archetype/pom.xml
+++ b/maven-archetypes/generic-portlet-archetype/pom.xml
@@ -28,7 +28,7 @@
<artifactId>generic-portlet-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>generic-portlet-archetype</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<description>Maven archetype for a generic portlet</description>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/portals-pluto.git</connection>
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/pom.xml b/maven-archetypes/mvcbean-jsp-portlet-archetype/pom.xml
index a581ddd..3c7e005 100755
--- a/maven-archetypes/mvcbean-jsp-portlet-archetype/pom.xml
+++ b/maven-archetypes/mvcbean-jsp-portlet-archetype/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mvcbean-jsp-portlet-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>mvcbean-jsp-portlet-archetype</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<description>Maven archetype for an MVCBean JSP portlet</description>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/portals-pluto.git</connection>
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/pom.xml b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/pom.xml
index ae6b9fb..b4ebfb0 100755
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/pom.xml
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mvcbean-thymeleaf-portlet-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>mvcbean-thymeleaf-portlet-archetype</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<description>Maven archetype for an MVCBean Thymeleaf portlet</description>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/portals-pluto.git</connection>
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
index 1c620b8..c19017b 100644
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
@@ -5,7 +5,7 @@ repositories {
}
dependencies {
- compile group: 'org.apache.portals.pluto', name: 'thymeleaf-mvc-portlet-cdi', version:'3.0.2-SNAPSHOT'
+ compile group: 'org.apache.portals.pluto', name: 'thymeleaf-mvc-portlet-cdi', version:'3.1.0-SNAPSHOT'
compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
compile group: 'org.slf4j', name: 'slf4j-log4j12', version:'1.7.25'
providedCompile group: 'javax.mvc', name: 'javax.mvc-api', version:'1.0-pfd'
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
index 97bb72b..286def0 100644
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>thymeleaf-mvc-portlet-cdi</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/maven-pluto-plugin/pom.xml b/maven-pluto-plugin/pom.xml
index 1054be2..795dba2 100644
--- a/maven-pluto-plugin/pom.xml
+++ b/maven-pluto-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-ant-tasks/pom.xml b/pluto-ant-tasks/pom.xml
index c037911..5aa467f 100644
--- a/pluto-ant-tasks/pom.xml
+++ b/pluto-ant-tasks/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-common/pom.xml b/pluto-common/pom.xml
index 8fcdd2e..35191fb 100644
--- a/pluto-common/pom.xml
+++ b/pluto-common/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-container-api/pom.xml b/pluto-container-api/pom.xml
index 8abc1d7..b03332a 100644
--- a/pluto-container-api/pom.xml
+++ b/pluto-container-api/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-container-driver-api/pom.xml b/pluto-container-driver-api/pom.xml
index d6392e6..2c3278a 100644
--- a/pluto-container-driver-api/pom.xml
+++ b/pluto-container-driver-api/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index 4363788..e29ec81 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-portal-driver-impl/pom.xml b/pluto-portal-driver-impl/pom.xml
index a8daf42..163b8ba 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>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-portal-driver/pom.xml b/pluto-portal-driver/pom.xml
index 4636c3d..8ce357c 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>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-portal/pom.xml b/pluto-portal/pom.xml
index 99901aa..de147bb 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>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-site-skin/pom.xml b/pluto-site-skin/pom.xml
index bf2d283..fd7a859 100644
--- a/pluto-site-skin/pom.xml
+++ b/pluto-site-skin/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-taglib/pom.xml b/pluto-taglib/pom.xml
index e4f0701..c9a3e77 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>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index fa1dd80..62b1f13 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>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pluto-util/pom.xml b/pluto-util/pom.xml
index 463a36d..be58af6 100644
--- a/pluto-util/pom.xml
+++ b/pluto-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.portals.pluto</groupId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 51e223c..4640750 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<artifactId>pluto</artifactId>
<packaging>pom</packaging>
<name>Apache Pluto</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
<description>Apache Pluto is the Reference Implementation of the Java Portlet Specification.</description>
<url>http://portals.apache.org/pluto</url>
@@ -263,7 +263,6 @@ generate mailto links. -->
-->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<pluto.container.name>Pluto</pluto.container.name>
<javax.portlet.version.major>3</javax.portlet.version.major>
<javax.portlet.version.minor>0</javax.portlet.version.minor>
@@ -309,6 +308,34 @@ generate mailto links. -->
<includeDemosEnd />
</properties>
+ <modules>
+ <module>pluto-container-api</module>
+ <module>pluto-container</module>
+ <module>pluto-taglib</module>
+ <module>pluto-container-driver-api</module>
+ <module>pluto-portal-driver</module>
+ <module>pluto-portal-driver-impl</module>
+ <module>pluto-portal</module>
+ <module>pluto-testsuite</module>
+ <module>pluto-common</module>
+ <module>demo</module>
+ <module>demo-integration-tests</module>
+ <module>pluto-util</module>
+ <module>maven-pluto-plugin</module>
+ <module>pluto-ant-tasks</module>
+ <module>pluto-site-skin</module>
+ <module>portlet-servlet-adapter</module>
+ <module>portlet-templating</module>
+ <module>test-base</module>
+ <!-- The following are excluded from the apache-release profile since they are on separate release schedules -->
+ <module>maven-archetypes/bean-portlet-archetype</module>
+ <module>maven-archetypes/generic-portlet-archetype</module>
+ <module>maven-archetypes/mvcbean-jsp-portlet-archetype</module>
+ <module>maven-archetypes/mvcbean-thymeleaf-portlet-archetype</module>
+ <module>portlet-api</module>
+ <module>portlet-tck_3.0</module>
+ </modules>
+
<dependencyManagement>
<dependencies>
<!-- Logging =========================================== -->
@@ -780,50 +807,28 @@ generate mailto links. -->
</build>
<profiles>
+
<profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <!-- profile must also be activated when building for tomee -->
- <property>
- <name>tomee</name>
- </property>
- </activation>
-
- <!-- Pluto Modules ======================================================= -->
+ <id>apache-release</id>
<modules>
- <!-- Pluto Container API -->
<module>pluto-container-api</module>
-
- <!-- Pluto Core Modules -->
<module>pluto-container</module>
<module>pluto-taglib</module>
-
- <!-- Pluto Portal and Testsuite Modules -->
<module>pluto-container-driver-api</module>
<module>pluto-portal-driver</module>
<module>pluto-portal-driver-impl</module>
<module>pluto-portal</module>
<module>pluto-testsuite</module>
-
- <!-- Aggregated common jar for shared library location -->
<module>pluto-common</module>
-
- <!-- Demonstration portlets -->
<module>demo</module>
-
- <!-- Pluto Utilities, Maven Plugins and Ant Tasks -->
+ <module>demo-integration-tests</module>
<module>pluto-util</module>
<module>maven-pluto-plugin</module>
<module>pluto-ant-tasks</module>
<module>pluto-site-skin</module>
<module>portlet-servlet-adapter</module>
<module>portlet-templating</module>
-
- <!-- the Technology Compliance Kit -->
<module>test-base</module>
- <module>portlet-tck_3.0</module>
- <module>demo-integration-tests</module>
</modules>
</profile>
diff --git a/portlet-api/pom.xml b/portlet-api/pom.xml
index 77f3fcc..a9abc46 100644
--- a/portlet-api/pom.xml
+++ b/portlet-api/pom.xml
@@ -22,6 +22,20 @@
<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">
+ <parent>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portals-pom</artifactId>
+ <version>1.4</version>
+ <relativePath/>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Java Portlet API V3.0</name>
+ <description>The Java Portlet API version 3.0 developed by the Java Community Process JSR-362 Expert Group.</description>
+
<properties>
<!-- basic project settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,21 +56,6 @@
<javadoc.spec.title>JSR 362 Portlet 3.0 API Specification</javadoc.spec.title>
</properties>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
-
- <packaging>bundle</packaging>
- <name>Java Portlet API V3.0</name>
- <description>The Java Portlet API version 3.0 developed by the Java Community Process JSR-362 Expert Group.</description>
<dependencies>
<dependency>
@@ -68,6 +67,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
+ <version>1.2</version>
</dependency>
</dependencies>
@@ -82,6 +82,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.javadoc.plugin}</version>
<configuration>
@@ -125,6 +134,11 @@
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -163,6 +177,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
<id>compress-js</id>
@@ -183,6 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
<configuration>
<webResources>
<resource>
@@ -220,6 +236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<phase>prepare-package</phase>
diff --git a/portlet-servlet-adapter/pom.xml b/portlet-servlet-adapter/pom.xml
index bdf0c6b..757f51d 100644
--- a/portlet-servlet-adapter/pom.xml
+++ b/portlet-servlet-adapter/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/portlet-tck_3.0/driver/pom.xml b/portlet-tck_3.0/driver/pom.xml
index 1b84ff9..d65baf8 100644
--- a/portlet-tck_3.0/driver/pom.xml
+++ b/portlet-tck_3.0/driver/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>test-base</artifactId>
- <version>${project.version}</version>
+ <version>${pluto.test.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml
index 9e1cf28..2871fb6 100644
--- a/portlet-tck_3.0/pom.xml
+++ b/portlet-tck_3.0/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,6 +28,7 @@
<groupId>javax.portlet</groupId>
<artifactId>portlet-tck</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
<name>Portlet API Technology Compatibility Kit</name>
<packaging>pom</packaging>
@@ -46,6 +47,7 @@
</scm>
<properties>
+ <pluto.test.version>3.1.0-SNAPSHOT</pluto.test.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- To automatically generate a list of test cases, each module transforms the portlet.xml file -->
@@ -210,7 +212,7 @@
<dependency>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>${project.version}</version>
+ <version>${pluto.test.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/portlet-templating/pom.xml b/portlet-templating/pom.xml
index 394d9aa..8926168 100644
--- a/portlet-templating/pom.xml
+++ b/portlet-templating/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>portlet-templating</artifactId>
diff --git a/portlet-templating/thymeleaf-mvc-portlet-api/pom.xml b/portlet-templating/thymeleaf-mvc-portlet-api/pom.xml
index 0da01fc..8ab05ec 100644
--- a/portlet-templating/thymeleaf-mvc-portlet-api/pom.xml
+++ b/portlet-templating/thymeleaf-mvc-portlet-api/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>portlet-templating</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>thymeleaf-mvc-portlet-api</artifactId>
diff --git a/portlet-templating/thymeleaf-mvc-portlet-cdi/pom.xml b/portlet-templating/thymeleaf-mvc-portlet-cdi/pom.xml
index e7ccb39..99584a8 100644
--- a/portlet-templating/thymeleaf-mvc-portlet-cdi/pom.xml
+++ b/portlet-templating/thymeleaf-mvc-portlet-cdi/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>portlet-templating</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>thymeleaf-mvc-portlet-cdi</artifactId>
diff --git a/portlet-templating/thymeleaf-mvc-portlet-spring/pom.xml b/portlet-templating/thymeleaf-mvc-portlet-spring/pom.xml
index b72ccd9..dc63bde 100644
--- a/portlet-templating/thymeleaf-mvc-portlet-spring/pom.xml
+++ b/portlet-templating/thymeleaf-mvc-portlet-spring/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>portlet-templating</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>thymeleaf-mvc-portlet-spring</artifactId>
diff --git a/portlet-templating/thymeleaf-portlet-api/pom.xml b/portlet-templating/thymeleaf-portlet-api/pom.xml
index b15df3e..8ddb544 100644
--- a/portlet-templating/thymeleaf-portlet-api/pom.xml
+++ b/portlet-templating/thymeleaf-portlet-api/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>portlet-templating</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>thymeleaf-portlet-api</artifactId>
diff --git a/test-base/pom.xml b/test-base/pom.xml
index fccfb4a..14c4965 100644
--- a/test-base/pom.xml
+++ b/test-base/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.portals.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>test-base</artifactId>
<packaging>jar</packaging>