diff options
Diffstat (limited to 'odlparent')
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/karaf4-parent/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 18 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 18 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 18 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 18 |
9 files changed, 126 insertions, 36 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 7fd7c5cd..06f91a79 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 24888bad..87f19ca6 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 0320a662..4079c429 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 8615e149..37bd925f 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index cd7bd540..72adbf56 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 54b2daee..fed50d3e 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 706eb097..00cadfd4 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 8f10bb51..1e5218b8 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 24e15e1c..a61c68a1 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -97,10 +97,10 @@ <logging-analytics.version>1.6.9</logging-analytics.version> <!-- CCSDK component versions --> - <ccsdk.cds.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.cds.version> - <ccsdk.features.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.features.version> - <ccsdk.distribution.version>(1.1.99999, 1.2.99999-SNAPSHOT)</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.cds.version>(1.2.99999, 1.3.99999)</ccsdk.cds.version> + <ccsdk.features.version>(1.2.99999, 1.3.99999)</ccsdk.features.version> + <ccsdk.distribution.version>(1.2.99999, 1.3.99999)</ccsdk.distribution.version> + <ccsdk.sli.version>(1.3.99999, 1.4.99999)</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> @@ -741,6 +741,16 @@ <skip>true</skip> </configuration> </plugin> + <!-- + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <configuration> + <useVersionRange>true</useVersionRange> + <includeTransitiveVersionRanges>true</includeTransitiveVersionRanges> + </configuration> + </plugin> + --> </plugins> </pluginManagement> <plugins> |