Author: alex.guizar(a)jboss.com
Date: 2010-11-24 06:12:55 -0500 (Wed, 24 Nov 2010)
New Revision: 6843
Modified:
jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml
Log:
adhere assembly descriptors to schema version 1.1.0
Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2010-11-24 10:09:10 UTC (rev
6842)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2010-11-24 11:12:55 UTC (rev
6843)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<assembly
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/assembly-1.1.0-SNAPSHOT.xsd">
-
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
+
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>jbpm.distribution</id>
<formats>
<format>zip</format>
@@ -14,17 +14,9 @@
<!-- Dependency Sets -->
<dependencySets>
<!-- lib -->
- <!-- dependencySet>
- <outputDirectory>lib</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- </dependencySet -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <!-- useStrictFiltering>true</useStrictFiltering -->
<scope>test</scope>
<unpack>false</unpack>
<excludes>
@@ -58,11 +50,11 @@
<fileSets>
<fileSet>
<directory>src/main/files</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</fileSet>
<fileSet>
<directory>target</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
<includes>
<include>jbpm.jar</include>
</includes>
Modified: jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml 2010-11-24 10:09:10
UTC (rev 6842)
+++ jbpm4/trunk/modules/distro/scripts/assembly-jbpm-single-jar.xml 2010-11-24 11:12:55
UTC (rev 6843)
@@ -1,67 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<assembly
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/assembly-1.1.0-SNAPSHOT.xsd">
-
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
+
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>jbpm.single.jar</id>
- <finalName>jbpm</finalName>
-
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
+
<dependencySets>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-api</include>
</includes>
<unpack>true</unpack>
- <outputFileNameMapping></outputFileNameMapping>
- <outputDirectory></outputDirectory>
+ <outputFileNameMapping />
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-log</include>
</includes>
<unpack>true</unpack>
- <outputFileNameMapping></outputFileNameMapping>
- <outputDirectory></outputDirectory>
+ <outputFileNameMapping />
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-pvm</include>
</includes>
<unpack>true</unpack>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-jpdl</include>
</includes>
<unpack>true</unpack>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-bpmn</include>
</includes>
<unpack>true</unpack>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-test-base</include>
</includes>
<unpack>true</unpack>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</dependencySet>
<dependencySet>
<includes>
<include>org.jbpm.jbpm4:jbpm-enterprise</include>
</includes>
<unpack>true</unpack>
- <outputDirectory></outputDirectory>
+ <outputDirectory />
</dependencySet>
</dependencySets>
</assembly>