Merge pull request #2233 from telefonicaid/task/prepare_3.0.0

Step: 2.20.0-SNAPSHOT -> 3.0.0
telefonicaid · May 4, 2023 · 18720bb · 18720bb
2 parents 840cfc8 + 33a576f
commit 18720bb
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 39 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,26 +0,0 @@
-[cygnus-common] Fixed isANumber for number containing multiple decimals (#2226)
-[cygnus-common][cygnus-ngsi][cygnus-ngsi-ld] Upgrade Java version from 1.8 to 1.11 in Dockerfile
-[cygnus-common] Upgrade hadoop-core from 1.2.1 to hadoop-client 2.7.0
-[cygnus-common] Upgrade hive-jdbc from 2.3.4 to 3.1.3
-[cygnus-common][cygnus-ngsi] Upgrade maven-compiler-plugin dep from 3.5.1 to 3.11.0
-[cygnus-common][cygnus-ngsi] Upgrade maven-assembly-plugin dep from 2.6.0 to 3.5.0
-[cygnus-common][cygnus-ngsi] Upgrade exec-maven-plugin  dep from 3.5.1 to 3.8.2
-[cygnus-common][cygnus-ngsi] Upgrade maven-site-plugin dep from 2.5.1 to 3.8.2
-[cygnus-common][cygnus-ngsi] Upgrade maven-surefire-report-plugin dep from 2.12.4 to 3.0.0
-[cygnus-common][cygnus-ngsi] Upgrade maven-checkstyle-plugin dep from 2.12.0 to 3.2.1
-[cygnus-common][cygnus-ngsi] Upgrade maven-javadoc-plugin dep from 2.9.0 to 3.5.0
-[cygnus-common] Upgrade mongodb driver dep from 3.12.11 to 3.12.12
-[cygnus-common] Upgrade apache httpclient dep from 4.5.13 to 4.5.14
-[cygnus-common][cygnus-ngsi] Upgrade apache httpcore dep from 4.3.1 to 4.4.16
-[cygnus-common] Upgrade apache common lang dep from 3.4.0 to 3.12.0
-[cygnus-common] Added support for reindexing of dataExpiration (#2160, partially)
-[cygnus-ngsi] Upgrade Debian version from 11.3 to 11.6 in Dockerfile
-[cygnus-ngsi] Update NameMapping compile log mensage from WARN to ERROR
-[cygnus-common] MongoDB indexes are created depending on DM (#2204)
-[cygnus-common] Upgrade postgresql from 42.4.1 to 42.4.3
-[cygnus-common] OracleSQL backend (#2195)
-[cygnus-common][cygnus-twitter] Upgrade flume-ng-node version from 1.9.0 to 1.11.0 (#2179)
-[cygnus-common][cygnus-twitter][cygnus-ngsi][cygnus-ngsi-ld] Upgrade log4j from v1 (1.2.17) to v2 (2.17.2) series (#1592)
-[cygnus-ngsi] OracleSQL ngsi sink added (for OracleS 11g and 12c) (#2195)
-[cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2201)
-[cygnus-common] Added support for MongoDB hosts without a port (#2219)

diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>

diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec
@@ -171,6 +171,30 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/%{_project_name}
 
 %changelog
+* Thu May 04 2023 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.0.0
+- [cygnus-common] OracleSQL backend (#2195)
+- [cygnus-common] MongoDB indexes are created depending on DM (#2204)
+- [cygnus-common] Added support for reindexing of dataExpiration (#2160, partially)
+- [cygnus-common] Added support for MongoDB hosts without a port (#2219)
+- [cygnus-common] Fixed isANumber for number containing multiple decimals (#2226)
+- [cygnus-common] Upgrade Java version from 1.8 to 1.11 in Dockerfile
+- [cygnus-common] Upgrade flume-ng-node version from 1.9.0 to 1.11.0 (#2179)
+- [cygnus-common] Upgrade log4j from v1 (1.2.17) to v2 (2.17.2) series (#1592)
+- [cygnus-common] Upgrade hadoop-core from 1.2.1 to hadoop-client 2.7.0
+- [cygnus-common] Upgrade hive-jdbc from 2.3.4 to 3.1.3
+- [cygnus-common] Upgrade maven-compiler-plugin dep from 3.5.1 to 3.11.0
+- [cygnus-common] Upgrade maven-assembly-plugin dep from 2.6.0 to 3.5.0
+- [cygnus-common] Upgrade exec-maven-plugin  dep from 3.5.1 to 3.8.2
+- [cygnus-common] Upgrade maven-site-plugin dep from 2.5.1 to 3.8.2
+- [cygnus-common] Upgrade maven-surefire-report-plugin dep from 2.12.4 to 3.0.0
+- [cygnus-common] Upgrade maven-checkstyle-plugin dep from 2.12.0 to 3.2.1
+- [cygnus-common] Upgrade maven-javadoc-plugin dep from 2.9.0 to 3.5.0
+- [cygnus-common] Upgrade mongodb driver dep from 3.12.11 to 3.12.12
+- [cygnus-common] Upgrade apache httpclient dep from 4.5.13 to 4.5.14
+- [cygnus-common] Upgrade apache httpcore dep from 4.3.1 to 4.4.16
+- [cygnus-common] Upgrade apache common lang dep from 3.4.0 to 3.12.0
+- [cygnus-common] Upgrade postgresql from 42.4.1 to 42.4.3
+
 * Tue Oct 18 2022 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.20.0
 - [cygnus-common][SQLBackend] Ordernig batch INSERT sentences upon upsert to avoid deadlocks (#2197)
 - [cygnus-common][MySQLBackend] Upgrade mysql-connector-java from 8.0.27 to 8.0.28

diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi-ld</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi-ld</name>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.20.0-SNAPSHOT</version>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.20.0-SNAPSHOT</version>
+            <version>3.0.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
         <dependency>

diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
@@ -99,6 +99,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Thu May 04 2023 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.0.0
+- [cygnus-ngsi] Update NameMapping compile log mensage from WARN to ERROR
+- [cygnus-ngsi] OracleSQL ngsi sink added (for OracleS 11g and 12c) (#2195)
+- [cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2201)
+- [cygnus-ngsi] Upgrade Java version from 1.8 to 1.11 in Dockerfile
+- [cygnus-ngsi] Upgrade log4j from v1 (1.2.17) to v2 (2.17.2) series (#1592)
+- [cygnus-ngsi] Upgrade maven-compiler-plugin dep from 3.5.1 to 3.11.0
+- [cygnus-ngsi] Upgrade maven-assembly-plugin dep from 2.6.0 to 3.5.0
+- [cygnus-ngsi] Upgrade exec-maven-plugin  dep from 3.5.1 to 3.8.2
+- [cygnus-ngsi] Upgrade maven-site-plugin dep from 2.5.1 to 3.8.2
+- [cygnus-ngsi] Upgrade maven-surefire-report-plugin dep from 2.12.4 to 3.0.0
+- [cygnus-ngsi] Upgrade maven-checkstyle-plugin dep from 2.12.0 to 3.2.1
+- [cygnus-ngsi] Upgrade maven-javadoc-plugin dep from 2.9.0 to 3.5.0
+- [cygnus-ngsi] Upgrade apache httpcore dep from 4.3.1 to 4.4.16
+- [cygnus-ngsi] Upgrade Debian version from 11.3 to 11.6 in Dockerfile
+
 * Tue Oct 18 2022 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.20.0
 - [cygnus-ngsi][SQL-sinks] New datamodels added: `data_model=dm-by-fixed-entity-type`, `data_model=dm-by-fixed-entity-type-database-schema`, `data_model=dm-by-fixed-entity-type-database` (#2190)
 - [cygnus-ngsi] Fix aggregate using event servicepath (#2185)

diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>2.20.0-SNAPSHOT</version>
+            <version>3.0.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>

diff --git a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Thu May 04 2023 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.0.0
+- [cygnus-twitter] Upgrade log4j from v1 (1.2.17) to v2 (2.17.2) series (#1592)
+
 * Tue Oct 18 2022 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.20.0
 
 * Fri Jun 03 2022 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 2.19.0

diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile
@@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno <francisco.romerobueno@telefonica.com>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.20.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.0.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-common"
@@ -40,7 +40,7 @@ ENV CYGNUS_API_PORT "8081"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "master"
+ENV GIT_REV_CYGNUS "release/3.0.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"

diff --git a/docker/cygnus-ngsi-ld/Dockerfile b/docker/cygnus-ngsi-ld/Dockerfile
@@ -27,7 +27,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.20.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.0.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi-ld"

diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile
@@ -23,7 +23,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.20.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.0.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi"

diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile
@@ -27,7 +27,7 @@ MAINTAINER Javi Palanca <jpalanca@dsic.upv.es>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "2.20.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.0.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-twitter"
@@ -39,7 +39,7 @@ ENV CYGNUS_JAVA_OPTS "-Xms2048m -Xmx4096m"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "master"
+ENV GIT_REV_CYGNUS "release/3.0.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"