Merge pull request #10 from karelmaxa/orchi-fix

karelmaxa · web-flow · commit 23dcc86f53ca · 2020-07-21T14:48:52.000+02:00
Upgrade to Commons `22.0.0`and Parent `3.0.0`
diff --git a/bundles-parent/pom.xml b/bundles-parent/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.forgerock.openicf.connectors</groupId>
diff --git a/connector-framework-internal/pom.xml b/connector-framework-internal/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-framework-internal</artifactId>
diff --git a/connector-framework-osgi/pom.xml b/connector-framework-osgi/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-framework-osgi</artifactId>
diff --git a/connector-framework-protobuf/pom.xml b/connector-framework-protobuf/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.forgerock.openicf.framework</groupId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-framework-protobuf</artifactId>
diff --git a/connector-framework-rpc/pom.xml b/connector-framework-rpc/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.forgerock.openicf.framework</groupId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-framework-rpc</artifactId>
diff --git a/connector-framework-server/pom.xml b/connector-framework-server/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.forgerock.openicf.framework</groupId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/connector-framework/pom.xml b/connector-framework/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-framework</artifactId>
diff --git a/connector-server-grizzly/pom.xml b/connector-server-grizzly/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.forgerock.openicf.framework</groupId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/connector-server-jetty/pom.xml b/connector-server-jetty/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.forgerock.openicf.framework</groupId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-server-jetty</artifactId>
diff --git a/connector-test-common/pom.xml b/connector-test-common/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector-test-common</artifactId>
diff --git a/icfl-over-slf4j/pom.xml b/icfl-over-slf4j/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>icfl-over-slf4j</artifactId>
diff --git a/openicf-zip/pom.xml b/openicf-zip/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>openicf-zip</artifactId>
@@ -77,25 +77,6 @@
         <finalName>openicf-${project.version}</finalName>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>${licenseResourceBundle}</resourceBundle>
-                            </resourceBundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -27,14 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock</groupId>
-        <artifactId>forgerock-parent</artifactId>
-        <version>2.0.4</version>
+        <groupId>org.wrensecurity</groupId>
+        <artifactId>wrensec-parent</artifactId>
+        <version>3.0.1</version>
     </parent>
 
     <groupId>org.forgerock.openicf.framework</groupId>
     <artifactId>framework</artifactId>
-    <version>1.5.2.0</version>
+    <version>1.5.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Wren:ICF</name>
@@ -110,7 +110,7 @@
 
     <properties>
         <!-- Version management -->
-        <commons.commons-bom.version>21.0.0-alpha-12</commons.commons-bom.version>
+        <commons.commons-bom.version>22.0.0</commons.commons-bom.version>
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.5</maven.compiler.target>
         <maven.compiler.source>1.5</maven.compiler.source>
@@ -124,7 +124,7 @@
         </openicf.osgi.remove.headers>
 
         <openicf.maven.plugin.version>1.5.0</openicf.maven.plugin.version>
-        <slf4j.version>1.7.12</slf4j.version>
+        <slf4j.version>1.7.23</slf4j.version>
         <logback.version>1.1.7</logback.version>
         <groovy.version>2.2.2</groovy.version>
         <grizzly.version>2.3.22</grizzly.version>
diff --git a/testbundlev1/pom.xml b/testbundlev1/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <name>Wren:ICF - Test Bundle - Connector Fixtures</name>
diff --git a/testbundlev2/pom.xml b/testbundlev2/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>testbundlev2</artifactId>
diff --git a/testcommonv1/pom.xml b/testcommonv1/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>testcommonv1</artifactId>
diff --git a/testcommonv2/pom.xml b/testcommonv2/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.forgerock.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.5.2.0</version>
+        <version>1.5.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>testcommonv2</artifactId>
