Merge pull request #161 from telefonicaid/task/prepare_1.6.0

Step: 1.5.0-SNAPSHOT -> 1.6.0
telefonicaid · May 12, 2020 · 6bc772a · 6bc772a
2 parents e42857c + af37cba
commit 6bc772a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +0,0 @@
-- Haredning: add json library as proper dependency in pom.xml (version 20180813) instead of third-party source code
-- Hardening: software quality improvement based on ISO25010 recommendations 
-- Fix: upgrade openjdk-8-jdk to openjdk-11-jdk in Dockerfile

diff --git a/perseo-main/pom.xml b/perseo-main/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>perseo-core</artifactId>
         <groupId>com.telefonica.iot</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <packaging>war</packaging>
     <modelVersion>4.0.0</modelVersion>
@@ -76,7 +76,7 @@
         <dependency>
             <artifactId>perseo-utils</artifactId>
             <groupId>com.telefonica.iot</groupId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

diff --git a/perseo-utils/pom.xml b/perseo-utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>perseo-core</artifactId>
         <groupId>com.telefonica.iot</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>perseo-core</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0</version>
     <modules>
         <module>perseo-utils</module>
         <module>perseo-main</module>
@@ -161,4 +161,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>
diff --git a/rpm/SPECS/cep-core.spec b/rpm/SPECS/cep-core.spec
@@ -102,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_install_dir}/perseo-core.war
 
 %changelog
+* Tue May 12 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.6.0
+- Hardening: add json library as proper dependency in pom.xml (version 20180813) instead of third-party source code
+- Hardening: software quality improvement based on ISO25010 recommendations
+- Upgrade openjdk-8-jdk to openjdk-11-jdk in Dockerfile
+
 * Mon Dec 16 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 1.5.0
 - Project detached into maven modules (Perseo-core used as parent module)
 - Add: perseo-utils library (date time utility functions) into Esper

diff --git a/rpm/create-rpm.sh b/rpm/create-rpm.sh
@@ -21,7 +21,7 @@
 
 CEP_VERSION=$2
 if [ -z "$CEP_VERSION" ]; then
-  CEP_VERSION=1.5.0-SNAPSHOT
+  CEP_VERSION=1.6.0
 fi
 CEP_RELEASE=$1
 if [ -z "$CEP_RELEASE" ]; then