[WFCORE-3769] Use Galleon to create the distributions and provision t…

…he test suites.
fjuma · May 7, 2018 · 733d3c2 · 733d3c2
1 parent f773408
commit 733d3c2
Show file tree

Hide file tree

Showing 104 changed files with 2,864 additions and 355 deletions.
diff --git a/build-legacy/assembly.xml b/build-legacy/assembly.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ /*
+  ~ * JBoss, Home of Professional Open Source.
+  ~ * Copyright 2013, Red Hat, Inc., and individual contributors
+  ~ * as indicated by the @author tags. See the copyright.txt file in the
+  ~ * distribution for a full listing of individual contributors.
+  ~ *
+  ~ * This is free software; you can redistribute it and/or modify it
+  ~ * under the terms of the GNU Lesser General Public License as
+  ~ * published by the Free Software Foundation; either version 2.1 of
+  ~ * the License, or (at your option) any later version.
+  ~ *
+  ~ * This software is distributed in the hope that it will be useful,
+  ~ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ * Lesser General Public License for more details.
+  ~ *
+  ~ * You should have received a copy of the GNU Lesser General Public
+  ~ * License along with this software; if not, write to the Free
+  ~ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  ~ */
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>distro</id>
+    <formats>
+       <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory/>
+            <includes>
+                <include>${server.output.dir.prefix}-${wildfly.core.release.version}/**</include>
+            </includes>
+            <excludes>
+                <exclude>**/.installation/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/build-legacy/pom.xml b/build-legacy/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2014, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-core-parent</artifactId>
+        <version>5.0.0.Alpha6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>wildfly-core-build-legacy</artifactId>
+
+    <name>WildFly: Legacy Build Core</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly.core</groupId>
+            <artifactId>wildfly-core-feature-pack</artifactId>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>legacy-build</id>
+            <activation>
+                <property>
+                    <name>legacyBuild</name>
+                </property>
+            </activation>
+            <build>
+                <finalName>${server.output.dir.prefix}-${project.version}</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.wildfly.build</groupId>
+                        <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>server-provisioning</id>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                                <phase>compile</phase>
+                                <configuration>
+                                    <config-file>server-provisioning.xml</config-file>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>legacy-release</id>
+            <activation>
+                <property>
+                    <name>legacyRelease</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>assemble</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>assembly.xml</descriptor>
+                                    </descriptors>
+                                    <recompressZippedFiles>true</recompressZippedFiles>
+                                    <finalName>${server.output.dir.prefix}-${project.version}</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/build/server-provisioning.xml → build-legacy/server-provisioning.xml b/build/server-provisioning.xml → build-legacy/server-provisioning.xml
@@ -23,4 +23,4 @@
     <feature-packs>
         <feature-pack groupId="org.wildfly.core" artifactId="wildfly-core-feature-pack" version="${project.version}" />
     </feature-packs>
