From 60986e6b7152e0e2985a7ae1fcad5eb164d1832b Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 08 Apr 2016 14:22:17 +0000
Subject: [PATCH] OPENDJ-2825 Fix OEM Archive build
---
opendj-server-legacy/pom.xml | 15 +------
pom.xml | 39 +++++++++++++++++++
opendj-packages/opendj-zip/opendj-zip-oem/pom.xml | 45 +++-------------------
3 files changed, 48 insertions(+), 51 deletions(-)
diff --git a/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml b/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
index e60b836..872c5f1 100644
--- a/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
+++ b/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
@@ -41,7 +41,6 @@
${product.name.lowercase}/lib/opendj-je-backend.jar,
${product.name.lowercase}/legal-notices/THIRDPARTYREADME.txt
</oem.file.exclusion.list>
- <product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
<product.archive.name>${product.name.lowercase}-oem-${project.version}</product.archive.name>
</properties>
@@ -61,50 +60,20 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Override scope for org.slf4j:slf4j-jdk14 to have it in the bootstrap-client.jar -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
+ <!-- Generates bootstrap.jar and bootstrap-client.jar for OEM archive edition -->
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <productJarName>${product.name}</productJarName>
- <supportedLocales>${product.locales}</supportedLocales>
- </configuration>
-
- <executions>
- <execution>
- <id>generate-bootstrap-manifest</id>
- <goals>
- <goal>generate-manifest</goal>
- </goals>
- <configuration>
- <classPathProperty>classpath.bootstrap</classPathProperty>
- <excludes>
- <exclude>org.slf4j:slf4j-jdk14</exclude>
- <exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
- </excludes>
- <additionalJars>
- <additionalJar>opendj-slf4j-adapter.jar</additionalJar>
- </additionalJars>
- </configuration>
- </execution>
-
- <execution>
- <id>generate-bootstrap-client-manifest</id>
- <goals>
- <goal>generate-manifest</goal>
- </goals>
- <configuration>
- <classPathProperty>classpath.bootstrap-client</classPathProperty>
- <excludes>
- <exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index a203da0..c8d173f 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -56,7 +56,6 @@
<docWikiUrl>http://opendj.forgerock.org/docs.html</docWikiUrl>
<docGuideRefUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideRefUrl>
<docGuideAdminUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideAdminUrl>
- <locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</locales>
<!-- Other properties -->
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
@@ -452,6 +451,7 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
+
<executions>
<execution>
<id>generate-bootstrap-manifest</id>
@@ -459,30 +459,19 @@
<goal>generate-manifest</goal>
</goals>
<configuration>
- <classPathProperty>classpath.bootstrap</classPathProperty>
- <productJarName>${product.name.lowercase}</productJarName>
- <supportedLocales>${locales}</supportedLocales>
- <excludes>
- <exclude>org.slf4j:slf4j-jdk14</exclude>
- </excludes>
<additionalJars>
<additionalJar>opendj-slf4j-adapter.jar</additionalJar>
<additionalJar>opendj-je-backend.jar</additionalJar>
</additionalJars>
</configuration>
</execution>
+
<execution>
<id>generate-bootstrap-client-manifest</id>
<goals>
<goal>generate-manifest</goal>
</goals>
<configuration>
- <classPathProperty>classpath.bootstrap-client</classPathProperty>
- <productJarName>${product.name.lowercase}</productJarName>
- <supportedLocales>${locales}</supportedLocales>
- <excludes>
- <exclude>org.slf4j:jul-to-slf4j</exclude>
- </excludes>
<additionalJars>
<additionalJar>opendj-je-backend.jar</additionalJar>
</additionalJars>
diff --git a/pom.xml b/pom.xml
index 8794397..a548cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
<properties>
<product.name>OpenDJ</product.name>
<product.name.lowercase>opendj</product.name.lowercase>
+ <product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
<localized.jars.classifier>i18n</localized.jars.classifier>
<site.distribution.url>
@@ -411,6 +412,44 @@
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
<version>${project.version}</version>
+ <!-- bootstrap and bootstrap-clinet MANIFEST.MF files generation. -->
+ <configuration>
+ <productJarName>${product.name.lowercase}</productJarName>
+ <supportedLocales>${product.locales}</supportedLocales>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>generate-bootstrap-manifest</id>
+ <goals>
+ <goal>generate-manifest</goal>
+ </goals>
+ <configuration>
+ <classPathProperty>classpath.bootstrap</classPathProperty>
+ <excludes>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ <exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
+ </excludes>
+ <additionalJars>
+ <additionalJar>opendj-slf4j-adapter.jar</additionalJar>
+ </additionalJars>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>generate-bootstrap-client-manifest</id>
+ <goals>
+ <goal>generate-manifest</goal>
+ </goals>
+ <configuration>
+ <classPathProperty>classpath.bootstrap-client</classPathProperty>
+ <excludes>
+ <exclude>org.slf4j:jul-to-slf4j</exclude>
+ <exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
--
Gitblit v1.10.0