Compile against Carbon 17/7417/1
authorDan Timoney <dtimoney@att.com>
Sat, 12 Aug 2017 00:12:41 +0000 (20:12 -0400)
committerDan Timoney <dtimoney@att.com>
Sat, 12 Aug 2017 00:12:41 +0000 (20:12 -0400)
Update sli/core to compile against OpenDaylight Carbon SR1

Change-Id: Ibb4a3a4cfa64f0539b520f56f11d7bf1fce62357
Issue-ID: CCSDK-23
Signed-off-by: Dan Timoney <dtimoney@att.com>
39 files changed:
dblib/features/pom.xml
dblib/installer/pom.xml
dblib/pom.xml
dblib/provider/pom.xml
filters/features/pom.xml
filters/installer/pom.xml
filters/pom.xml
filters/provider/pom.xml
filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/LogFilter.java
filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java
pom.xml
sli/common/pom.xml
sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
sli/common/src/test/resources/simplelogger.properties
sli/common/src/test/resources/svclogic.properties
sli/common/src/test/resources/svclogic.sh
sli/features/pom.xml
sli/installer/pom.xml
sli/pom.xml
sli/provider/pom.xml
sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
sli/provider/src/test/resources/svclogic.properties
sli/recording/pom.xml
sli/recording/src/main/resources/svclogic.properties
sliPluginUtils/features/pom.xml
sliPluginUtils/installer/pom.xml
sliPluginUtils/pom.xml
sliPluginUtils/provider/pom.xml
sliapi/features/pom.xml
sliapi/installer/pom.xml
sliapi/model/pom.xml
sliapi/pom.xml
sliapi/provider/pom.xml
sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
src/site/apt/nodes.apt

index b8b211c..3af56c1 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>dblib</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>dblib-features</artifactId>
        <name>DBLIB Adaptor - Features</name>
index a06a396..aa68d5a 100755 (executable)
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dblib</artifactId>
         <groupId>org.onap.ccsdk.sli.core</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>dblib-installer</artifactId>
     <name>DBLIB Adaptor - Karaf  Installer</name>
index 775ff05..81e1b80 100755 (executable)
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.core</groupId>
         <artifactId>sdnc-core</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
 
@@ -16,7 +16,7 @@
     <name>DBLIB Adaptor</name>
     <description>The DBLIB adaptor allows service logic to access persistent data in a local sql database</description>
 
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
     <build>
     <plugins>
index 41d383e..579ab40 100755 (executable)
@@ -4,10 +4,10 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>dblib</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>dblib-provider</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <name>DBLIB Adaptor - Provider</name>
        <url>http://maven.apache.org</url>
index 456b6a4..baf497d 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>filters</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>filters-features</artifactId>
        <name>Filters - Features</name>
index ff09b43..ca35e3c 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>filters</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>filters-installer</artifactId>
        <name>Filters - Karaf  Installer</name>
index 4c5c682..d5ff517 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.core</groupId>
         <artifactId>sdnc-core</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
     <name>Filters</name>
     <description>Servlet filter to implement ECOMP logging spec</description>
 
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
 
 
index cfbb7b5..0c73949 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>filters</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>filters-provider</artifactId>
        <packaging>bundle</packaging>
index 553a7cd..719d9e0 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index eb79370..f07e07e 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/pom.xml b/pom.xml
index 0674b6d..e3a8454 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-boron-sr3</artifactId>
+               <artifactId>odlparent-carbon-sr1</artifactId>
                <version>0.0.1-SNAPSHOT</version>
        </parent>
 
        <organization>
                <name>ONAP</name>
        </organization>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
 
 
 </project>
index 8b19891..dfec193 100755 (executable)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sli-common</artifactId>
        <packaging>bundle</packaging>
index 4673f96..803c551 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 1b9c627..47cbac8 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 3a60001..040d887 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 22e2773..53410db 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 05f72cd..fa22a18 100644 (file)
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index df814e0..bf74690 100644 (file)
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 601e94f..3d231a2 100644 (file)
@@ -9,9 +9,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index f5acafa..5dd0d55 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sli-features</artifactId>
        <name>SLI - Features</name>
index 905a77d..616c3c4 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sli-installer</artifactId>
        <name>SLI - Karaf  Installer</name>
index 27e6036..08d684d 100755 (executable)
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sdnc-core</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
@@ -59,7 +59,7 @@
        <organization>
                <name>ONAP</name>
        </organization>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
 
 
 </project>
index 25632f1..7d02869 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sli</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sli-provider</artifactId>
        <packaging>bundle</packaging>
index 22c475d..89391bf 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index ae55488..433270f 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index df814e0..bf74690 100644 (file)
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index afd0adc..499181e 100755 (executable)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>sli-recording</artifactId>
   <packaging>bundle</packaging>
index 8c301d4..51a581d 100644 (file)
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index c90cfc2..b512f9e 100755 (executable)
@@ -8,7 +8,7 @@
        <parent>
                <artifactId>sliPluginUtils</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
 
        <name>SliPluginUtils Plugin - Features</name>
index 2744f7d..3308913 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliPluginUtils</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sliPluginUtils-installer</artifactId>
        <name>SLI Plugin Utilities - Karaf  Installer</name>
index bb6cad3..ca40d6d 100755 (executable)
@@ -3,7 +3,7 @@
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +11,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sdnc-core</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <name>Service Logic Interface Plugin Utilities</name>
        <description>A package of static utility functions to be used when developing SLI plugins</description>
index 1db1677..aeb86d0 100755 (executable)
@@ -8,7 +8,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sliPluginUtils</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
 
        <name>SliPluginUtils Plugin - Provider</name>
index 1fc0f61..63fd51a 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-features</artifactId>
 
index 36570cd..b3939a6 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-installer</artifactId>
        <packaging>pom</packaging>
index 17bee5a..b6dcfe8 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-model</artifactId>
        <packaging>bundle</packaging>
                                                        <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
                                                        <codeGenerators>
                                                                <generator>
+                                                                       <!--
                                                                        <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                                       -->
+                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                                                                        <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                                                </generator>
                                                        </codeGenerators>
index 1ca872e..6837cc0 100755 (executable)
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sdnc-core</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
 
        <properties>
                <feature-name>sliapi</feature-name>
index d5f4917..9afbdc5 100755 (executable)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-provider</artifactId>
        <packaging>bundle</packaging>
                                                                        </additionalConfiguration>
                                                                </generator>
                                                                <generator>
+                                                                       <!--
                                                                        <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                                       -->
+                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
                                                                        <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                                                </generator>
                                                        </codeGenerators>
index 36e4011..2894ba7 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
index 8ddb711..b89b511 100644 (file)
@@ -7,9 +7,9 @@
 ~~ Licensed under the Apache License, Version 2.0 (the "License");
 ~~ you may not use this file except in compliance with the License.
 ~~ You may obtain a copy of the License at
-~~
+~~ 
 ~~      http://www.apache.org/licenses/LICENSE-2.0
-~~
+~~ 
 ~~ Unless required by applicable law or agreed to in writing, software
 ~~ distributed under the License is distributed on an "AS IS" BASIS,
 ~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.