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/05/02 23:08:46 UTC
portals-pluto git commit: PLUTO-662 Introduce a liferay profile for
the tck
Repository: portals-pluto
Updated Branches:
refs/heads/master 5dc0c83c6 -> fc913dede
PLUTO-662 Introduce a liferay profile for the tck
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/fc913ded
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/fc913ded
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/fc913ded
Branch: refs/heads/master
Commit: fc913dede315eaf20ddf37b385174ff9ebf57cbc
Parents: 5dc0c83
Author: Neil Griffin <ne...@gmail.com>
Authored: Wed May 2 19:08:34 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Wed May 2 19:08:34 2018 -0400
----------------------------------------------------------------------
portlet-tck_3.0/V3PortletHubTests/pom.xml | 29 ++++++++++++++++++--
.../src/main/webapp/WEB-INF/liferay-portlet.xml | 4 +--
2 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc913ded/portlet-tck_3.0/V3PortletHubTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/pom.xml b/portlet-tck_3.0/V3PortletHubTests/pom.xml
index c4f7397..5a417f5 100644
--- a/portlet-tck_3.0/V3PortletHubTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletHubTests/pom.xml
@@ -116,11 +116,22 @@
</plugins>
</build>
-
<profiles>
<profile>
+ <id>liferay</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.liferay.portal</groupId>
+ <artifactId>com.liferay.bean.portlet.extension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>pluto</id>
-
<dependencies>
<dependency>
<groupId>org.apache.taglibs</groupId>
@@ -138,7 +149,19 @@
<scope>compile</scope>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <packagingExcludes>
+ WEB-INF/beans.xml,
+ WEB-INF/liferay-portlet.xml
+ </packagingExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc913ded/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-portlet.xml b/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-portlet.xml
index 21cd026..6bac9ac 100644
--- a/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -21,11 +21,11 @@
<liferay-portlet-app>
<portlet>
- <portlet-name>RenderStateTests_SPEC2_12_RenderState</portlet-name>
+ <portlet-name>RenderStateTests_SPEC1_12_RenderState</portlet-name>
<requires-namespaced-parameters>false</requires-namespaced-parameters>
</portlet>
<portlet>
- <portlet-name>RenderStateTests_SPEC2_12_RenderState2</portlet-name>
+ <portlet-name>RenderStateTests_SPEC1_12_RenderState2</portlet-name>
<requires-namespaced-parameters>false</requires-namespaced-parameters>
</portlet>
<portlet>