portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asfgr...@apache.org
Subject [1/2] portals-pluto git commit: PLUTO-735 Update the liferay maven profile for the V3 demos and TCK tests
Date Thu, 25 Oct 2018 17:29:33 GMT
Repository: portals-pluto
Updated Branches:
  refs/heads/master d16b3073a -> fc7000db5


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3PortletContextTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletContextTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3PortletContextTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..b62ff90
--- /dev/null
+++ b/portlet-tck_3.0/V3PortletContextTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3PortletContextTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/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 452b87f..c971d55 100644
--- a/portlet-tck_3.0/V3PortletHubTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletHubTests/pom.xml
@@ -119,23 +119,6 @@
 
    <profiles>
       <profile>
-         <id>liferay</id>
-         <dependencies>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.cdi.extension</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.jboss.weld.servlet</groupId>
-               <artifactId>weld-servlet</artifactId>
-            </dependency>
-         </dependencies>
-      </profile>
-      <profile>
          <id>pluto</id>
          <dependencies>
             <dependency>
@@ -160,6 +143,7 @@
                   <artifactId>maven-war-plugin</artifactId>
                   <configuration>
                      <packagingExcludes>
+                        WEB-INF/liferay-plugin-package.properties,
                         WEB-INF/liferay-portlet.xml
                      </packagingExcludes>
                   </configuration>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..70da962
--- /dev/null
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3PortletHubTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3PortletParametersTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletParametersTests/pom.xml b/portlet-tck_3.0/V3PortletParametersTests/pom.xml
index 807eb7f..99d89d7 100755
--- a/portlet-tck_3.0/V3PortletParametersTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletParametersTests/pom.xml
@@ -121,23 +121,6 @@
 
    <profiles>
       <profile>
-         <id>liferay</id>
-         <dependencies>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>com.liferay</groupId>
-			   <artifactId>com.liferay.bean.portlet.cdi.extension</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.jboss.weld.servlet</groupId>
-               <artifactId>weld-servlet</artifactId>
-            </dependency>
-         </dependencies>
-      </profile>
-      <profile>
          <id>pluto</id>
          <dependencies>
             <dependency>
@@ -163,6 +146,7 @@
                   <configuration>
                      <packagingExcludes>
                         WEB-INF/beans.xml,
+                        WEB-INF/liferay-plugin-package.properties,
                         WEB-INF/liferay-portlet.xml
                      </packagingExcludes>
                   </configuration>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3PortletParametersTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletParametersTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3PortletParametersTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..ffbf6cc
--- /dev/null
+++ b/portlet-tck_3.0/V3PortletParametersTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3PortletParametersTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3RenderStateTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3RenderStateTests/pom.xml b/portlet-tck_3.0/V3RenderStateTests/pom.xml
index 3d4e65f..ec7412d 100644
--- a/portlet-tck_3.0/V3RenderStateTests/pom.xml
+++ b/portlet-tck_3.0/V3RenderStateTests/pom.xml
@@ -120,23 +120,6 @@
 
    <profiles>
       <profile>
-         <id>liferay</id>
-         <dependencies>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.cdi.extension</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.jboss.weld.servlet</groupId>
-               <artifactId>weld-servlet</artifactId>
-            </dependency>
-         </dependencies>
-      </profile>
-      <profile>
          <id>pluto</id>
          <dependencies>
             <dependency>
@@ -162,6 +145,7 @@
                   <configuration>
                      <packagingExcludes>
                         WEB-INF/beans.xml,
+                        WEB-INF/liferay-plugin-package.properties,
                         WEB-INF/liferay-portlet.xml
                      </packagingExcludes>
                   </configuration>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..15671b8
--- /dev/null
+++ b/portlet-tck_3.0/V3RenderStateTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3RenderStateTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml b/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
index a4deef9..2416899 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
@@ -120,23 +120,6 @@
 
    <profiles>
       <profile>
-         <id>liferay</id>
-         <dependencies>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.cdi.extension</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.jboss.weld.servlet</groupId>
-               <artifactId>weld-servlet</artifactId>
-            </dependency>
-         </dependencies>
-      </profile>
-      <profile>
          <id>pluto</id>
          <dependencies>
             <dependency>
@@ -161,6 +144,7 @@
                   <artifactId>maven-war-plugin</artifactId>
                   <configuration>
                      <packagingExcludes>
+                        WEB-INF/liferay-plugin-package.properties,
                         WEB-INF/liferay-portlet.xml
                      </packagingExcludes>
                   </configuration>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3ResourceAsyncTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..2a20536
--- /dev/null
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3ResourceAsyncTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3URLTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3URLTests/pom.xml b/portlet-tck_3.0/V3URLTests/pom.xml
index 92222ad..723eb02 100644
--- a/portlet-tck_3.0/V3URLTests/pom.xml
+++ b/portlet-tck_3.0/V3URLTests/pom.xml
@@ -122,20 +122,6 @@
    <profiles>
       <profile>
          <id>liferay</id>
-         <dependencies>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>com.liferay</groupId>
-               <artifactId>com.liferay.bean.portlet.cdi.extension</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.jboss.weld.servlet</groupId>
-               <artifactId>weld-servlet</artifactId>
-            </dependency>
-         </dependencies>
          <build>
             <plugins>
                <plugin>
@@ -174,6 +160,7 @@
                   <artifactId>maven-war-plugin</artifactId>
                   <configuration>
                      <packagingExcludes>
+                        WEB-INF/liferay-plugin-package.properties,
                         WEB-INF/liferay-portlet.xml,
                         WEB-INF/classes/log4j.properties
                      </packagingExcludes>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/V3URLTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3URLTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
b/portlet-tck_3.0/V3URLTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..9921fcf
--- /dev/null
+++ b/portlet-tck_3.0/V3URLTests/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#######################################################################
+name=V3URLTests
+module-group-id=org.apache.portals.pluto
+deploy-excludes=**/WEB-INF/lib/util-java.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/fc7000db/portlet-tck_3.0/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml
index a40a039..717be4b 100644
--- a/portlet-tck_3.0/pom.xml
+++ b/portlet-tck_3.0/pom.xml
@@ -581,14 +581,7 @@
             <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>slf4j-api</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>org.slf4j</groupId>
-               <artifactId>slf4j-log4j12</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>log4j</groupId>
-               <artifactId>log4j</artifactId>
+               <scope>provided</scope>
             </dependency>
          </dependencies>
          <build>


Mime
View raw message