Skip to content

Commit

Permalink
Get "mvn clean install -Dfull" to build the assembly and docs too (a…
Browse files Browse the repository at this point in the history
…nd to be in sync with the rest of the droolsjbpm build): create jbpm-distribution module (note: assemblies have not yet been standarized like the rest of droolsjbpm)
  • Loading branch information
ge0ffrey committed Apr 21, 2011
1 parent 0f48287 commit 5569850
Show file tree
Hide file tree
Showing 11 changed files with 217 additions and 75 deletions.
34 changes: 0 additions & 34 deletions assembly/pre-bin.xml

This file was deleted.

10 changes: 10 additions & 0 deletions jbpm-distribution/.gitignore
@@ -0,0 +1,10 @@
/target
/local

# Eclipse, Netbeans and IntelliJ files
/.*
!.gitignore
/nbproject
/*.ipr
/*.iws
/*.iml
138 changes: 138 additions & 0 deletions jbpm-distribution/pom.xml
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>jbpm</artifactId>
<groupId>org.jbpm</groupId>
<version>5.1-SNAPSHOT</version>
</parent>

<artifactId>jbpm-distribution</artifactId>
<packaging>pom</packaging>

<name>jBPM distribution</name>
<description>
Builds the download zip of jBPM.
</description>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<finalName>jbpm-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/pre-bin.xml</descriptor>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/gwt-console.xml</descriptor>
<descriptor>src/main/assembly/installer.xml</descriptor>
<descriptor>src/main/assembly/docs-build.xml</descriptor>
<descriptor>src/main/assembly/docs.xml</descriptor>
</descriptors>
<!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- Binaries and sources -->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-flow</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-flow</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-flow-builder</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-flow-builder</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-persistence-jpa</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-persistence-jpa</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-bpmn2</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-bpmn2</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-bam</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-bam</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-human-task</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-human-task</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-workitems</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jbpm</groupId>-->
<!--<artifactId>jbpm-workitems</artifactId>-->
<!--<version>${project.version}</version>-->
<!--<classifier>sources</classifier>-->
<!--</dependency>-->

<!-- The old assembly also included this optional dependency -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>

<!-- Javadocs and documentation -->
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-docs-flow</artifactId>
<type>jdocbook</type>
</dependency>
</dependencies>

</project>
Expand Up @@ -7,7 +7,8 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target/jbpm-${project.version}-pre-bin</directory>
<directory>target/jbpm-${project.version}-pre-bin</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets> </assembly>
</fileSet>
</fileSets>
</assembly>
Expand Up @@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>jbpm-docs/jbpm-docs-flow/target/docbook/publish/en-US/</directory>
<directory>../jbpm-docs/jbpm-docs-flow/target/docbook/publish/en-US/</directory>
<outputDirectory>jbpm-docs</outputDirectory>
<includes>
<include>html/**</include>
Expand Down
Expand Up @@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>jbpm-docs/jbpm-docs-flow/target/docbook/publish/en-US/</directory>
<directory>../jbpm-docs/jbpm-docs-flow/target/docbook/publish/en-US/</directory>
<outputDirectory>jbpm-docs</outputDirectory>
<includes>
<include>html/**</include>
Expand Down
Expand Up @@ -7,10 +7,10 @@
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>jbpm-gwt/jbpm-gwt-server-war/target/jbpm-gwt-console-server-${project.version}.war</source>
<source>../jbpm-gwt/jbpm-gwt-server-war/target/jbpm-gwt-console-server-${project.version}.war</source>
</file>
<file>
<source>jbpm-gwt/jbpm-gwt-war/target/jbpm-gwt-console-${project.version}.war</source>
<source>../jbpm-gwt/jbpm-gwt-war/target/jbpm-gwt-console-${project.version}.war</source>
</file>
</files>
</assembly>
Expand Up @@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>jbpm-installer</directory>
<directory>../jbpm-installer</directory>
<excludes>
<exclude>eclipse/**</exclude>
<exclude>jboss*/**</exclude>
Expand Down
36 changes: 36 additions & 0 deletions jbpm-distribution/src/main/assembly/pre-bin.xml
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>pre-bin</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<includes>
<include>org.jbpm:jbpm-flow</include>
<include>org.jbpm:jbpm-flow-builder</include>
<include>org.jbpm:jbpm-persistence-jpa</include>
<include>org.jbpm:jbpm-bpmn2</include>
<include>org.jbpm:jbpm-bam</include>
<include>org.jbpm:jbpm-human-task</include>
<include>org.jbpm:jbpm-workitems</include>
</includes>
<outputDirectory></outputDirectory>
</dependencySet>
<dependencySet>
<excludes>
<exclude>org.jbpm:jbpm-flow</exclude>
<exclude>org.jbpm:jbpm-flow-builder</exclude>
<exclude>org.jbpm:jbpm-persistence-jpa</exclude>
<exclude>org.jbpm:jbpm-bpmn2</exclude>
<exclude>org.jbpm:jbpm-bam</exclude>
<exclude>org.jbpm:jbpm-human-task</exclude>
<exclude>org.jbpm:jbpm-workitems</exclude>
<!-- Exclude docs -->
<exclude>org.jbpm:jbpm-docs-flow</exclude>
</excludes>
<outputDirectory>lib</outputDirectory>
</dependencySet>
</dependencySets>
</assembly>
Expand Up @@ -7,7 +7,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>.</directory>
<directory>..</directory>
<outputDirectory></outputDirectory>
<includes>
<include>jbpm-bam/**</include>
Expand All @@ -26,7 +26,7 @@
<excludes>
<exclude>**/*.log/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/.svn/**</exclude>
<exclude>**/.git</exclude>
<exclude>**/.metadata/**</exclude>
<exclude>jbpm-installer/eclipse/**</exclude>
<exclude>jbpm-installer/jboss*/**</exclude>
Expand Down
53 changes: 22 additions & 31 deletions pom.xml
Expand Up @@ -113,21 +113,7 @@
<module>jbpm-workitems</module>
<module>jbpm-human-task</module>
<module>jbpm-gwt</module>
</modules>

<profiles>
<profile>
<id>documentation</id>
<activation>
<property>
<name>documentation</name>
</property>
</activation>
<modules>
<module>jbpm-docs</module>
</modules>
</profile>
</profiles>
</modules>

<build>
<testResources>
Expand Down Expand Up @@ -166,22 +152,6 @@
<argLine>-Xmx1024m</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>assembly/pre-bin.xml</descriptor>
<descriptor>assembly/bin.xml</descriptor>
<descriptor>assembly/src.xml</descriptor>
<descriptor>assembly/gwt-console.xml</descriptor>
<descriptor>assembly/installer.xml</descriptor>
<descriptor>assembly/docs-build.xml</descriptor>
<descriptor>assembly/docs.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -222,6 +192,21 @@
</plugins>
</build>

<profiles>
<profile>
<id>fullProfile</id>
<activation>
<property>
<name>full</name>
</property>
</activation>
<modules>
<module>jbpm-docs</module>
<module>jbpm-distribution</module>
</modules>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -287,6 +272,12 @@
<artifactId>jbpm-docs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-docs-flow</artifactId>
<type>jdocbook</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>knowledge-api</artifactId>
Expand Down

0 comments on commit 5569850

Please sign in to comment.