From a3c4619d610217888afb005a648da6ada7f1afd7 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 17 Apr 2024 09:32:18 +0200 Subject: [PATCH] step 3.7.0-snapshot -> 3.8.0 --- CHANGES_NEXT_RELEASE | 3 +-- cygnus-common/pom.xml | 2 +- cygnus-common/spec/SPECS/cygnus-common.spec | 3 +++ cygnus-ngsi-ld/pom.xml | 4 ++-- cygnus-ngsi/pom.xml | 4 ++-- cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec | 3 +++ cygnus-twitter/pom.xml | 4 ++-- docker/cygnus-common/Dockerfile | 4 ++-- docker/cygnus-ngsi-ld/Dockerfile | 2 +- docker/cygnus-ngsi/Dockerfile | 2 +- docker/cygnus-twitter/Dockerfile | 4 ++-- 11 files changed, 20 insertions(+), 15 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index f11e4124a..8b1378917 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,2 +1 @@ -- [cygnus-common] [SQL-sinks] Define default values and allow to set connection pool config for maxPoolSize(3), maxPoolIddle(2), minPoolIdle(0) and minPoolIdleTimeMillis(10000) (#2366) -- [cygnus-ngsi] Upgrade Debian version from 12.4 to 12.5 in Dockerfile + diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 3def45563..0e56d262f 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 3.7.0-SNAPSHOT + 3.8.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 8211ddd68..b9e902dad 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 17 2024 Alvaro Vega 3.8.0 +- [cygnus-common] [SQL-sinks] Define default values and allow to set connection pool config for maxPoolSize(3), maxPoolIddle(2), minPoolIdle(0) and minPoolIdleTimeMillis(10000) (#2366) + * Mon Mar 11 2024 Alvaro Vega 3.7.0 * Mon Mar 4 2024 Alvaro Vega 3.6.0 diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index 6bc8c929b..dfa4c32a4 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 3.7.0-SNAPSHOT + 3.8.0 jar cygnus-ngsi-ld @@ -60,7 +60,7 @@ com.telefonica.iot cygnus-common - 3.7.0-SNAPSHOT + 3.8.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 1f5b538f2..8504c63fc 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 3.7.0-SNAPSHOT + 3.8.0 jar cygnus-ngsi @@ -63,7 +63,7 @@ com.telefonica.iot cygnus-common - 3.7.0-SNAPSHOT + 3.8.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index 0b892c26b..7cd78b1db 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Wed Apr 17 2024 Alvaro Vega 3.8.0 +- [cygnus-ngsi] Upgrade Debian version from 12.4 to 12.5 in Dockerfile + * Mon Mar 11 2024 Alvaro Vega 3.7.0 - [cygnus-ngsi][ColumnAggregator][LastData] Fix lastdata when remove multiple entities by alterationType with entityDelete - [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities at the same time) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index 1b86254f0..94f1da964 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 3.7.0-SNAPSHOT + 3.8.0 jar cygnus-twitter @@ -57,7 +57,7 @@ com.telefonica.iot cygnus-common - 3.7.0-SNAPSHOT + 3.8.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 1ec85ff5f..08b7e21c6 100644 --- a/docker/cygnus-common/Dockerfile +++ b/docker/cygnus-common/Dockerfile @@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "3.7.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.8.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.8.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 index deff6ba3c..687962dfe 100644 --- 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 "3.7.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.8.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 index ddf509d45..5f7a34118 100644 --- 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 "3.7.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.8.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 index 92428d64f..3842ed068 100644 --- a/docker/cygnus-twitter/Dockerfile +++ b/docker/cygnus-twitter/Dockerfile @@ -27,7 +27,7 @@ MAINTAINER Javi Palanca # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "3.7.0-SNAPSHOT" +ENV CYGNUS_VERSION "3.8.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.8.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"