summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-14 08:48:48 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-14 08:48:48 -0400
commit99f1934d72099f7d77467290722ea74da983d3bb (patch)
tree4e5513a430a2dc494b3e2b52861d7bcf9e9ca51d
parentb429ab898e97c7607df38004e59ffeb3b747f82b (diff)
Fix version in base module
Fix version, which was breaking merge build. Change-Id: I73c8d1e2be56e739164545ad1b5f9bf69985b719 Issue-ID: CCSDK-1618 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rwxr-xr-x.gitignore1
-rw-r--r--base/http/features/ccsdk-base-http/pom.xml4
-rw-r--r--base/http/features/features-base-http/pom.xml4
-rw-r--r--base/http/features/pom.xml4
-rw-r--r--base/http/installer/pom.xml4
-rw-r--r--base/http/pom.xml4
-rw-r--r--base/http/provider/pom.xml9
-rw-r--r--base/pom.xml4
8 files changed, 17 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 3865ebb96..d61fc8074 100755
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ provider/src/main/java/inventory/
logs/
debug-logs/
*.log
+*.versionsBackup
## BlackDuck generated file
ccsdk-adaptors_bdio.jsonld
diff --git a/base/http/features/ccsdk-base-http/pom.xml b/base/http/features/ccsdk-base-http/pom.xml
index 0e18c737e..38181b683 100644
--- a/base/http/features/ccsdk-base-http/pom.xml
+++ b/base/http/features/ccsdk-base-http/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-base-http</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/base/http/features/features-base-http/pom.xml b/base/http/features/features-base-http/pom.xml
index 84004858c..3b7766fd9 100644
--- a/base/http/features/features-base-http/pom.xml
+++ b/base/http/features/features-base-http/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>features-base-http</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/base/http/features/pom.xml b/base/http/features/pom.xml
index a9abe519e..960a71952 100644
--- a/base/http/features/pom.xml
+++ b/base/http/features/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>base-http-features</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml
index ac233cb4f..4ba0614e1 100644
--- a/base/http/installer/pom.xml
+++ b/base/http/installer/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>base-http-installer</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name>
diff --git a/base/http/pom.xml b/base/http/pom.xml
index 368e3fb18..65571050a 100644
--- a/base/http/pom.xml
+++ b/base/http/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors.base</groupId>
<artifactId>http</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml
index 4cbe85c13..083a7fc7f 100644
--- a/base/http/provider/pom.xml
+++ b/base/http/provider/pom.xml
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.2</version>
- <relativePath />
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>base-http-provider</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
diff --git a/base/pom.xml b/base/pom.xml
index eb18d160a..12a2f779c 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>base-parent</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<modules>
<module>http</module>