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 2018/06/22 21:37:54 UTC

[4/4] portals-pluto git commit: Revert "PLUTO-662 Introduce a liferay profile for the tck (remove dependency on -SNAPSHOT artifact prior to release)"

Revert "PLUTO-662 Introduce a liferay profile for the tck (remove dependency on -SNAPSHOT artifact prior to release)"

This reverts commit 1ef352c2cdcc4d08603478f5cd103f037458f0c7.


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/9dbea022
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/9dbea022
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/9dbea022

Branch: refs/heads/master
Commit: 9dbea022cea9e64b594091d622491721f0157114
Parents: eeb188f
Author: Neil Griffin <ne...@gmail.com>
Authored: Fri Jun 22 17:37:38 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Fri Jun 22 17:37:38 2018 -0400

----------------------------------------------------------------------
 PortletHubDemo/pom.xml                          |  388 ++---
 PortletV3AnnotatedDemo/pom.xml                  |  368 +++--
 PortletV3Demo/pom.xml                           |  398 ++---
 pom.xml                                         | 1557 +++++++++---------
 .../pom.xml                                     |  364 ++--
 .../pom.xml                                     |  319 ++--
 .../V3AnnotationPortletConfigTests/pom.xml      |  366 ++--
 portlet-tck_3.0/V3HeaderPortletTests/pom.xml    |  352 ++--
 portlet-tck_3.0/V3PortletConfigTests/pom.xml    |  299 ++--
 portlet-tck_3.0/V3PortletContextTests/pom.xml   |  299 ++--
 portlet-tck_3.0/V3PortletHubTests/pom.xml       |  319 ++--
 .../V3PortletParametersTests/pom.xml            |  327 ++--
 portlet-tck_3.0/V3RenderStateTests/pom.xml      |  325 ++--
 portlet-tck_3.0/V3URLTests/pom.xml              |  354 ++--
 14 files changed, 3101 insertions(+), 2934 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/9dbea022/PortletHubDemo/pom.xml
