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-rest2ldap/pom.xml |   50 ++++++++++++++++++++++++--------------------------
 1 files changed, 24 insertions(+), 26 deletions(-)

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>

--
Gitblit v1.10.0