Bump odlparent to 7.0.0-SNAPSHOT 28/88228/3
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 3 Mar 2020 20:36:59 +0000 (21:36 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 3 Mar 2020 20:51:01 +0000 (21:51 +0100)
This picks up upgraded odlparent, notably for pre-installed SCR.

Change-Id: Ia09fd208833dc022aaa23834569f334910f9e8fa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
36 files changed:
artifacts/pom.xml
benchmarks/pom.xml
bundle-parent/pom.xml
common/mockito-configuration/pom.xml
common/pom.xml
common/testutils/pom.xml
distribution-karaf/pom.xml
features/features-yangtools-experimental/pom.xml
features/features-yangtools/pom.xml
features/odl-yangtools-codec/pom.xml
features/odl-yangtools-codec/src/main/feature/feature.xml
features/odl-yangtools-common/pom.xml
features/odl-yangtools-data-api/pom.xml
features/odl-yangtools-data/pom.xml
features/odl-yangtools-data/src/main/feature/feature.xml
features/odl-yangtools-exp-data-xpath-api/pom.xml
features/odl-yangtools-exp-data-xpath/pom.xml
features/odl-yangtools-export/pom.xml
features/odl-yangtools-netty/pom.xml
features/odl-yangtools-netty/src/main/feature/feature.xml
features/odl-yangtools-parser-api/pom.xml
features/odl-yangtools-parser/pom.xml
features/odl-yangtools-parser/src/main/feature/feature.xml
features/odl-yangtools-util/pom.xml
features/odl-yangtools-util/src/main/feature/feature.xml
features/odl-yangtools-xpath-api/pom.xml
features/odl-yangtools-xpath/pom.xml
features/odl-yangtools-xpath/src/main/feature/feature.xml [deleted file]
features/pom.xml
pom.xml
yang-validation-tool/pom.xml
yang/pom.xml
yang/yang-maven-plugin-it/pom.xml
yang/yang-maven-plugin-spi/pom.xml
yang/yang-maven-plugin/pom.xml
yang/yang-model-validator/pom.xml

index d05141ed190933bcf42009614e34b32f01d682e8..40455b02bbead87ac3cc2717813c23c37d1959f5 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
index fbbe0efcdcb2f259e6458429e86c6a53c328fa3f..f2bcf91994cb5814de1177ac7a2bb438ffcd005d 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
index ac88abddb5e0cd454c85a7be3ad55608d002d8ba..b2b121655093233570cf8a1f00c82fcdb143de94 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 1295cc6a7d1553b26364e431f145fd07e922611e..52da17aeca61cd977959d348651cb6bdade715a3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 0dda33d29eb96c56b42a8ae6fee6a673f7537a87..3ae6c886978d9159fc7765fc9b89b04a7d07c156 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
index 08a342a7bdba7ce0a0fb65acc53fc124db4f25e8..19bfcce5ff835a78d15b6c571c00dda2fae43cf9 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index bd30dc9b6c8490607b948e6285343d5fd78b40a7..650c6104ec73fe02dee0ef9c1f65590a61867bb1 100644 (file)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index f8b700ba0b8a8b4d7949f6e9351ae36c71d5504f..f3f8b8989eeb6e2e626436093332354b9a5c3d75 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 9fcd5bc4c71ada0a8c2201e74ff46b2c8b88db9d..88ec5bf7e2ca2ab06ef9365024aa53ed0fa8a7a9 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 98e80b6ef7309c027410da9a24d8117c918a15c4..2f0de784c9571bed290a0f7dfb94c6d465567fbd 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index c4bf354159b3e9245e78e1a4898f8f2ebdedaa73..819f091dd5725a56bbf7b73c077c5767ec7d0953 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-codec">
     <feature name="odl-yangtools-codec">
-        <feature version="[6,7)">odl-gson</feature>
-        <feature version="[6,7)">odl-stax2-api</feature>
+        <feature version="[7,8)">odl-gson</feature>
+        <feature version="[7,8)">odl-stax2-api</feature>
     </feature>
 </features>
index 6b9b15600649d1927c39d5c3d7c2d92ef9b309f4..ed4a5bf6b88129821c32b10a1b9409c6532f17cd 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 8be77fa119f91a3b3975e156b7fd2577e545fbd4..5de8cd17160c02a441012c162bd489ab4aba1875 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 0c8dfd620cac5c415c9dd061f2f04064eae1191a..073e7555e9d7a6611fcaec38dc1c1102e8f51def 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index e223a3755af0f177ff882de900c102ecc0ef7d19..8f08da2102dc9be121c54823e446c6e71c3463d7 100644 (file)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-data">
     <feature name="odl-yangtools-data">
-        <feature version="[6,7)">odl-antlr4</feature>
-        <feature>scr</feature>
+        <feature version="[7,8)">odl-antlr4</feature>
     </feature>
 </features>
index 0f362e14de02933040d223a7267c0fe47172925c..fb96bbd4fb22bce373df4095021cf2fc022cda96 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 8441ec326692dbfa7b8158a2e6556a7181052c3d..791c81a24f58f032fcc2ff3c3b88b764c1bc8f1c 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 425bbccb7658c176dbfead39490bc2eff23bff2e..ac010269e065e89dde5eeaca2e7d2e2d094ded97 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index d5e5c556b2c27a0d781539d6b22a8c44e9153317..a14f60667c546949214a778442b0de903112c283 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 6c3d767b28a4ff1ab4f369492be58a2ace45fb56..a90e839fdfe26d87879845befc9cc24387596652 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-netty">
     <feature name="odl-yangtools-netty">
-        <feature version="[6,7)">odl-netty-4</feature>
+        <feature version="[7,8)">odl-netty-4</feature>
     </feature>
 </features>
index 85ac61832a41a6774bf1e0b3a0102fdef13f7dca..5bdc107ef4783ab49e361cb6d7ea1cc07235e811 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 16cb8c27444628875ecf8ee1b8d166d407eaf6e9..fcc75d86b215ac09c4050d6ffec59b3f23f114ff 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 8f4b841215baf5cc759537650cfec1f94dd190ba..967294960d6e80c3c478b5325362ce8db5c70486 100644 (file)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-parser">
     <feature name="odl-yangtools-parser">
-        <feature version="[6,7)">odl-antlr4</feature>
-        <feature>scr</feature>
+        <feature version="[7,8)">odl-antlr4</feature>
     </feature>
 </features>
index ccee198a0b06204b920e886fde9f1bc23bcab94b..7580185e21206d318f50282cae81b759c8750538 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 5b385406e571c692d06c55c163068941e57193b8..1866a6fcc1ff9d9d8fb83a03e8c0a2ce99723e46 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-util">
     <feature name="odl-yangtools-util">
-        <feature version="[6,7)">odl-guava</feature>
+        <feature version="[7,8)">odl-guava</feature>
         <feature version="[1,2)">pt-triemap</feature>
     </feature>
 </features>
index 7b73e5d7e279770caef7f8f6dcf3a56a26388e6d..63f7fa36ce4b21a35e0499565eb0ad6f22085777 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index d00250a8e0830f18380ce83bc093088df04fe2ff..bb286e24e2af704f8397df4f634dd66404d7b11c 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-yangtools-xpath/src/main/feature/feature.xml b/features/odl-yangtools-xpath/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 291ab20..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-xpath">
-    <feature name="odl-yangtools-xpath">
-        <feature>scr</feature>
-    </feature>
-</features>
index 410934d316c87bd0cc398e27c4624d4779529d5e..fe6ad189a33e77e175bf9f18242aa1eee77384fb 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 860cdde629bfb681f5c5d29aed4147bf94630162..61e265a38d95b20f11354024a4cdbc2e7a91483e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.5</version>
+      <version>7.0.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
index 68e62b84bddd69c497c46a9d95e51558ec4a7a74..fd3f6c59b2263f14040e853c7983134f873e9f28 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 225a87cddbc002a4653ea5f8ec53448e57ee0892..1d14f8bf50506b583c17b17f8b776108749998a3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index ede70a54a219b937cda392ba2e9dcd30043363a6..8a7c0d00e99d5ea66cfa6cddadd08c4b017407d6 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index be258584a2d4eff6bbc055c52fdfff6b4361dc94..bb12640d51ff0167cdf99479d756f9482bb16707 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index b4e8bce4c86adc810aa52f10f3ade9f7e6a2854a..8f4da64354e4659510dd66b5c361df55c113e843 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
index 26586f5c78ec1d9f647e5b032ade538104619cce..9eb68e23d3a20e18af6431cd7edc073e5d1768fa 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.5</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>