-</server-provisioning>
+</server-provisioning>
diff --git a/build/assembly.xml b/build/assembly.xml
@@ -39,6 +39,10 @@
             <includes>
                 <include>${server.output.dir.prefix}-${wildfly.core.release.version}/**</include>
             </includes>
+            <excludes>
+                <exclude>**/.galleon/**</exclude>
+                <exclude>**/.installation/**</exclude>
+            </excludes>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/build/pom.xml b/build/pom.xml
@@ -41,32 +41,39 @@
     <dependencies>
         <dependency>
             <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-core-feature-pack</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>wildfly-core-galleon-pack</artifactId>
+            <type>pom</type>
         </dependency>
     </dependencies>
 
     <build>
         <finalName>${server.output.dir.prefix}-${project.version}</finalName>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.build</groupId>
-                <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
+                <groupId>org.jboss.galleon</groupId>
+                <artifactId>galleon-maven-plugins</artifactId>
                 <executions>
                     <execution>
                         <id>server-provisioning</id>
                         <goals>
-                            <goal>build</goal>
+                            <goal>provision</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
-                            <config-file>server-provisioning.xml</config-file>
+                            <install-dir>${project.build.directory}/${project.build.finalName}</install-dir>
+                            <plugin-options>
+                                <jboss-maven-dist/>
+                            </plugin-options>
+                            <feature-packs>
+                                <feature-pack>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>wildfly-core-galleon-pack</artifactId>
+                                    <version>${project.version}</version>
+                                    <excluded-packages>
+                                        <name>product.conf</name>
+                                        <name>docs.schema</name>
+                                    </excluded-packages>
+                                </feature-pack>
+                            </feature-packs>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/component-matrix/pom.xml b/component-matrix/pom.xml
@@ -619,6 +619,18 @@
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.core</groupId>
+                <artifactId>wildfly-core-galleon-pack</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.wildfly.core</groupId>
+                <artifactId>wildfly-core-galleon-pack</artifactId>
+                <version>${project.version}</version>
+                <type>zip</type>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.core</groupId>
                 <artifactId>wildfly-core-management-client</artifactId>
@@ -661,13 +673,13 @@
             </dependency>
             <dependency>
                 <groupId>org.wildfly.core</groupId>
-                <artifactId>wildfly-core-vault-test-feature-pack</artifactId>
+                <artifactId>wildfly-core-vault-test-galleon-pack</artifactId>
                 <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.core</groupId>
-                <artifactId>wildfly-core-vault-test-feature-pack</artifactId>
+                <artifactId>wildfly-core-vault-test-galleon-pack</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>

diff --git a/core-feature-pack/pom.xml b/core-feature-pack/pom.xml
@@ -113,10 +113,10 @@
             <groupId>org.jboss.spec.javax.security.jacc</groupId>
             <artifactId>jboss-jacc-api_1.5_spec</artifactId>
             <exclusions>
-	        <exclusion>
+                <exclusion>
                     <groupId>org.jboss.spec.javax.servlet</groupId>
                     <artifactId>jboss-servlet-api_3.1_spec</artifactId>
-                    </exclusion>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -139,7 +139,7 @@
             <groupId>org.aesh</groupId>
             <artifactId>aesh-extensions</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.aesh</groupId>
             <artifactId>aesh</artifactId>
@@ -563,9 +563,8 @@
             </plugin>
         </plugins>
     </build>
-
+    
     <profiles>
-
         <profile>
             <id>update-licenses-xml</id>
             <activation>

diff --git a/core-feature-pack/src/main/resources/content/docs/licenses/licenses.xsl b/core-feature-pack/src/main/resources/content/docs/licenses/licenses.xsl
@@ -6,15 +6,15 @@
     <xsl:param name="version"/>
     <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz '" />
     <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ!'" />
-    
+
     <xsl:template match="/">
         <html>
             <head>
                 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
                 <link rel="stylesheet" type="text/css" href="licenses.css"/>
             </head>
             <body>
-                <h2>Wildfly Core <xsl:value-of select="$version"/></h2>
+                <h2>WildFly Core&#160;<xsl:value-of select="$version"/></h2>
                 <p>The following material has been provided for informational purposes only, and should not be relied upon or construed as a legal opinion or legal advice.</p>
                 <!-- Read matching templates -->
                 <table>
@@ -33,7 +33,14 @@
                             <td><xsl:value-of select="version"/></td>
                             <td>
                                 <xsl:for-each select="licenses/license">
-                                    <a href="{./url}"><xsl:value-of select="name"/></a><br/>
+                                    <xsl:choose>
+                                        <xsl:when test="name = 'Public Domain'">
+                                            <xsl:value-of select="name"/><br/>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <a href="{./url}"><xsl:value-of select="name"/></a><br/>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
                                 </xsl:for-each>
                             </td>
                             <td>
@@ -59,12 +66,30 @@
             <xsl:when test="$name = 'BSD 3-clause &quot;New&quot; or &quot;Revised&quot; License'">
                 <xsl:text>bsd 3-clause new or revised license.html</xsl:text>
             </xsl:when>
+            <xsl:when test="$name = 'BSD 3-Clause No Nuclear License'">
+                <xsl:text>bsd 3-clause no nuclear license.html</xsl:text>
+            </xsl:when>
+            <xsl:when test="$name = 'Creative Commons Attribution 2.5'">
+                <xsl:text>creative commons attribution 2.5.html</xsl:text>
+            </xsl:when>
+            <xsl:when test="$name = 'GNU Lesser General Public License v2.1 or later'">
+                <xsl:text>gnu lesser general public license v2.1 or later.txt</xsl:text>
+            </xsl:when>
             <xsl:when test="$name = 'GNU General Public License v2.0 only'">
                 <xsl:text>gnu general public license v2.0 only.html</xsl:text>
             </xsl:when>
             <xsl:when test="$name = 'Indiana University Extreme! Lab Software License 1.1.1'">
                 <xsl:text>indiana university extreme lab software license 1.1.1.html</xsl:text>
             </xsl:when>
+            <xsl:when test="$name = 'Mozilla Public License 2.0'">
+                <xsl:text>mozilla public license 2.0.html</xsl:text>
+            </xsl:when>
+            <xsl:when test="$name = 'Plexus Classworlds License'">
+                <xsl:text>plexus classworlds license.html</xsl:text>
+            </xsl:when>
+            <xsl:when test="$name = 'The JSoup MIT License'">
+                <xsl:text>the jsoup mit license.html</xsl:text>
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="concat(translate($name, $uppercase, $lowercase), '.txt')"/>
             </xsl:otherwise>