From b5a6aaf35d922959d357653b5f9cd491ab7fa5d8 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 10 Feb 2015 16:57:42 +0000
Subject: [PATCH] OPENDJ-1741 Fix duplicates files in final archive
---
opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml | 1 +
opendj3-server-dev/pom.xml | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/pom.xml b/opendj3-server-dev/pom.xml
index 15017e0..4d28b2a 100644
--- a/opendj3-server-dev/pom.xml
+++ b/opendj3-server-dev/pom.xml
@@ -1008,9 +1008,7 @@
<configuration>
<target>
<zip
- destfile="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip"
- basedir="${project.build.directory}/package/"
- includes="${lowerCaseProductName}/**">
+ destfile="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip">
<zipfileset
dir="${project.build.directory}/package/${lowerCaseProductName}"
includes="**/*"
@@ -1475,14 +1473,17 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/package</outputDirectory>
- <finalName>${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</finalName>
+ <finalName>${lowerCaseProductName}</finalName>
<descriptors>
<descriptor>src/main/assembly/opendj-snmp-archive-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<formats>
- <format>zip</format>
+ <format>dir</format>
</formats>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/bootstrap/manifest-bootstrap</manifestFile>
+ </archive>
</configuration>
</execution>
</executions>
diff --git a/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml b/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml
index 86b64f5..72892fc 100644
--- a/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml
+++ b/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml
@@ -28,6 +28,7 @@
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>opendj-snmp-zip-generation</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
<!-- Add General OpenDJ final archive content -->
<componentDescriptors>
<componentDescriptor>src/main/assembly/opendj-archive-component.xml</componentDescriptor>
--
Gitblit v1.10.0