You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/04/13 22:59:52 UTC
svn commit: r1091918 - in /karaf/branches/karaf-2.2.x:
assemblies/apache-karaf/pom.xml
assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
assemblies/apache-karaf/src/main/descriptors/windows-bin.xml pom.xml
Author: anierbeck
Date: Wed Apr 13 20:59:51 2011
New Revision: 1091918
URL: http://svn.apache.org/viewvc?rev=1091918&view=rev
Log:
[KARAF-566] - Build: Remove duplicate entries from build artefacts.
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1091918&r1=1091917&r2=1091918&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Wed Apr 13 20:59:51 2011
@@ -511,6 +511,7 @@
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
@@ -540,7 +541,8 @@
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
+ <appendAssemblyId>false</appendAssemblyId>
+ <duplicateBehaviour>skip</duplicateBehaviour>
<assemblyId />
</configuration>
</execution>
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1091918&r1=1091917&r2=1091918&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Wed Apr 13 20:59:51 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
<assembly>
- <id></id>
+ <id>standard</id>
<!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
<formats>
<format>tar.gz</format>
@@ -177,17 +177,6 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.karaf:org.apache.karaf.management</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
@@ -250,9 +239,7 @@
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
- <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
- <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
</includes>
</dependencySet>
@@ -274,28 +261,6 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.sshd:sshd-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
- org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.mina:mina-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
@@ -346,19 +311,6 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
- org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
- <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
- </includes>
- </dependencySet>
-
</dependencySets>
</assembly>
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1091918&r1=1091917&r2=1091918&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Wed Apr 13 20:59:51 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
<assembly>
- <id></id>
+ <id>standard</id>
<!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
<formats>
<format>zip</format>
@@ -167,17 +167,6 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.karaf:org.apache.karaf.management</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
@@ -240,9 +229,7 @@
<include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
- <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
- <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
<include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
</includes>
</dependencySet>
@@ -264,28 +251,6 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/sshd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.sshd:sshd-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
- org/apache/mina/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.mina:mina-core</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
@@ -336,19 +301,6 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/system</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>
- org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
- </outputFileNameMapping>
- <includes>
- <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
- <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
- </includes>
- </dependencySet>
-
</dependencySets>
</assembly>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1091918&r1=1091917&r2=1091918&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Wed Apr 13 20:59:51 2011
@@ -1109,7 +1109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>