----------------------------------------------------------------------
diff --git a/PortletHubDemo/pom.xml b/PortletHubDemo/pom.xml
index caf077d..9bdd6c3 100644
--- a/PortletHubDemo/pom.xml
+++ b/PortletHubDemo/pom.xml
@@ -1,190 +1,198 @@
-<!--
-  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.2-SNAPSHOT</version>
-    </parent>
-
-   <artifactId>PortletHubDemo</artifactId>
-   <packaging>war</packaging>
-
-   <dependencies>
-      <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.tomcat</groupId>
-         <artifactId>tomcat-servlet-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-      </dependency>
-
-      <!-- for eclipse JSP tooling purposes -->
-      <dependency>
-         <groupId>javax.servlet.jsp</groupId>
-         <artifactId>jsp-api</artifactId>
-         <version>2.1</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.taglibs</groupId>
-         <artifactId>taglibs-standard-spec</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-impl</artifactId>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-jstlel</artifactId>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.portals.pluto</groupId>
-         <artifactId>pluto-taglib</artifactId>
-         <version>2.1.0-M3</version>
-         <scope>provided</scope>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <finalName>PortletHubDemo</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-
-         <!-- Don't attach source or javadoc archive (for release plugin)-->
-         <plugin>
-           <artifactId>maven-source-plugin</artifactId>
-           <configuration>
-             <attach>false</attach>
-           </configuration>
-         </plugin>
-         <plugin>
-           <artifactId>maven-javadoc-plugin</artifactId>
-           <configuration>
-             <skip>true</skip>
-           </configuration>
-         </plugin>
-
-         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
-         <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-remote-resources-plugin</artifactId>
-             <executions>
-                 <execution>
-                     <goals>
-                         <goal>process</goal>
-                     </goals>
-                     <configuration>
-                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                         <attached>false</attached>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-       <profile>
-           <id>liferay</id>
-           <dependencies>
-               <dependency>
-                   <groupId>org.slf4j</groupId>
-                   <artifactId>slf4j-log4j12</artifactId>
-               </dependency>
-           </dependencies>
-           <build>
-               <plugins>
-                   <plugin>
-                       <artifactId>maven-war-plugin</artifactId>
-                       <configuration>
-                           <packagingExcludes>
-                               WEB-INF/classes/logging.properties
-                           </packagingExcludes>
-                       </configuration>
-                   </plugin>
-               </plugins>
-           </build>
-      </profile>
-      <profile>
-         <id>pluto</id>
-         <dependencies>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-spec</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-impl</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-jstlel</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-jdk14</artifactId>
-                <scope>provided</scope>
-            </dependency>
-         </dependencies>
-         <build>
-            <plugins>
-               <plugin>
-                 <artifactId>maven-war-plugin</artifactId>
-                 <configuration>
-                   <packagingExcludes>
-                       WEB-INF/beans.xml,
-                       WEB-INF/liferay-portlet.xml,
-                       WEB-INF/classes/log4j.properties
-                   </packagingExcludes>
-                 </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-
-</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>
+        <groupId>org.apache.portals.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>3.0.2-SNAPSHOT</version>
+    </parent>
+
+   <artifactId>PortletHubDemo</artifactId>
+   <packaging>war</packaging>
+
+   <dependencies>
+      <dependency>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${project.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.tomcat</groupId>
+         <artifactId>tomcat-servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+      </dependency>
+
+      <!-- for eclipse JSP tooling purposes -->
+      <dependency>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
+         <version>2.1</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.taglibs</groupId>
+         <artifactId>taglibs-standard-spec</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.taglibs</groupId>
+          <artifactId>taglibs-standard-impl</artifactId>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.taglibs</groupId>
+          <artifactId>taglibs-standard-jstlel</artifactId>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.portals.pluto</groupId>
+         <artifactId>pluto-taglib</artifactId>
+         <version>2.1.0-M3</version>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <finalName>PortletHubDemo</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+
+         <!-- Don't attach source or javadoc archive (for release plugin)-->
+         <plugin>
+           <artifactId>maven-source-plugin</artifactId>
+           <configuration>
+             <attach>false</attach>
+           </configuration>
+         </plugin>
+         <plugin>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>
+
+         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-remote-resources-plugin</artifactId>
+             <executions>
+                 <execution>
+                     <goals>
+                         <goal>process</goal>
+                     </goals>
+                     <configuration>
+                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+                         <attached>false</attached>
+                     </configuration>
+                 </execution>
+             </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+   <profiles>
+       <profile>
+           <id>liferay</id>
+           <dependencies>
+               <dependency>
+                   <groupId>com.liferay.portal</groupId>
+                   <artifactId>com.liferay.cdi.bean.portlet.extension</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.jboss.weld.servlet</groupId>
+                   <artifactId>weld-servlet</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.slf4j</groupId>
+                   <artifactId>slf4j-log4j12</artifactId>
+               </dependency>
+           </dependencies>
+           <build>
+               <plugins>
+                   <plugin>
+                       <artifactId>maven-war-plugin</artifactId>
+                       <configuration>
+                           <packagingExcludes>
+                               WEB-INF/classes/logging.properties
+                           </packagingExcludes>
+                       </configuration>
+                   </plugin>
+               </plugins>
+           </build>
+      </profile>
+      <profile>
+         <id>pluto</id>
+         <dependencies>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-spec</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-impl</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-jstlel</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <scope>provided</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                 <artifactId>maven-war-plugin</artifactId>
+                 <configuration>
+                   <packagingExcludes>
+                       WEB-INF/beans.xml,
+                       WEB-INF/liferay-portlet.xml,
+                       WEB-INF/classes/log4j.properties
+                   </packagingExcludes>
+                 </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/9dbea022/PortletV3AnnotatedDemo/pom.xml
----------------------------------------------------------------------
diff --git a/PortletV3AnnotatedDemo/pom.xml b/PortletV3AnnotatedDemo/pom.xml
index 9c1cf77..fd7e0a7 100644
--- a/PortletV3AnnotatedDemo/pom.xml
+++ b/PortletV3AnnotatedDemo/pom.xml
@@ -1,180 +1,188 @@
-<!--
-  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.2-SNAPSHOT</version>
-    </parent>
-
-   <artifactId>PortletV3AnnotatedDemo</artifactId>
-   <packaging>war</packaging>
-
-   <dependencies>
-      <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.portals.pluto</groupId>
-         <artifactId>pluto-taglib</artifactId>
-         <version>${project.version}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.tomcat</groupId>
-         <artifactId>tomcat-servlet-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-      </dependency>
-
-      <!-- for eclipse JSP tooling purposes -->
-      <dependency>
-         <groupId>javax.servlet.jsp</groupId>
-         <artifactId>jsp-api</artifactId>
-         <version>2.1</version>
-         <scope>provided</scope>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <finalName>PortletV3AnnotatedDemo</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-               <failOnMissingWebXml>false</failOnMissingWebXml>
-            </configuration>
-         </plugin>
-         
-         <!-- Don't attach source or javadoc archive (for release plugin)-->
-         <plugin>
-           <artifactId>maven-source-plugin</artifactId>
-           <configuration>
-             <attach>false</attach>
-           </configuration>
-         </plugin>
-         <plugin>
-           <artifactId>maven-javadoc-plugin</artifactId>
-           <configuration>
-             <skip>true</skip>
-           </configuration>
-         </plugin>
-         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
-         <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-remote-resources-plugin</artifactId>
-             <executions>
-                 <execution>
-                     <goals>
-                         <goal>process</goal>
-                     </goals>
-                     <configuration>
-                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                         <attached>false</attached>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-      <profile>
-        <id>liferay</id>
-        <dependencies>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </dependency>
-        </dependencies>
-        <build>
-          <plugins>
-            <plugin>
-              <artifactId>maven-war-plugin</artifactId>
-              <configuration>
-                  <packagingExcludes>
-                      WEB-INF/classes/logging.properties
-                  </packagingExcludes>
-              </configuration>
-            </plugin>
-          </plugins>
-        </build>
-      </profile>
-      <profile>
-         <id>pluto</id>
-         <dependencies>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-spec</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-impl</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-jstlel</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-jdk14</artifactId>
-                <scope>provided</scope>
-            </dependency>
-         </dependencies>
-         
-         <build>
-            <plugins>
-               <plugin>
-                 <artifactId>maven-war-plugin</artifactId>
-                 <configuration>
-                   <packagingExcludes>
-                      WEB-INF/liferay-portlet.xml,
-                      WEB-INF/classes/log4j.properties
-                   </packagingExcludes>
-                 </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-
-</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>
+        <groupId>org.apache.portals.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>3.0.2-SNAPSHOT</version>
+    </parent>
+
+   <artifactId>PortletV3AnnotatedDemo</artifactId>
+   <packaging>war</packaging>
+
+   <dependencies>
+      <dependency>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${project.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.portals.pluto</groupId>
+         <artifactId>pluto-taglib</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.tomcat</groupId>
+         <artifactId>tomcat-servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+      </dependency>
+
+      <!-- for eclipse JSP tooling purposes -->
+      <dependency>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
+         <version>2.1</version>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <finalName>PortletV3AnnotatedDemo</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+               <failOnMissingWebXml>false</failOnMissingWebXml>
+            </configuration>
+         </plugin>
+         
+         <!-- Don't attach source or javadoc archive (for release plugin)-->
+         <plugin>
+           <artifactId>maven-source-plugin</artifactId>
+           <configuration>
+             <attach>false</attach>
+           </configuration>
+         </plugin>
+         <plugin>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>
+         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-remote-resources-plugin</artifactId>
+             <executions>
+                 <execution>
+                     <goals>
+                         <goal>process</goal>
+                     </goals>
+                     <configuration>
+                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+                         <attached>false</attached>
+                     </configuration>
+                 </execution>
+             </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+   <profiles>
+      <profile>
+        <id>liferay</id>
+        <dependencies>
+          <dependency>
+            <groupId>com.liferay.portal</groupId>
+            <artifactId>com.liferay.cdi.bean.portlet.extension</artifactId>
+          </dependency>
+          <dependency>
+            <groupId>org.jboss.weld.servlet</groupId>
+            <artifactId>weld-servlet</artifactId>
+          </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+          </dependency>
+        </dependencies>
+        <build>
+          <plugins>
+            <plugin>
+              <artifactId>maven-war-plugin</artifactId>
+              <configuration>
+                  <packagingExcludes>
+                      WEB-INF/classes/logging.properties
+                  </packagingExcludes>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+      <profile>
+         <id>pluto</id>
+         <dependencies>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-spec</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-impl</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-jstlel</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <scope>provided</scope>
+            </dependency>
+         </dependencies>
+         
+         <build>
+            <plugins>
+               <plugin>
+                 <artifactId>maven-war-plugin</artifactId>
+                 <configuration>
+                   <packagingExcludes>
+                      WEB-INF/liferay-portlet.xml,
+                      WEB-INF/classes/log4j.properties
+                   </packagingExcludes>
+                 </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/9dbea022/PortletV3Demo/pom.xml
----------------------------------------------------------------------
diff --git a/PortletV3Demo/pom.xml b/PortletV3Demo/pom.xml
index 034d18b..a369282 100644
--- a/PortletV3Demo/pom.xml
+++ b/PortletV3Demo/pom.xml
@@ -1,195 +1,203 @@
-<!--
-  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.2-SNAPSHOT</version>
-    </parent>
-
-   <artifactId>PortletV3Demo</artifactId>
-   <packaging>war</packaging>
-
-   <dependencies>
-      <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.portals.pluto</groupId>
-         <artifactId>pluto-taglib</artifactId>
-         <version>${project.version}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.tomcat</groupId>
-         <artifactId>tomcat-servlet-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-      </dependency>
-
-      <!-- for eclipse JSP tooling purposes -->
-      <dependency>
-         <groupId>javax.servlet.jsp</groupId>
-         <artifactId>jsp-api</artifactId>
-         <version>2.1</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.taglibs</groupId>
-         <artifactId>taglibs-standard-spec</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-impl</artifactId>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-jstlel</artifactId>
-          <scope>provided</scope>
-      </dependency>
-   </dependencies>
-
-   <build>
-      <finalName>PortletV3Demo</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-         <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-               <failOnMissingWebXml>false</failOnMissingWebXml>
-            </configuration>
-         </plugin>
-         
-         <!-- Don't attach source or javadoc archive (for release plugin)-->
-         <plugin>
-           <artifactId>maven-source-plugin</artifactId>
-           <configuration>
-             <attach>false</attach>
-           </configuration>
-         </plugin>
-         <plugin>
-           <artifactId>maven-javadoc-plugin</artifactId>
-           <configuration>
-             <skip>true</skip>
-           </configuration>
-         </plugin>
-         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
-         <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-remote-resources-plugin</artifactId>
-             <executions>
-                 <execution>
-                     <goals>
-                         <goal>process</goal>
-                     </goals>
-                     <configuration>
-                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                         <attached>false</attached>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-       <profile>
-           <id>liferay</id>
-           <dependencies>
-               <dependency>
-                   <groupId>org.slf4j</groupId>
-                   <artifactId>slf4j-log4j12</artifactId>
-               </dependency>
-           </dependencies>
-           <build>
-               <plugins>
-                   <plugin>
-                       <artifactId>maven-war-plugin</artifactId>
-                       <configuration>
-                           <packagingExcludes>
-                               WEB-INF/classes/logging.properties
-                           </packagingExcludes>
-                       </configuration>
-                   </plugin>
-               </plugins>
-           </build>
-       </profile>
-      <profile>
-         <id>pluto</id>
-         <dependencies>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-spec</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-impl</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-jstlel</artifactId>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-jdk14</artifactId>
-                <scope>provided</scope>
-            </dependency>
-         </dependencies>
-         
-         <build>
-            <plugins>
-               <plugin>
-                 <artifactId>maven-war-plugin</artifactId>
-                 <configuration>
-                   <packagingExcludes>
-                       WEB-INF/liferay-portlet.xml,
-                       WEB-INF/classes/log4j.properties
-                   </packagingExcludes>
-                 </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-
-</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>
+        <groupId>org.apache.portals.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>3.0.2-SNAPSHOT</version>
+    </parent>
+
+   <artifactId>PortletV3Demo</artifactId>
+   <packaging>war</packaging>
+
+   <dependencies>
+      <dependency>
+        <groupId>javax.portlet</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${project.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.portals.pluto</groupId>
+         <artifactId>pluto-taglib</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.tomcat</groupId>
+         <artifactId>tomcat-servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+      </dependency>
+
+      <!-- for eclipse JSP tooling purposes -->
+      <dependency>
+         <groupId>javax.servlet.jsp</groupId>
+         <artifactId>jsp-api</artifactId>
+         <version>2.1</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.taglibs</groupId>
+         <artifactId>taglibs-standard-spec</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.taglibs</groupId>
+          <artifactId>taglibs-standard-impl</artifactId>
+          <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.taglibs</groupId>
+          <artifactId>taglibs-standard-jstlel</artifactId>
+          <scope>provided</scope>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <finalName>PortletV3Demo</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+               <failOnMissingWebXml>false</failOnMissingWebXml>
+            </configuration>
+         </plugin>
+         
+         <!-- Don't attach source or javadoc archive (for release plugin)-->
+         <plugin>
+           <artifactId>maven-source-plugin</artifactId>
+           <configuration>
+             <attach>false</attach>
+           </configuration>
+         </plugin>
+         <plugin>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>
+         <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE and LICENSE file to be put under WEB-INF/classes/META-INF -->
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-remote-resources-plugin</artifactId>
+             <executions>
+                 <execution>
+                     <goals>
+                         <goal>process</goal>
+                     </goals>
+                     <configuration>
+                         <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+                         <attached>false</attached>
+                     </configuration>
+                 </execution>
+             </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+   <profiles>
+       <profile>
+           <id>liferay</id>
+           <dependencies>
+               <dependency>
+                   <groupId>com.liferay.portal</groupId>
+                   <artifactId>com.liferay.cdi.bean.portlet.extension</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.jboss.weld.servlet</groupId>
+                   <artifactId>weld-servlet</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.slf4j</groupId>
+                   <artifactId>slf4j-log4j12</artifactId>
+               </dependency>
+           </dependencies>
+           <build>
+               <plugins>
+                   <plugin>
+                       <artifactId>maven-war-plugin</artifactId>
+                       <configuration>
+                           <packagingExcludes>
+                               WEB-INF/classes/logging.properties
+                           </packagingExcludes>
+                       </configuration>
+                   </plugin>
+               </plugins>
+           </build>
+       </profile>
+      <profile>
+         <id>pluto</id>
+         <dependencies>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-spec</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-impl</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-jstlel</artifactId>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <scope>provided</scope>
+            </dependency>
+         </dependencies>
+         
+         <build>
+            <plugins>
+               <plugin>
+                 <artifactId>maven-war-plugin</artifactId>
+                 <configuration>
+                   <packagingExcludes>
+                       WEB-INF/liferay-portlet.xml,
+                       WEB-INF/classes/log4j.properties
+                   </packagingExcludes>
+                 </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>