Skip to content

Commit

Permalink
[WFLY-10318] Use Galleon to create the distributions and provision th…
Browse files Browse the repository at this point in the history
…e test suites.
  • Loading branch information
ehsavoie authored and Alexey Loubyansky committed May 15, 2018
1 parent 148f1a0 commit 3337695
Show file tree
Hide file tree
Showing 159 changed files with 11,049 additions and 183 deletions.
18 changes: 18 additions & 0 deletions build-legacy/assembly.xml
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>thin-server</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target</directory>
<outputDirectory/>
<includes>
<include>${server.output.dir.prefix}-${server.output.dir.version}/**</include>
</includes>
</fileSet>
</fileSets>
</assembly>
126 changes: 126 additions & 0 deletions build-legacy/pom.xml
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2010, 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</groupId>
<artifactId>wildfly-parent</artifactId>
<!--
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>13.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>wildfly-build-legacy</artifactId>

<name>WildFly: Legacy Build</name>
<packaging>pom</packaging>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-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}-${server.output.dir.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>${project.build.finalName}</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>
File renamed without changes.
58 changes: 50 additions & 8 deletions build/pom.xml
Expand Up @@ -42,10 +42,10 @@
<name>WildFly: Build</name>
<packaging>pom</packaging>

<dependencies>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<artifactId>wildfly-galleon-pack</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
Expand All @@ -60,17 +60,59 @@
<finalName>${server.output.dir.prefix}-${server.output.dir.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>
<phase>prepare-package</phase>
<configuration>
<config-file>server-provisioning.xml</config-file>
<install-dir>${project.build.directory}/${project.build.finalName}</install-dir>
<feature-packs>
<feature-pack>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<inherit-configs>false</inherit-configs>
<excluded-packages>
<name>product.conf</name>
<name>docs.schema</name>
<name>docs.licenses.merge</name>
</excluded-packages>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-servlet-galleon-pack</artifactId>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone-load-balancer.xml</name>
</config>
</included-configs>
<excluded-packages>
<name>product.conf</name>
<name>docs.schema</name>
</excluded-packages>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${project.version}</version>
<excluded-packages>
<name>product.conf</name>
<name>docs.schema</name>
</excluded-packages>
<included-packages>
<name>docs.examples.configs</name>
</included-packages>
</feature-pack>
</feature-packs>
<plugin-options>
<jboss-maven-dist/>
</plugin-options>
</configuration>
</execution>
</executions>
Expand All @@ -90,7 +132,7 @@
<descriptor>assembly.xml</descriptor>
</descriptors>
<recompressZippedFiles>true</recompressZippedFiles>
<finalName>${server.output.dir.prefix}-${server.output.dir.version}</finalName>
<finalName>${project.build.finalName}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>${project.build.directory}</outputDirectory>
<workDirectory>${project.build.directory}/assembly/work</workDirectory>
Expand Down
52 changes: 52 additions & 0 deletions dist-legacy/assembly-src.xml
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>src</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<fileSet>
<directory>..</directory>
<outputDirectory>${server.output.dir.prefix}-${server.output.dir.version}-src</outputDirectory>
<includes>
<include>**/*.xml</include>
<include>**/src/**</include>
<include>**/*.txt</include>
<include>**/*.sh</include>
<include>**/*.cli</include>
<include>**/*.bat</include>
<include>**/*.md</include>
<include>tools/**</include>
<include>mvnw</include>
<include>mvnw.cmd</include>
<include>.mvn/**</include>
</includes>
<excludes>
<!-- Ignore build output -->
<exclude>**/target/**</exclude>

<!-- Ignore git repo -->
<exclude>**/.git/**</exclude>

<!-- Ignore IDE configuration and other hidden files-->
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings</exclude>
<exclude>**/.metadata</exclude>
<exclude>**/.iml</exclude>
<exclude>**/.ipr</exclude>
<exclude>**/.iws</exclude>
<exclude>**/.idea</exclude>
<exclude>nbactions.xml</exclude>
<exclude>nb-configuration.xml</exclude>
<exclude>catalog.xml</exclude>

</excludes>
</fileSet>
</fileSets>
</assembly>
19 changes: 19 additions & 0 deletions dist-legacy/assembly.xml
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target</directory>
<outputDirectory/>
<includes>
<include>${server.output.dir.prefix}-${server.output.dir.version}/**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

0 comments on commit 3337695

Please sign in to comment.