Bump version logging-analytics

[ccsdk/parent.git] / odlparent / setup / src / main / resources / pom-template.xml

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 60e5fce..35efbe5 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -94,13 +94,13 @@
         <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
+        <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
-        <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.cds.version>1.2.0-SNAPSHOT</ccsdk.cds.version>
+        <ccsdk.features.version>1.2.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.3.0-SNAPSHOT</ccsdk.sli.version>
         <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>\${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>\${ccsdk.sli.version}</ccsdk.sli.northbound.version>
@@ -230,14 +230,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-    </dependencies>
-
     <repositories>
         <repository>
             <id>onap-public</id>
@@ -390,6 +382,7 @@
                     <version>2.8</version>
                     <configuration>
                         <skip/>
+                        <deployAtEnd>true</deployAtEnd>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -734,7 +727,6 @@
             </plugins>
         </pluginManagement>
         <plugins>
-
             <!-- Plugins from oparent version (parent of oparent) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -769,6 +761,17 @@
                     </dependency>
                 </dependencies>
                 <executions>
+                    <execution>
+                        <!-- overwrite odl default to supress spotbugs code check execution -->
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <skip>true</skip>
+                            <failOnViolation>false</failOnViolation>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>onap-license</id>
                         <goals>