Skip to content

Commit

Permalink
Merge pull request #2427 from telefonicaid/task/prepare_3_13_0
Browse files Browse the repository at this point in the history
step 3.12.0-SNAPSHOT -> 3.13.0
  • Loading branch information
fgalan authored Oct 14, 2024
2 parents ba329b5 + 93d11dc commit c542af8
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 17 deletions.
5 changes: 1 addition & 4 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
- [cygnus-ngsi][arcgis] Try to get GlobalID if OID is not found in retrieved feature (#2424)
- [cygnus-ngsi][arcgis] Fix json parse for instance of PolyLine, Polygon and Multipoint (#2423)
- [cygnus-ngsi][arcgis] Check feature table is connected before use it (#2405)
- [cygnus-ngsi][arcgis] Set feature table to not connected after a connection error (#2405)

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.12.0-SNAPSHOT</version>
<version>3.13.0</version>
<packaging>jar</packaging>

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

%changelog

* Mon Oct 14 2024 Alvaro Vega <[email protected]> 3.13.0

* Fri Sep 27 2024 Alvaro Vega <[email protected]> 3.12.0

- [cygnus-common][arcgis] toString of complex geometry is not returning equivalent input (#2418)
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.12.0-SNAPSHOT</version>
<version>3.13.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.12.0-SNAPSHOT</version>
<version>3.13.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.12.0-SNAPSHOT</version>
<version>3.13.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.12.0-SNAPSHOT</version>
<version>3.13.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 @@ -100,6 +100,13 @@ rm -rf $RPM_BUILD_ROOT

%changelog

* Mon Oct 14 2024 Alvaro Vega <[email protected]> 3.13.0

- [cygnus-ngsi][arcgis] Try to get GlobalID if OID is not found in retrieved feature (#2424)
- [cygnus-ngsi][arcgis] Fix json parse for instance of PolyLine, Polygon and Multipoint (#2423)
- [cygnus-ngsi][arcgis] Check feature table is connected before use it (#2405)
- [cygnus-ngsi][arcgis] Set feature table to not connected after a connection error (#2405)

* Fri Sep 27 2024 Alvaro Vega <[email protected]> 3.12.0

- [cygnus-ngsi][arcgis] Log json geometry before create instance and in errors related
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.12.0-SNAPSHOT</version>
<version>3.13.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.12.0-SNAPSHOT</version>
<version>3.13.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.12.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.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"
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.13.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.12.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.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"
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.12.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.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"
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.12.0-SNAPSHOT"
ENV CYGNUS_VERSION "3.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"
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.13.0"

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

0 comments on commit c542af8

Please sign in to comment.