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-dsml-servlet/pom.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

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>

--
Gitblit v1.10.0