From 7ba506a4f9a14c630ecf46ecd269d838b73736de Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Tue, 11 Feb 2020 17:26:36 +0000
Subject: [PATCH] reorganize commons build artifacts (#95)
---
opendj-packages/opendj-docker/pom.xml | 2
opendj-rest2ldap-servlet/pom.xml | 13
.gitmodules | 3
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml | 3
opendj-doc-generated-ref/pom.xml | 6
opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml | 2
opendj-rest2ldap/pom.xml | 50 ++--
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 158 ++++++++-------
commons | 1
opendj-ldap-sdk-examples/pom.xml | 7
opendj-server-legacy/pom.xml | 140 ++++---------
opendj-grizzly/pom.xml | 14
opendj-ldap-toolkit/pom.xml | 19 -
opendj-maven-plugin/pom.xml | 2
.travis.yml | 4
opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java | 2
opendj-server-example-plugin/pom.xml | 6
opendj-config/pom.xml | 19 +
opendj-cli/pom.xml | 14
opendj-packages/pom.xml | 2
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 4
opendj-doc-maven-plugin/pom.xml | 10
README.md | 4
opendj-openidm-account-change-notification-handler/pom.xml | 22 +-
opendj-server/pom.xml | 17
/dev/null | 5
opendj-dsml-servlet/pom.xml | 16
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml | 2
opendj-packages/opendj-deb/pom.xml | 2
opendj-embedded-server-examples/pom.xml | 2
opendj-core/pom.xml | 26 +-
opendj-packages/opendj-rpm/pom.xml | 2
33 files changed, 257 insertions(+), 324 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index f4f124c..e99e0f0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "forgerock-parent"]
path = forgerock-parent
url = https://github.com/OpenIdentityPlatform/forgerock-parent.git
+[submodule "commons"]
+ path = commons
+ url = https://github.com/OpenIdentityPlatform/commons.git
diff --git a/.travis.yml b/.travis.yml
index 7a8fd9a..318daf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,14 +88,14 @@
before_install:
- date -u
- uname -a
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm wine; else sudo apt-get install -y rpm wine; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm && brew cask install wine-stable; else sudo apt-get install -y rpm wine; fi
- git fetch -t
- export git_version_last="$(git describe --abbrev=0 --tags)"
- export git_version="$(echo $git_version_last | awk -F . '{ printf "%d.%d.%d", $1,$2,$3 + 1}')"
- env | sort
- git log `git describe --tags --abbrev=0 HEAD^`..HEAD --oneline
install:
- - mvn -q -B -V -DskipTests -Dmaven.javadoc.skip=true install -f forgerock-parent
+ - #mvn -q -B -V -DskipTests -Dmaven.javadoc.skip=true install -f commons
script:
- echo "mvn -B install $INSTALL_SUFFIX"
- eval "mvn -B install $INSTALL_SUFFIX"
diff --git a/README.md b/README.md
index 64e4185..443f099 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
```bash
git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ.git
-#mvn clean install -f OpenDJ/forgerock-parent
+#mvn clean install -f OpenDJ/commons
mvn clean install -f OpenDJ
```
@@ -59,7 +59,7 @@
* OpenDJ Community Mailing List: open-identity-platform-opendj@googlegroups.com
* OpenDJ Community Archive: https://groups.google.com/d/forum/open-identity-platform-opendj
* OpenDJ Community on Gitter: https://gitter.im/OpenIdentityPlatform/OpenDJ
-* OpenDJ Commercial support RFP: support@openam.org.ru (English, Russian)
+* OpenDJ Commercial support RFP: support@3a-systems.ru (English, Russian)
## Contributing
Please, make [Pull request](https://github.com/OpenIdentityPlatform/OpenDJ/pulls)
diff --git a/commons b/commons
new file mode 160000
index 0000000..ba91bb8
--- /dev/null
+++ b/commons
@@ -0,0 +1 @@
+Subproject commit ba91bb813889ab3d7f3fe019364819033f03518d
diff --git a/forgerock-parent b/forgerock-parent
deleted file mode 160000
index e97fab1..0000000
--- a/forgerock-parent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e97fab12638f6514cdcc4da3767971a165a606ed
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index 39b9ea7..c4b40a1 100644
--- a/opendj-cli/pom.xml
+++ b/opendj-cli/pom.xml
@@ -43,13 +43,13 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
<scope>test</scope>
</dependency>
@@ -69,11 +69,11 @@
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 73449ab..72070b7 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -30,20 +30,21 @@
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
@@ -68,7 +69,7 @@
<doclint>none</doclint>
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<resources>
<!-- Main resources -->
<resource>
@@ -122,8 +123,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index b9b8c74..e3c9182 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
</dependency>
<dependency>
@@ -62,8 +62,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>slf4j</artifactId>
</dependency>
<dependency>
@@ -72,8 +72,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
<scope>test</scope>
</dependency>
@@ -105,11 +105,11 @@
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -191,12 +191,11 @@
</file>
</activation>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirrPluginVersion}</version>
<inherited>true</inherited>
<configuration>
<comparisonArtifacts>
@@ -233,7 +232,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirrPluginVersion}</version>
<inherited>true</inherited>
<configuration>
<comparisonArtifacts>
@@ -267,7 +265,7 @@
<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index da111da..c3512b9 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -34,7 +34,7 @@
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -361,7 +361,7 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.openidentityplatform.opendj</groupId>
@@ -580,7 +580,7 @@
<!-- Format man pages -->
<plugin>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-doc-maven-plugin</artifactId>
+ <artifactId>doc-maven-plugin</artifactId>
<executions>
<execution>
<id>build-man-pages</id>
diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml
index 67087d8..aec3b75 100644
--- a/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-doc-maven-plugin/pom.xml
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
@@ -72,11 +72,11 @@
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 1935b26..a16e5e6 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -30,7 +30,7 @@
<properties>
<!-- If the binary-licensing profile is activated, we need the ForgeRock license there -->
- <forgerock.license.output.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices</forgerock.license.output.dir>
+ <license.output.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices</license.output.dir>
<opendj.server.module.name>opendj-server-legacy</opendj.server.module.name>
<opendj.jars.folder>opendj-jars</opendj.jars.folder>
<doclint>none</doclint>
@@ -48,17 +48,17 @@
<!-- ForgeRock libraries -->
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>slf4j</artifactId>
</dependency>
<!-- OpenDJ SDK dependency -->
@@ -88,7 +88,7 @@
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<!-- Parse version to generate properties (major.version, minor.version, ...) -->
<plugin>
@@ -307,7 +307,7 @@
<profiles>
<profile>
<id>precommit</id>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-embedded-server-examples/pom.xml b/opendj-embedded-server-examples/pom.xml
index 905c906..8d5ffee 100644
--- a/opendj-embedded-server-examples/pom.xml
+++ b/opendj-embedded-server-examples/pom.xml
@@ -44,7 +44,7 @@
</site>
</distributionManagement>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index 85ed767..47c7df2 100644
--- a/opendj-grizzly/pom.xml
+++ b/opendj-grizzly/pom.xml
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
@@ -71,8 +71,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,11 +83,11 @@
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index c05ea67..5c317be 100644
--- a/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-ldap-sdk-examples/pom.xml
@@ -37,11 +37,6 @@
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-grizzly</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
</dependencies>
<distributionManagement>
@@ -52,7 +47,7 @@
</site>
</distributionManagement>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 065ed4d..b0722c7 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -57,13 +57,8 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
@@ -79,18 +74,18 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif b/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
deleted file mode 100644
index be7f129..0000000
--- a/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
+++ /dev/null
@@ -1,5 +0,0 @@
-dn: dc=example,dc=com
-dc: example
-objectClass: domain
-objectClass: top
-
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index 7c3970a..44015d2 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
</dependency>
<dependency>
<groupId>org.twdata.maven</groupId>
diff --git a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
index a5b5345..1268c60 100644
--- a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
@@ -138,7 +138,7 @@
if (file.getAbsoluteFile().isFile()) {
final Artifact artifact = findArtifactWithFile(project.getArtifacts(), file);
if (isAccepted(artifact)) {
- final String artifactString = artifact.getArtifactId() + "." + artifact.getType();
+ final String artifactString = artifact.getGroupId()+ "."+artifact.getArtifactId() + "." + artifact.getType();
classpathItems.add(artifactString);
}
}
diff --git a/opendj-openidm-account-change-notification-handler/pom.xml b/opendj-openidm-account-change-notification-handler/pom.xml
index a4d5bf7..0859839 100644
--- a/opendj-openidm-account-change-notification-handler/pom.xml
+++ b/opendj-openidm-account-change-notification-handler/pom.xml
@@ -42,8 +42,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>slf4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -58,25 +58,25 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>json-crypto-core</artifactId>
+ <groupId>org.openidentityplatform.commons.json-crypto</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-http-core</artifactId>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-client-apache-async</artifactId>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>client-apache-async</artifactId>
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
index 6a57d79..23ea94a 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
@@ -41,7 +41,7 @@
<deb.resources.path>../resources</deb.resources.path>
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index 9e96802..6f74a2f 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -54,7 +54,7 @@
<deb.resources.path />
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<!-- Unpack man pages -->
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
index d566ff7..0d936be 100644
--- a/opendj-packages/opendj-docker/pom.xml
+++ b/opendj-packages/opendj-docker/pom.xml
@@ -39,7 +39,7 @@
This module contains configuration and generic plugin calls to generate Docker file for OpenDJ.
</description>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
index fae612a..7d3db30 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -50,7 +50,6 @@
<plugin>
<groupId>org.openidentityplatform.commons</groupId>
<artifactId>maven-external-dependency-plugin</artifactId>
- <version>0.6-SNAPSHOT</version>
<inherited>false</inherited>
<configuration>
<stagingDirectory>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 868fb9d..e3cd0fa 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -41,7 +41,7 @@
<rpm.license>CDDL</rpm.license>
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index 5f31394..450f4d1 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -74,7 +74,7 @@
<rpm.product.summary />
</properties>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<!-- Unpack man pages -->
diff --git a/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml b/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
index 22bbb72..c2a3761 100644
--- a/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
+++ b/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
@@ -33,7 +33,7 @@
This module generates a standard SVR4 OpenDJ version.
</description>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 7b29726..fb95c12 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -58,7 +58,7 @@
</profile>
</profiles>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<!-- Unpack files from OpenDJ standard archive -->
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 12522f2..a62af94 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -31,18 +31,13 @@
<properties>
<!-- If the binary-licensing profile is activated, we need the ForgeRock license there -->
- <forgerock.license.output.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices</forgerock.license.output.dir>
+ <license.output.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices</license.output.dir>
</properties>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-http-servlet</artifactId>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>servlet</artifactId>
</dependency>
<dependency>
@@ -56,7 +51,7 @@
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index f988800..5b7995d 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -56,44 +56,42 @@
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>oauth2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>client-apache-async</artifactId>
</dependency>
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-oauth2</artifactId>
- <version>21.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-client-apache-async</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <artifactId>build-tools</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>api-descriptor</artifactId>
- <version>21.0.0-SNAPSHOT</version>
- <type>jar</type>
+
+ <dependency>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>api-descriptor</artifactId>
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 42c4f3f..4ebaddd 100644
--- a/opendj-server-example-plugin/pom.xml
+++ b/opendj-server-example-plugin/pom.xml
@@ -41,11 +41,11 @@
<version>3.3.2</version>
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index bfdbc0d..af9663f 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -82,8 +82,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>slf4j</artifactId>
</dependency>
<dependency>
@@ -111,13 +111,14 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
</dependency>
<dependency>
@@ -131,66 +132,66 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-http-core</artifactId>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.http</groupId>
- <artifactId>chf-http-grizzly</artifactId>
+ <groupId>org.openidentityplatform.commons.http-framework</groupId>
+ <artifactId>grizzly</artifactId>
</dependency>
<!-- ForgeRock Common Audit libraries -->
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-core</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-csv</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-csv</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-json</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-json</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-elasticsearch</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-elasticsearch</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-splunk</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-splunk</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-jms</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-jms</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-json</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>json</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-syslog</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-syslog</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-audit-handler-jdbc</artifactId>
+ <groupId>org.openidentityplatform.commons.audit</groupId>
+ <artifactId>handler-jdbc</artifactId>
</dependency>
<!-- slf4j libraries -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.slf4j</groupId> -->
+<!-- <artifactId>slf4j-jdk14</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -201,7 +202,6 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
- <version>1.5.1</version>
</dependency>
<dependency>
@@ -219,9 +219,8 @@
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-persistit-core</artifactId>
- <version>4.3.1</version>
+ <groupId>org.openidentityplatform.commons.persistit</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
@@ -242,7 +241,7 @@
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<resources>
<!-- Main resources -->
<resource>
@@ -376,8 +375,8 @@
<!-- Generate i18n messages -->
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -538,64 +537,7 @@
</sources>
</configuration>
</execution>
-
- <!-- Attach localized jars to this module -->
-<!-- <execution> -->
-<!-- <id>attach-localized-jars</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>attach-artifact</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <artifacts> -->
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-ca_ES.jar</file> -->
-<!-- <classifier>_ca_ES</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-de.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-de</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-es.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-es</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-fr.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-fr</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-ja.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-ja</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-ko.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-ko</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-pl.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-pl</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-zh_CN.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-zh_CN</classifier> -->
-<!-- </artifact> -->
-
-<!-- <artifact> -->
-<!-- <file>${jars.dir}/opendj-${localized.jars.classifier}-zh_TW.jar</file> -->
-<!-- <classifier>${localized.jars.classifier}-zh_TW</classifier> -->
-<!-- </artifact> -->
-<!-- </artifacts> -->
-<!-- </configuration> -->
-<!-- </execution> -->
- </executions>
+ </executions>
</plugin>
<!--
@@ -688,7 +630,7 @@
${opendj.osgi.import}
</Import-Package>
<Embed-Dependency>
- forgerock-persistit-core,
+ org.openidentityplatform.commons.persistit:core,
<!--je,-->
jcip-annotations
</Embed-Dependency>
@@ -1160,7 +1102,7 @@
-->
<profile>
<id>precommit</id>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<!-- Enforce Checkstyle -->
@@ -1316,7 +1258,7 @@
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index 1d04e5a..6f86790 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -22,7 +22,7 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<excludes>
<exclude>javax.activation:activation</exclude>
<exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
@@ -382,7 +382,7 @@
</file>
<!-- Adds Generated config.ldif file -->
<file>
- <source>${project.build.directory}/template/config/config.ldif</source>
+ <source>${basedir}/resource/config/config.ldif</source>
<outputDirectory>template/config</outputDirectory>
</file>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 7473ab6..7ca515b 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -52,11 +52,11 @@
</dependency>
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-util</artifactId>
+ <artifactId>util</artifactId>
</dependency>
<dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -69,8 +69,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>build-tools</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
@@ -87,7 +88,7 @@
<version>1.2.0</version>
</dependency>
</dependencies>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -112,8 +113,8 @@
</plugin>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/pom.xml b/pom.xml
index a75644a..a6d4ac9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,6 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-parent</artifactId>
- <version>2.0.6</version>
- <relativePath>forgerock-parent</relativePath>
- </parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
<version>4.4.4-SNAPSHOT</version>
@@ -39,17 +33,9 @@
<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>
- scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs
- </site.distribution.url>
-
- <forgerock-build-tools.version>1.0.3</forgerock-build-tools.version>
- <forgerock-doc-plugin.version>21.0.0-SNAPSHOT</forgerock-doc-plugin.version>
<freemarker.version>2.3.28</freemarker.version>
<grizzly-framework.version>2.4.4</grizzly-framework.version>
<metrics-core.version>3.1.2</metrics-core.version>
- <i18n-framework.version>1.4.2</i18n-framework.version>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
<!--
@@ -63,7 +49,6 @@
<!-- <opendj-copyright-maven-plugin.version>1.0.1</opendj-copyright-maven-plugin.version> -->
<!-- ForgeRock build tools and Checkstyle versions (to avoid many checkstyle errors with ForgeRock Parent 2.0.10) -->
- <forgerockBuildToolsVersion>1.0.3</forgerockBuildToolsVersion>
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
<checkstyleVersion>5.5</checkstyleVersion>
</properties>
@@ -112,11 +97,11 @@
<tag>HEAD</tag>
</scm>
<repositories>
- <repository>
- <id>ossrh-releases</id>
- <name>Sonatype OSS</name>
- <url>https://oss.sonatype.org/service/local/repositories/orgopenidentityplatform-1000/content/</url>
- </repository>
+<!-- <repository> -->
+<!-- <id>ossrh-releases</id> -->
+<!-- <name>Sonatype OSS</name> -->
+<!-- <url>https://oss.sonatype.org/content/repositories/releases/</url> -->
+<!-- </repository> -->
<repository>
<id>ossrh-snapshots</id>
<name>Sonatype OSS Repository</name>
@@ -125,11 +110,11 @@
</repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
- <id>ossrh-releases</id>
- <name>Sonatype OSS</name>
- <url>https://oss.sonatype.org/service/local/repositories/orgopenidentityplatform-1000/content/</url>
- </pluginRepository>
+<!-- <pluginRepository> -->
+<!-- <id>ossrh-releases</id> -->
+<!-- <name>Sonatype OSS</name> -->
+<!-- <url>https://oss.sonatype.org/content/repositories/releases/</url> -->
+<!-- </pluginRepository> -->
<pluginRepository>
<id>ossrh-snapshots</id>
<name>Sonatype OSS Repository</name>
@@ -152,46 +137,21 @@
</snapshotRepository>
</distributionManagement>
-<!-- <ciManagement> -->
-<!-- <system>jenkins</system> -->
-<!-- <url>https://ci.forgerock.org/view/OpenDJ/job/OpenDJ%20-%20postcommit</url> -->
-<!-- <notifiers> -->
-<!-- <notifier> -->
-<!-- <type>mail</type> -->
-<!-- <sendOnError>true</sendOnError> -->
-<!-- <sendOnFailure>true</sendOnFailure> -->
-<!-- <sendOnSuccess>false</sendOnSuccess> -->
-<!-- <sendOnWarning>false</sendOnWarning> -->
-<!-- <address>opendj-dev@forgerock.org</address> -->
-<!-- </notifier> -->
-<!-- </notifiers> -->
-<!-- </ciManagement> -->
-
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>commons-bom</artifactId>
- <version>21.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-core</artifactId>
- <version>${i18n-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-slf4j</artifactId>
- <version>${i18n-framework.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.openidentityplatform.commons</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.0.7-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0-1</version>
</dependency>
-
+
<!-- OpenDJ SDK -->
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
@@ -223,14 +183,6 @@
<version>${metrics-core.version}</version>
</dependency>
- <!-- Commons -->
- <dependency>
- <groupId>org.openidentityplatform</groupId>
- <artifactId>forgerock-build-tools</artifactId>
- <version>${forgerock-build-tools.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- OpenDJ SDK -->
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
@@ -257,6 +209,11 @@
<artifactId>opendj-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.openidentityplatform.opendj</groupId>
+ <artifactId>opendj-server-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -317,6 +274,7 @@
</modules>
<build>
+ <finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.openidentityplatform.maven.plugins</groupId>
@@ -358,15 +316,24 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -377,9 +344,52 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.0.0-M4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.1</version>
<configuration>
<links>
<link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
@@ -390,6 +400,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.2.0</version>
<executions>
<execution>
<goals>
@@ -402,6 +413,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M4</version>
<configuration>
<argLine>-server</argLine>
<properties>
@@ -456,9 +468,8 @@
</plugin>
<plugin>
- <groupId>org.openidentityplatform.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
- <version>${i18n-framework.version}</version>
+ <groupId>org.openidentityplatform.commons.i18n-framework</groupId>
+ <artifactId>maven-plugin</artifactId>
</plugin>
<plugin>
@@ -517,8 +528,7 @@
<!-- Provides build capabilities for docs in DocBook XML format. -->
<plugin>
<groupId>org.openidentityplatform.commons</groupId>
- <artifactId>forgerock-doc-maven-plugin</artifactId>
- <version>${forgerock-doc-plugin.version}</version>
+ <artifactId>doc-maven-plugin</artifactId>
<configuration>
<projectName>OpenDJ</projectName>
<projectVersion>${project.version}</projectVersion>
@@ -671,7 +681,7 @@
<!-- <profile> -->
<!-- <id>precommit</id> -->
-<!-- <build> -->
+<!-- <build><finalName>${project.groupId}.${project.artifactId}</finalName> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <groupId>org.openidentityplatform.opendj</groupId> -->
@@ -691,7 +701,7 @@
<!-- <profile> -->
<!-- <id>update-copyrights</id> -->
-<!-- <build> -->
+<!-- <build><finalName>${project.groupId}.${project.artifactId}</finalName> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <groupId>org.openidentityplatform.opendj</groupId> -->
@@ -721,7 +731,7 @@
<activation>
<jdk>[1.8,)</jdk>
</activation>
- <build>
+ <build><finalName>${project.groupId}.${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
--
Gitblit v1.10.0