Merge "Use java11 as default jdk"

20 files changed, 28 insertions, 28 deletions

diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml
index 60913e7..f0241be 100644
--- a/ceilometer-client/pom.xml
+++ b/ceilometer-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>ceilometer-client</artifactId>
diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml
index e5e789c..7155bbe 100644
--- a/ceilometer-model/pom.xml
+++ b/ceilometer-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>ceilometer-model</artifactId>
diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml
index 78db71c..5449e37 100755
--- a/cinder-client/pom.xml
+++ b/cinder-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <artifactId>cinder-client</artifactId>
   <name>OpenStack Cinder Client</name>
@@ -23,4 +23,4 @@
     </dependency>
   </dependencies>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
-</project>
\ No newline at end of file
+</project>
diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml
index 0226517..5ab0775 100755
--- a/cinder-model/pom.xml
+++ b/cinder-model/pom.xml
@@ -4,10 +4,10 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>cinder-model</artifactId>
   <name>OpenStack Cinder Model</name>
   <description>OpenStack Cinder Model</description>
-</project>
\ No newline at end of file
+</project>
diff --git a/glance-client/pom.xml b/glance-client/pom.xml
index 3c0c0d1..7de405a 100644
--- a/glance-client/pom.xml
+++ b/glance-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>glance-client</artifactId>
diff --git a/glance-model/pom.xml b/glance-model/pom.xml
index 8c6bd2f..4f05bf1 100644
--- a/glance-model/pom.xml
+++ b/glance-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>glance-model</artifactId>
diff --git a/heat-client/pom.xml b/heat-client/pom.xml
index 81ec2a5..72dd7bf 100644
--- a/heat-client/pom.xml
+++ b/heat-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>heat-client</artifactId>
diff --git a/heat-model/pom.xml b/heat-model/pom.xml
index c3e24fa..083cad7 100644
--- a/heat-model/pom.xml
+++ b/heat-model/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>heat-model</artifactId>
diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml
index fba890b..23de1cd 100644
--- a/keystone-client/pom.xml
+++ b/keystone-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>keystone-client</artifactId>
diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml
index d483778..f04b801 100644
--- a/keystone-model/pom.xml
+++ b/keystone-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>keystone-model</artifactId>
diff --git a/nova-client/pom.xml b/nova-client/pom.xml
index 6f00a10..15f68de 100644
--- a/nova-client/pom.xml
+++ b/nova-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>nova-client</artifactId>
diff --git a/nova-model/pom.xml b/nova-model/pom.xml
index 600bc86..faa1f47 100644
--- a/nova-model/pom.xml
+++ b/nova-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>nova-model</artifactId>
diff --git a/openstack-client-connectors/http-connector/pom.xml b/openstack-client-connectors/http-connector/pom.xml
index bc463c0..84a423b 100644
--- a/openstack-client-connectors/http-connector/pom.xml
+++ b/openstack-client-connectors/http-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
     <artifactId>client-connectors</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.so.libs.openstack-java-sdk.client-connectors</groupId>
diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml
index 0fa02d9..f4fdc45 100644
--- a/openstack-client-connectors/pom.xml
+++ b/openstack-client-connectors/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>client-connectors</artifactId>
diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml
index e0a82a5..65c81d5 100644
--- a/openstack-client/pom.xml
+++ b/openstack-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>openstack-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 1d6cfa8..357576e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.onap.so.libs</groupId>
   <artifactId>openstack-java-sdk</artifactId>
-  <version>1.6.1-SNAPSHOT</version>
+  <version>1.6.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>so-libs</name>
   <description>OpenStack Java SDK</description>
@@ -184,6 +184,12 @@
           </plugin>
         </plugins>
       </build>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+        <activeByDefault>true</activeByDefault>
+      </activation>
     </profile>
     <profile>
       <id>java7</id>
@@ -201,12 +207,6 @@
           </plugin>
         </plugins>
       </build>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-        <activeByDefault>true</activeByDefault>
-      </activation>
     </profile>
   </profiles>
   <dependencies>
diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml
index b066e53..021172f 100644
--- a/quantum-client/pom.xml
+++ b/quantum-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>quantum-client</artifactId>
diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml
index 1b9ebac..c7077b0 100644
--- a/quantum-model/pom.xml
+++ b/quantum-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>quantum-model</artifactId>
diff --git a/swift-client/pom.xml b/swift-client/pom.xml
index fb9cae5..a7731d0 100644
--- a/swift-client/pom.xml
+++ b/swift-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>swift-client</artifactId>
diff --git a/swift-model/pom.xml b/swift-model/pom.xml
index 3e4ac81..b3781dd 100644
--- a/swift-model/pom.xml
+++ b/swift-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.so.libs</groupId>
     <artifactId>openstack-java-sdk</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
   <artifactId>swift-model</artifactId>