Skip to content

Commit

Permalink
Merge pull request #2409 from telefonicaid/task/prepare_3_11_0
Browse files Browse the repository at this point in the history
step 3.10.0-SNAPSHOT -> 3.11.0
  • Loading branch information
fgalan authored Sep 19, 2024
2 parents 8f553a8 + 2b80230 commit 2cc4db4
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 18 deletions.
5 changes: 0 additions & 5 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
- [cygnus-ngsi][restHandler] Add header value to logs about bad header (#2410)
- [cygnus-ngsi] Upgrade Debian version from 12.5 to 12.6 in Dockerfile
- [cygnus-common][cygnus-ngsi] New setting mongo_uri (#2387)
- [cygnus-common][cygnus-ngsi] Deprecate (mongo_hosts, mongo_username, mongo_password, mongo_auth_source, mongo_replica_set) (use mongo_uri instead)
- [cygnus-ngsi][arcgis] fix log warn to info level in arcgis feature when attribute string (#2407)
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.10.0-SNAPSHOT</version>
<version>3.11.0</version>
<packaging>jar</packaging>

<name>cygnus-common</name>
Expand Down
5 changes: 5 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,11 @@ rm -rf $RPM_BUILD_ROOT

%changelog

* Thu Sep 19 2024 Alvaro Vega <[email protected]> 3.11.0

- [cygnus-common][cygnus-ngsi] New setting mongo_uri (#2387)
- [cygnus-common][cygnus-ngsi] Deprecate (mongo_hosts, mongo_username, mongo_password, mongo_auth_source, mongo_replica_set) (use mongo_uri instead)

* Thu Aug 8 2024 Alvaro Vega <[email protected]> 3.10.0

- [cygnus-common] [mongo-backend] Use sslEnabled, sslInvalidHostNameAllowed, sslKeystorePathFile, sslKeystorePassword, sslTruststorePathFile and sslTruststorePassword options for mongoDB connections
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.10.0-SNAPSHOT</version>
<version>3.11.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.10.0-SNAPSHOT</version>
<version>3.11.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.10.0-SNAPSHOT</version>
<version>3.11.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.10.0-SNAPSHOT</version>
<version>3.11.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
<dependency>
Expand Down
7 changes: 7 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,13 @@ rm -rf $RPM_BUILD_ROOT
%{_project_install_dir}

%changelog

* Thu Sep 19 2024 Alvaro Vega <[email protected]> 3.11.0

- [cygnus-ngsi][restHandler] Add header value to logs about bad header (#2410)
- [cygnus-ngsi] Upgrade Debian version from 12.5 to 12.6 in Dockerfile
- [cygnus-ngsi][arcgis-sink] fix log warn to info level in arcgis feature when attribute string (#2407)

* Thu Aug 8 2024 Alvaro Vega <[email protected]> 3.10.0
- [cygnus-ngsi] [mongo-sink] Add mongo_ssl, mongo_ssl_invalid_host_allowed, mongo_ssl_keystore_path_file, mongo_ssl_keystore_password, mongo_ssl_truststore_path_file and mongo_ssl_truststore_password options for mongoDB connections
- [cygnus-ngsi] [arcgis-sink] Add esri Geometry PolyLine, MultiPoint and Polygon support (#2392)
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.10.0-SNAPSHOT</version>
<version>3.11.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.10.0-SNAPSHOT</version>
<version>3.11.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.10.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.11.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.11.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.10.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.11.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.10.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.11.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.10.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.11.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.11.0"

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

0 comments on commit 2cc4db4

Please sign in to comment.