From 784f26cccef2120dcd20f2640dc95c28fc83bc3e Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Mon, 20 Sep 2021 13:02:13 +0200 Subject: [PATCH] Step: 2.12.0_SNAPSHOT -> 2.13.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 | 2 ++ cygnus-twitter/pom.xml | 4 ++-- cygnus-twitter/spec/SPECS/cygnus-twitter.spec | 2 ++ docker/cygnus-common/Dockerfile | 4 ++-- docker/cygnus-ngsi-ld/Dockerfile | 2 +- docker/cygnus-ngsi/Dockerfile | 2 +- docker/cygnus-twitter/Dockerfile | 4 ++-- 12 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 891569239..8b1378917 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,2 +1 @@ -- [cygnus-common] Use ckanPath in ckan cache -- [cygnus-common] Remove methods in class CKANBackendImpl for allowing the creation of the data store with ngsi-ld notifications due to break backward compatibilitgy ckan in column mode + diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml index 50a9342ea..bec50724c 100644 --- a/cygnus-common/pom.xml +++ b/cygnus-common/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-common - 2.12.0_SNAPSHOT + 2.13.0 jar cygnus-common diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec index 3c4589810..687e4db1e 100644 --- a/cygnus-common/spec/SPECS/cygnus-common.spec +++ b/cygnus-common/spec/SPECS/cygnus-common.spec @@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT /var/run/%{_project_name} %changelog +* Mon Sep 20 2021 Alvaro Vega 2.13.0 +- [cygnus-common] Use ckanPath in ckan cache +- [cygnus-common] Remove methods in class CKANBackendImpl for allowing the creation of the data store with ngsi-ld notifications due to break backward compatibilitgy ckan in column mode * Wed Aug 18 2021 Ivan Hernandez 2.12.0 diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml index 0042391aa..1d3cf9366 100644 --- a/cygnus-ngsi-ld/pom.xml +++ b/cygnus-ngsi-ld/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi-ld - 2.12.0_SNAPSHOT + 2.13.0 jar cygnus-ngsi-ld @@ -55,7 +55,7 @@ com.telefonica.iot cygnus-common - 2.12.0_SNAPSHOT + 2.13.0 diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml index 65eb06cc7..79c851666 100644 --- a/cygnus-ngsi/pom.xml +++ b/cygnus-ngsi/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-ngsi - 2.12.0_SNAPSHOT + 2.13.0 jar cygnus-ngsi @@ -56,7 +56,7 @@ com.telefonica.iot cygnus-common - 2.12.0_SNAPSHOT + 2.13.0 diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec index c0a1e088e..2ed849f62 100644 --- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec +++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec @@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Mon Sep 20 2021 Alvaro Vega 2.13.0 + * Wed Aug 18 2021 Ivan Hernandez 2.12.0 -[cygnus-ngsi][NGSICkan] Add ckan path configuration option (#2072) diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml index 60f4928ce..11182b896 100644 --- a/cygnus-twitter/pom.xml +++ b/cygnus-twitter/pom.xml @@ -5,7 +5,7 @@ com.telefonica.iot cygnus-twitter - 2.12.0_SNAPSHOT + 2.13.0 jar cygnus-twitter @@ -45,7 +45,7 @@ com.telefonica.iot cygnus-common - 2.12.0_SNAPSHOT + 2.13.0 diff --git a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec index a7f2cda47..dd7e320ef 100644 --- a/cygnus-twitter/spec/SPECS/cygnus-twitter.spec +++ b/cygnus-twitter/spec/SPECS/cygnus-twitter.spec @@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT %{_project_install_dir} %changelog +* Mon Sep 20 2021 Alvaro Vega 2.13.0 + * Wed Aug 18 2021 Ivan Hernandez 2.12.0 * Thu Jul 22 2021 Alvaro Vega 2.11.0 diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile index 596decd38..e2838c887 100644 --- a/docker/cygnus-common/Dockerfile +++ b/docker/cygnus-common/Dockerfile @@ -23,7 +23,7 @@ MAINTAINER Francisco Romero Bueno # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.12.0_SNAPSHOT" +ENV CYGNUS_VERSION "2.13.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" @@ -36,7 +36,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/2.13.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 85c8f1d04..2fdb2cedb 100644 --- a/docker/cygnus-ngsi-ld/Dockerfile +++ b/docker/cygnus-ngsi-ld/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.12.0_SNAPSHOT" +ENV CYGNUS_VERSION "2.13.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 415442ff9..5f0f1a3df 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 "2.12.0_SNAPSHOT" +ENV CYGNUS_VERSION "2.13.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 0d8806297..6918c007b 100644 --- a/docker/cygnus-twitter/Dockerfile +++ b/docker/cygnus-twitter/Dockerfile @@ -23,7 +23,7 @@ MAINTAINER Javi Palanca # Environment variables ENV CYGNUS_USER "cygnus" ENV CYGNUS_HOME "/opt/fiware-cygnus" -ENV CYGNUS_VERSION "2.12.0_SNAPSHOT" +ENV CYGNUS_VERSION "2.13.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" @@ -35,7 +35,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/2.13.0" ENV MVN_VER "3.5.4" ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"