diff options
| -rwxr-xr-x | aafshiro/features/ccsdk-aafshiro/pom.xml | 2 | ||||
| -rwxr-xr-x | aafshiro/features/features-aafshiro/pom.xml | 2 | ||||
| -rwxr-xr-x | aafshiro/features/pom.xml | 2 | ||||
| -rwxr-xr-x | aafshiro/installer/pom.xml | 2 | ||||
| -rwxr-xr-x | aafshiro/pom.xml | 2 | ||||
| -rw-r--r-- | features/ccsdk-features-all/pom.xml | 2 | ||||
| -rw-r--r-- | features/features-features/pom.xml | 2 | ||||
| -rwxr-xr-x | features/installer/pom.xml | 2 | ||||
| -rwxr-xr-x | features/pom.xml | 2 | ||||
| -rw-r--r-- | lib/doorman/pom.xml | 1 | ||||
| -rw-r--r-- | lib/rlock/pom.xml | 1 | ||||
| -rwxr-xr-x | pom.xml | 20 | ||||
| -rw-r--r-- | sdnr/wt/common/src/test/resources/testpom.xml | 6 | ||||
| -rw-r--r-- | sdnr/wt/readthedocs/pom.xml | 2 |
14 files changed, 33 insertions, 15 deletions
diff --git a/aafshiro/features/ccsdk-aafshiro/pom.xml b/aafshiro/features/ccsdk-aafshiro/pom.xml index ea96f4cc2..8eb6c2c0b 100755 --- a/aafshiro/features/ccsdk-aafshiro/pom.xml +++ b/aafshiro/features/ccsdk-aafshiro/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/aafshiro/features/features-aafshiro/pom.xml b/aafshiro/features/features-aafshiro/pom.xml index 8f53052aa..dbc336aee 100755 --- a/aafshiro/features/features-aafshiro/pom.xml +++ b/aafshiro/features/features-aafshiro/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/aafshiro/features/pom.xml b/aafshiro/features/pom.xml index 96bae2259..97bbfe751 100755 --- a/aafshiro/features/pom.xml +++ b/aafshiro/features/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/aafshiro/installer/pom.xml b/aafshiro/installer/pom.xml index e9007c752..e95b8cfcf 100755 --- a/aafshiro/installer/pom.xml +++ b/aafshiro/installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/aafshiro/pom.xml b/aafshiro/pom.xml index 52cf51bc6..5c2f13025 100755 --- a/aafshiro/pom.xml +++ b/aafshiro/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index d5903cdd5..d286d6c78 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index 6c489ac01..f45e56c8f 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 66619739f..4fbf99cfe 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/features/pom.xml b/features/pom.xml index ababe19a5..3a3ca7a0f 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/lib/doorman/pom.xml b/lib/doorman/pom.xml index a204a4ef9..751ce2eb7 100644 --- a/lib/doorman/pom.xml +++ b/lib/doorman/pom.xml @@ -19,6 +19,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <version>2.5</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/lib/rlock/pom.xml b/lib/rlock/pom.xml index 24df9c347..e42468a84 100644 --- a/lib/rlock/pom.xml +++ b/lib/rlock/pom.xml @@ -35,6 +35,5 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - </dependencies> </project> @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> @@ -57,6 +57,24 @@ <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse</url> </scm> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + <configuration> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> <profile> <id>blackduck</id> diff --git a/sdnr/wt/common/src/test/resources/testpom.xml b/sdnr/wt/common/src/test/resources/testpom.xml index 6fba87af9..e57fed436 100644 --- a/sdnr/wt/common/src/test/resources/testpom.xml +++ b/sdnr/wt/common/src/test/resources/testpom.xml @@ -29,13 +29,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-common</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-features :: ${project.artifactId}</name> @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index f457abbf4..a19ec8f8b 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> |