This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new e25947f  Profile for Plume to speed up the time to try one-line changes
     new 57f9bef  Merge branch 'master' of github.com:apache/tomee
e25947f is described below

commit e25947f92a8664d6ff952e4781e8fdb59c45210b
Author: David Blevins <[email protected]>
AuthorDate: Thu Apr 29 20:57:14 2021 -0700

    Profile for Plume to speed up the time to try one-line changes
---
 tomee/apache-tomee/pom.xml | 965 ++++++++++++++++++++++++++++-----------------
 tomee/pom.xml              |  62 +--
 2 files changed, 630 insertions(+), 397 deletions(-)

diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 820425e..bebf7e1 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -151,395 +151,616 @@
       </resource>
     </resources>
 
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/RemoteTomEEEJBContainer*.class</include>
-            
<include>**/META-INF/services/javax.ejb.spi.EJBContainerProvider</include>
-          </includes>
-          <archive combine.children="append">
-            <manifestEntries>
-              
<Automatic-Module-Name>${tomee.build.name}</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <configuration>
-          <nonFilteredFileExtensions>
-            <nonFilteredFileExtension>exe</nonFilteredFileExtension>
-          </nonFilteredFileExtensions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>filter-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-tomcat-for-webprofile</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.tomcat</groupId>
-                  <artifactId>tomcat</artifactId>
-                  <version>${tomcat.version}</version>
-                  <type>zip</type>
-                  <outputDirectory>${webprofile.work-dir}</outputDirectory>
-                  
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-tomcat-for-plus</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.tomcat</groupId>
-                  <artifactId>tomcat</artifactId>
-                  <version>${tomcat.version}</version>
-                  <type>zip</type>
-                  <outputDirectory>${plus.work-dir}</outputDirectory>
-                  
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-tomcat-for-plume</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.tomcat</groupId>
-                  <artifactId>tomcat</artifactId>
-                  <version>${tomcat.version}</version>
-                  <type>zip</type>
-                  <outputDirectory>${plume.work-dir}</outputDirectory>
-                  
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-tomcat-for-microprofile</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.tomcat</groupId>
-                  <artifactId>tomcat</artifactId>
-                  <version>${tomcat.version}</version>
-                  <type>zip</type>
-                  <outputDirectory>${microprofile.work-dir}</outputDirectory>
-                  
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+  </build>
 
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.tomee</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>${version.javaee-api}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomee.bom</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-          </dependency>
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>openejb-jpa-integration</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm9-shaded</artifactId>
-            <version>${xbeanVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${version.groovy}</version>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <classpathScope>runtime</classpathScope>
-          <scriptpath>
-            <path>${project.basedir}/src/main/groovy</path>
-          </scriptpath>
-          <defaults>
-            
<testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
-            
<logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
-            <backupLogs>true</backupLogs>
-          </defaults>
-        </configuration>
-        <executions>
-          <execution>
-            <id>execute-web-profile-installer</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
             <configuration>
-              <properties>
-                <tomee.workdir>${webprofile.work-dir}</tomee.workdir>
-                <tomee.webapp>tomee-webapp</tomee.webapp>
-                <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
-              </properties>
-              <source>
-                new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
-              </source>
+              <includes>
+                <include>**/RemoteTomEEEJBContainer*.class</include>
+                
<include>**/META-INF/services/javax.ejb.spi.EJBContainerProvider</include>
+              </includes>
+              <archive combine.children="append">
+                <manifestEntries>
+                  
<Automatic-Module-Name>${tomee.build.name}</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
             </configuration>
-          </execution>
-          <execution>
-            <id>execute-plus-installer</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
             <configuration>
-              <properties>
-                <tomee.workdir>${plus.work-dir}</tomee.workdir>
-                <tomee.webapp>tomee-plus-webapp</tomee.webapp>
-                <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
-              </properties>
-              <source>
-                new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
-              </source>
+              <nonFilteredFileExtensions>
+                <nonFilteredFileExtension>exe</nonFilteredFileExtension>
+              </nonFilteredFileExtensions>
             </configuration>
-          </execution>
-          <execution>
-            <id>execute-plume-installer</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <properties>
-                <tomee.workdir>${plume.work-dir}</tomee.workdir>
-                <tomee.webapp>tomee-plume-webapp</tomee.webapp>
-                <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
-              </properties>
-              <source>
-                new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
-              </source>
-            </configuration>
-          </execution>
-          <execution>
-            <id>execute-microprofile-installer</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
+            <executions>
+              <execution>
+                <id>filter-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-tomcat-for-webprofile</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.tomcat</groupId>
+                      <artifactId>tomcat</artifactId>
+                      <version>${tomcat.version}</version>
+                      <type>zip</type>
+                      <outputDirectory>${webprofile.work-dir}</outputDirectory>
+                      
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+              <execution>
+                <id>copy-tomcat-for-plus</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.tomcat</groupId>
+                      <artifactId>tomcat</artifactId>
+                      <version>${tomcat.version}</version>
+                      <type>zip</type>
+                      <outputDirectory>${plus.work-dir}</outputDirectory>
+                      
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+              <execution>
+                <id>copy-tomcat-for-plume</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.tomcat</groupId>
+                      <artifactId>tomcat</artifactId>
+                      <version>${tomcat.version}</version>
+                      <type>zip</type>
+                      <outputDirectory>${plume.work-dir}</outputDirectory>
+                      
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+              <execution>
+                <id>copy-tomcat-for-microprofile</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.tomcat</groupId>
+                      <artifactId>tomcat</artifactId>
+                      <version>${tomcat.version}</version>
+                      <type>zip</type>
+                      
<outputDirectory>${microprofile.work-dir}</outputDirectory>
+                      
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>groovy-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.tomee</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>${version.javaee-api}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.tomee.bom</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+              </dependency>
+              <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openejb-jpa-integration</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-asm9-shaded</artifactId>
+                <version>${xbeanVersion}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${version.groovy}</version>
+              </dependency>
+            </dependencies>
             <configuration>
-              <properties>
-                <tomee.workdir>${microprofile.work-dir}</tomee.workdir>
-                <tomee.webapp>tomee-microprofile-webapp</tomee.webapp>
-                <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
-              </properties>
-              <source>
-                new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
-              </source>
+              <classpathScope>runtime</classpathScope>
+              <scriptpath>
+                <path>${project.basedir}/src/main/groovy</path>
+              </scriptpath>
+              <defaults>
+                
<testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
+                
<logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
+                <backupLogs>true</backupLogs>
+              </defaults>
             </configuration>
-          </execution>
-        </executions>
-      </plugin>
+            <executions>
+              <execution>
+                <id>execute-web-profile-installer</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <properties>
+                    <tomee.workdir>${webprofile.work-dir}</tomee.workdir>
+                    <tomee.webapp>tomee-webapp</tomee.webapp>
+                    <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
+                  </properties>
+                  <source>
+                    new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
+                  </source>
+                </configuration>
+              </execution>
+              <execution>
+                <id>execute-plus-installer</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <properties>
+                    <tomee.workdir>${plus.work-dir}</tomee.workdir>
+                    <tomee.webapp>tomee-plus-webapp</tomee.webapp>
+                    <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
+                  </properties>
+                  <source>
+                    new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
+                  </source>
+                </configuration>
+              </execution>
+              <execution>
+                <id>execute-plume-installer</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <properties>
+                    <tomee.workdir>${plume.work-dir}</tomee.workdir>
+                    <tomee.webapp>tomee-plume-webapp</tomee.webapp>
+                    <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
+                  </properties>
+                  <source>
+                    new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
+                  </source>
+                </configuration>
+              </execution>
+              <execution>
+                <id>execute-microprofile-installer</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <properties>
+                    <tomee.workdir>${microprofile.work-dir}</tomee.workdir>
+                    <tomee.webapp>tomee-microprofile-webapp</tomee.webapp>
+                    <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
+                  </properties>
+                  <source>
+                    new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
+                  </source>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>webprofile</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    
<descriptor>src/main/assembly/tomee-webprofile.xml</descriptor>
+                  </descriptors>
+                  <attach>false</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  
<finalName>apache-tomee-webprofile-${project.version}</finalName>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>plus</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/tomee-plus.xml</descriptor>
+                  </descriptors>
+                  <attach>false</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>apache-tomee-plus-${project.version}</finalName>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>plume</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/tomee-plume.xml</descriptor>
+                  </descriptors>
+                  <attach>false</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>apache-tomee-plume-${project.version}</finalName>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>microprofile</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    
<descriptor>src/main/assembly/tomee-microprofile.xml</descriptor>
+                  </descriptors>
+                  <attach>false</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  
<finalName>apache-tomee-microprofile-${project.version}</finalName>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>webprofile</id>
-            <phase>package</phase>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-webprofile-${project.version}.zip</file>
+                      <type>zip</type>
+                      <classifier>webprofile</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-webprofile-${project.version}.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>webprofile</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plus-${project.version}.zip</file>
+                      <type>zip</type>
+                      <classifier>plus</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plus-${project.version}.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>plus</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plume-${project.version}.zip</file>
+                      <type>zip</type>
+                      <classifier>plume</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plume-${project.version}.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>plume</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-microprofile-${project.version}.zip</file>
+                      <type>zip</type>
+                      <classifier>microprofile</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-microprofile-${project.version}.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>microprofile</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.tomee.patch</groupId>
+            <artifactId>tomee-patch-plugin</artifactId>
+            <version>0.4-SNAPSHOT</version>
             <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/tomee-webprofile.xml</descriptor>
-              </descriptors>
-              <attach>false</attach>
-              <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-tomee-webprofile-${project.version}</finalName>
+              
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
+              <skipTransform>true</skipTransform>
+              <createTarGz>true</createTarGz>
+    <!--          <sourceExcludes>-->
+    <!--            <exclude>org/apache/cxf</exclude>-->
+    <!--          </sourceExcludes>-->
             </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>plus</id>
-            <phase>package</phase>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>plume</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
             <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/tomee-plus.xml</descriptor>
-              </descriptors>
-              <attach>false</attach>
-              <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-tomee-plus-${project.version}</finalName>
+              <includes>
+                <include>**/RemoteTomEEEJBContainer*.class</include>
+                
<include>**/META-INF/services/javax.ejb.spi.EJBContainerProvider</include>
+              </includes>
+              <archive combine.children="append">
+                <manifestEntries>
+                  
<Automatic-Module-Name>${tomee.build.name}</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
             </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>plume</id>
-            <phase>package</phase>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
             <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/tomee-plume.xml</descriptor>
-              </descriptors>
-              <attach>false</attach>
-              <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-tomee-plume-${project.version}</finalName>
+              <nonFilteredFileExtensions>
+                <nonFilteredFileExtension>exe</nonFilteredFileExtension>
+              </nonFilteredFileExtensions>
             </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>microprofile</id>
-            <phase>package</phase>
+            <executions>
+              <execution>
+                <id>filter-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-tomcat-for-plume</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.tomcat</groupId>
+                      <artifactId>tomcat</artifactId>
+                      <version>${tomcat.version}</version>
+                      <type>zip</type>
+                      <outputDirectory>${plume.work-dir}</outputDirectory>
+                      
<destFileName>apache-tomcat-${tomcat.version}.zip</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>groovy-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.tomee</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>${version.javaee-api}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.tomee.bom</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+              </dependency>
+              <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openejb-jpa-integration</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-asm9-shaded</artifactId>
+                <version>${xbeanVersion}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${version.groovy}</version>
+              </dependency>
+            </dependencies>
             <configuration>
-              <descriptors>
-                
<descriptor>src/main/assembly/tomee-microprofile.xml</descriptor>
-              </descriptors>
-              <attach>false</attach>
-              <appendAssemblyId>false</appendAssemblyId>
-              
<finalName>apache-tomee-microprofile-${project.version}</finalName>
+              <classpathScope>runtime</classpathScope>
+              <scriptpath>
+                <path>${project.basedir}/src/main/groovy</path>
+              </scriptpath>
+              <defaults>
+                
<testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
+                
<logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
+                <backupLogs>true</backupLogs>
+              </defaults>
             </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+            <executions>
+              <execution>
+                <id>execute-plume-installer</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <properties>
+                    <tomee.workdir>${plume.work-dir}</tomee.workdir>
+                    <tomee.webapp>tomee-plume-webapp</tomee.webapp>
+                    <remove.datestamp>${tomee.version}, ${project.version}, 
${cxf.version}</remove.datestamp>
+                  </properties>
+                  <source>
+                    new commands.SetupCommand(pom: this, log: log, project: 
project, ant: ant, properties: properties).execute()
+                  </source>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>plume</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/tomee-plume.xml</descriptor>
+                  </descriptors>
+                  <attach>false</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>apache-tomee-plume-${project.version}</finalName>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plume-${project.version}.zip</file>
+                      <type>zip</type>
+                      <classifier>plume</classifier>
+                    </artifact>
+                    <artifact>
+                      
<file>${project.build.directory}/apache-tomee-plume-${project.version}.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>plume</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.tomee.patch</groupId>
+            <artifactId>tomee-patch-plugin</artifactId>
+            <version>0.4-SNAPSHOT</version>
             <configuration>
-              <artifacts>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-webprofile-${project.version}.zip</file>
-                  <type>zip</type>
-                  <classifier>webprofile</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-webprofile-${project.version}.tar.gz</file>
-                  <type>tar.gz</type>
-                  <classifier>webprofile</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-plus-${project.version}.zip</file>
-                  <type>zip</type>
-                  <classifier>plus</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-plus-${project.version}.tar.gz</file>
-                  <type>tar.gz</type>
-                  <classifier>plus</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-plume-${project.version}.zip</file>
-                  <type>zip</type>
-                  <classifier>plume</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-plume-${project.version}.tar.gz</file>
-                  <type>tar.gz</type>
-                  <classifier>plume</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-microprofile-${project.version}.zip</file>
-                  <type>zip</type>
-                  <classifier>microprofile</classifier>
-                </artifact>
-                <artifact>
-                  
<file>${project.build.directory}/apache-tomee-microprofile-${project.version}.tar.gz</file>
-                  <type>tar.gz</type>
-                  <classifier>microprofile</classifier>
-                </artifact>
-              </artifacts>
+              
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
+              <skipTransform>true</skipTransform>
+              <createTarGz>true</createTarGz>
+    <!--          <sourceExcludes>-->
+    <!--            <exclude>org/apache/cxf</exclude>-->
+    <!--          </sourceExcludes>-->
             </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.tomee.patch</groupId>
-        <artifactId>tomee-patch-plugin</artifactId>
-        <version>0.4-SNAPSHOT</version>
-        <configuration>
-          
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
-          <skipTransform>true</skipTransform>
-          <createTarGz>true</createTarGz>
-<!--          <sourceExcludes>-->
-<!--            <exclude>org/apache/cxf</exclude>-->
-<!--          </sourceExcludes>-->
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+            <executions>
+              <execution>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index c100496..c2a3212 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -32,35 +32,47 @@
   <packaging>pom</packaging>
   <name>TomEE :: TomEE</name>
 
-  <modules>
-    <module>tomee-config</module>
-    <module>tomee-bootstrap</module>
-    <module>tomee-loader</module>
-    <module>tomee-catalina</module>
-    <module>tomee-common</module>
-    <module>tomee-myfaces</module>
-    <module>tomee-mojarra</module>
-    <module>tomee-jdbc</module>
-    <module>tomee-jaxrs</module>
-    <module>tomee-webapp</module>
-    <module>tomee-webaccess</module>
-    <module>tomee-plus-webapp</module>
-    <module>tomee-plume-webapp</module>
-    <module>tomee-webservices</module>
-    <module>tomee-embedded</module>
-    <module>tomee-microprofile</module>
-    <module>apache-tomee</module>
-    <module>tomee-util</module>
-    <module>tomee-juli</module>
-    <module>tomee-overlay-runner</module>
-    <!--<module>tomee-deb</module>-->
-    <module>tomee-security</module>
-  </modules>
-
 
   <!-- just set the good JPA provider. As openejb-core is needed in all 
modules it is easier to do it here -->
   <profiles>
     <profile>
+      <id>main</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+         <module>tomee-config</module>
+         <module>tomee-bootstrap</module>
+         <module>tomee-loader</module>
+         <module>tomee-catalina</module>
+         <module>tomee-common</module>
+         <module>tomee-myfaces</module>
+         <module>tomee-mojarra</module>
+         <module>tomee-jdbc</module>
+         <module>tomee-jaxrs</module>
+         <module>tomee-webapp</module>
+         <module>tomee-webaccess</module>
+         <module>tomee-plus-webapp</module>
+         <module>tomee-plume-webapp</module>
+         <module>tomee-webservices</module>
+         <module>tomee-embedded</module>
+         <module>tomee-microprofile</module>
+         <module>apache-tomee</module>
+         <module>tomee-util</module>
+         <module>tomee-juli</module>
+         <module>tomee-overlay-runner</module>
+         <!--<module>tomee-deb</module>-->
+         <module>tomee-security</module>
+       </modules>
+    </profile>
+    <profile>
+      <id>plume</id>
+      <modules>
+        <module>tomee-plume-webapp</module>
+        <module>apache-tomee</module>
+      </modules>
+    </profile>
+    <profile>
       <id>openjpa</id>
       <activation>
         <activeByDefault>true</activeByDefault>

Reply via email to