Skip to content

Commit

Permalink
Merge pull request #2351 from telefonicaid/task/prepare_3_6_0
Browse files Browse the repository at this point in the history
step 3.5.0_snapshot -> 3.6.0
  • Loading branch information
fgalan authored Mar 4, 2024
2 parents bf27969 + cb5fe2d commit e66c484
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 16 deletions.
3 changes: 0 additions & 3 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2
[cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347)
[cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349)
2 changes: 1 addition & 1 deletion cygnus-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
<packaging>jar</packaging>

<name>cygnus-common</name>
Expand Down
4 changes: 4 additions & 0 deletions cygnus-common/spec/SPECS/cygnus-common.spec
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT

%changelog

* Mon Mar 4 2024 Alvaro Vega <[email protected]> 3.6.0
- [cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347)
- [cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2

* Fri Feb 9 2024 Alvaro Vega <[email protected]> 3.5.0
- [cygnus-common][cygnus-ngsi][cygnus-ngsi-ld] Upgrade in source code to support Java 17 build
- [cygnus-common] [Arcgis] All NGSI DateTime are translated to Millis from Epoch (esriFieldTypeDate) (#2339)
Expand Down
4 changes: 2 additions & 2 deletions cygnus-ngsi-ld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-ngsi-ld</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
<packaging>jar</packaging>

<name>cygnus-ngsi-ld</name>
Expand Down Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions cygnus-ngsi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-ngsi</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
<packaging>jar</packaging>

<name>cygnus-ngsi</name>
Expand Down Expand Up @@ -63,7 +63,7 @@
<dependency>
<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%{_project_install_dir}

%changelog
* Mon Mar 4 2024 Alvaro Vega <[email protected]> 3.6.0
- [cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349)

* Fri Feb 9 2024 Alvaro Vega <[email protected]> 3.5.0
- [cygnus-ngsi] Upgrade mockito-core dep from 5.5.0 to 5.10.0
- [cygnus-ngsi] Upgrade Java version from 1.11 to 1.17 in Dockerfile (#2297, #2304)
Expand Down
4 changes: 2 additions & 2 deletions cygnus-twitter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-twitter</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
<packaging>jar</packaging>

<name>cygnus-twitter</name>
Expand Down Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.telefonica.iot</groupId>
<artifactId>cygnus-common</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0</version>
</dependency>
<!-- Required by twitter agent -->
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions docker/cygnus-common/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno <[email protected]>
# Environment variables
ENV CYGNUS_USER "cygnus"
ENV CYGNUS_HOME "/opt/fiware-cygnus"
ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.6.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"
Expand All @@ -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.6.0"

ENV MVN_VER "3.5.4"
ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion docker/cygnus-ngsi-ld/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.6.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"
Expand Down
2 changes: 1 addition & 1 deletion docker/cygnus-ngsi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.6.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"
Expand Down
4 changes: 2 additions & 2 deletions docker/cygnus-twitter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MAINTAINER Javi Palanca <[email protected]>
# Environment variables
ENV CYGNUS_USER "cygnus"
ENV CYGNUS_HOME "/opt/fiware-cygnus"
ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.6.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"
Expand All @@ -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.6.0"

ENV MVN_VER "3.5.4"
ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
Expand Down

0 comments on commit e66c484

Please sign in to comment.