summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Morris <michael.morris@est.tech>2022-09-06 11:49:28 +0000
committerGerrit Code Review <gerrit@onap.org>2022-09-06 11:49:28 +0000
commite26af98b1a6ea6b3537b83c42ce077a912e2a499 (patch)
treede10b37b406958e8496027cca59a36b6cbc11c7c
parent5b0da668eccaeb4e356acd2086299be9a24e7fbd (diff)
parent69c62e8dd17461b7fc013ab52eb81efb7457e3b5 (diff)
Merge "Bump up version to 1.7.0"
-rw-r--r--.gitignore2
-rw-r--r--pom.xml10
-rw-r--r--security-util-lib/pom.xml2
-rw-r--r--session-lib/pom.xml2
-rw-r--r--version.properties4
-rw-r--r--versioning-lib/pom.xml2
-rw-r--r--zusammen-lib/pom.xml2
7 files changed, 13 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index df2f954..148e177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,4 @@ target/
logs/
debug-logs/
*.log
-.idea/
-*.iml
*.orig
diff --git a/pom.xml b/pom.xml
index e65028c..ba72cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <version>3.2.0</version>
<relativePath/>
</parent>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>sdc-be-common-parent</artifactId>
<name>sdc-be-common</name>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -65,7 +65,8 @@
<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
<sonar.branch>${project.version}</sonar.branch>
-
+
+ <checkstyle.skip>true</checkstyle.skip>
</properties>
<modules>
@@ -157,6 +158,9 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
+ <configuration>
+ <skip>${checkstyle.skip}</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/security-util-lib/pom.xml b/security-util-lib/pom.xml
index 82a1b7c..3376bed 100644
--- a/security-util-lib/pom.xml
+++ b/security-util-lib/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>sdc-be-common-parent</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/session-lib/pom.xml b/session-lib/pom.xml
index 3c81005..368e4d6 100644
--- a/session-lib/pom.xml
+++ b/session-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>sdc-be-common-parent</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
diff --git a/version.properties b/version.properties
index e231db3..dd6d03d 100644
--- a/version.properties
+++ b/version.properties
@@ -21,8 +21,8 @@
# change:
#
major=1
-minor=6
-patch=1
+minor=7
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/versioning-lib/pom.xml b/versioning-lib/pom.xml
index bab2ffd..a6f5ab2 100644
--- a/versioning-lib/pom.xml
+++ b/versioning-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>sdc-be-common-parent</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/zusammen-lib/pom.xml b/zusammen-lib/pom.xml
index 326e6cd..877b22d 100644
--- a/zusammen-lib/pom.xml
+++ b/zusammen-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>sdc-be-common-parent</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
</parent>
<properties>