Commit 7d17c20f authored by PECQUOT's avatar PECQUOT
Browse files

Merge branch 'release/3.7.4-RC1'

parents 2e1334db 58d2e4d6
Pipeline #8825 failed with stages
in 0 seconds
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-synchro-server</artifactId>
......@@ -502,6 +502,35 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>${bundlePrefix}-standalone.zip</include>
<include>${bundlePrefix}.${project.packaging}</include>
</includes>
</fileSet>
</fileSets>
<algorithms>
<algorithm>SHA-256</algorithm>
</algorithms>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-synchro</artifactId>
......
......@@ -1221,7 +1221,7 @@ public class DataSynchroServiceImpl
// For Postgreql, register postgis geometry type
if (Daos.isPostgresqlDatabase(databaseConfiguration.getJdbcUrl())) {
((PGConnection) Daos.unwrapConnection(connection)).addDataType("\"postgis\".\"geometry\"", PGgeometry.class);
((PGConnection) Daos.unwrapConnection(connection)).addDataType(String.format("\"%s\".\"geometry\"", QuadrigeConfiguration.getInstance().getPostgisSchema()), PGgeometry.class);
}
// Set timezone - mantis #36465
......
......@@ -841,7 +841,7 @@ public class ReferentialSynchroServiceImpl
// For Postgreql, register postgis geometry type
if (Daos.isPostgresqlDatabase(databaseConfiguration.getJdbcUrl())) {
((PGConnection) Daos.unwrapConnection(connection)).addDataType("\"postgis\".\"geometry\"", PGgeometry.class);
((PGConnection) Daos.unwrapConnection(connection)).addDataType(String.format("\"%s\".\"geometry\"", QuadrigeConfiguration.getInstance().getPostgisSchema()), PGgeometry.class);
}
// Set timezone - mantis #36465
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-test-shared</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>quadrige3-core</artifactId>
<groupId>fr.ifremer.quadrige3</groupId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-ui-swing-common</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-ui-updater</artifactId>
......
......@@ -29,6 +29,12 @@
</properties>
<body>
<release version="3.7.4-RC1" date="2021-06-24" description="Release Candidate">
<action dev="ludovic.pecquot@e-is.pro" type="enh">
Allow different Postgis schema
</action>
</release>
<release version="3.7.3" date="2021-06-18" description="Stable Release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="55621">
Revert Rename sequence for pgsql
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment