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/08/04 20:05:31 UTC
portals-pluto git commit: PLUTO-726 The pluto profile in the
V3AnnotationPortletAppConfigOverrideTests pom.xml descriptor does not ignore
Liferay-specific files
Repository: portals-pluto
Updated Branches:
refs/heads/master 1543c13ab -> 9e8cafb93
PLUTO-726 The pluto profile in the V3AnnotationPortletAppConfigOverrideTests pom.xml descriptor does not ignore Liferay-specific files
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/9e8cafb9
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/9e8cafb9
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/9e8cafb9
Branch: refs/heads/master
Commit: 9e8cafb934c8d1aefaeebd267c7371d0ed412405
Parents: 1543c13
Author: Neil Griffin <ne...@gmail.com>
Authored: Sat Aug 4 16:04:58 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Sat Aug 4 16:04:58 2018 -0400
----------------------------------------------------------------------
.../pom.xml | 15 +++++++++++++--
.../src/main/webapp/WEB-INF/beans.xml | 6 ++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/9e8cafb9/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
index 36f1394..7d3dc38 100644
--- a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
@@ -120,7 +120,6 @@
<profiles>
<profile>
<id>pluto</id>
-
<dependencies>
<dependency>
<groupId>org.apache.taglibs</groupId>
@@ -138,7 +137,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/9e8cafb9/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/beans.xml b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..aa710c7
--- /dev/null
+++ b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" bean-discovery-mode="all" version="1.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd">
+ <!-- This file is necessary for Liferay Portal in order to inform CDI that scanning should occur for CDI annotations. -->
+</beans>
\ No newline at end of file