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
......@@ -46,7 +46,6 @@
</MavenSettings>
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="[SynchroServer] STOP" run_configuration_type="MavenRunConfiguration" />
<option name="ToolBeforeRunTask" enabled="true" actionId="Tool_External Tools_LDAP Ifremer" />
</method>
</configuration>
</component>
\ No newline at end of file
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="[release] 2- Deploy (ifremer)" type="MavenRunConfiguration" factoryName="Maven" folderName="release">
<configuration default="false" name="[release] 2- Deploy (ifremer) DEPRECATED" type="MavenRunConfiguration" factoryName="Maven" folderName="release">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
......
......@@ -30,6 +30,8 @@
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
<method v="2">
<option name="RunConfigurationTask" enabled="true" run_configuration_name="[release] clean all" run_configuration_type="MavenRunConfiguration" />
</method>
</configuration>
</component>
\ No newline at end of file
......@@ -12,7 +12,7 @@
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
<packaging>pom</packaging>
<name>Quadrige3 :: Core</name>
......@@ -1600,6 +1600,24 @@
</properties>
</profile>
<profile>
<id>gitlab-deploy</id>
<properties>
<!-- keep eis for site -->
<site.server>eis-public-reports</site.server>
<site.repository>scpexe://doc.e-is.pro/var/www/doc.e-is.pro</site.repository>
<gitlab.projectId>quadrige%2Fquadrige3-core</gitlab.projectId>
<release.server>ifremer-gitlab-deploy</release.server>
<release.repository>https://gitlab.ifremer.fr/api/v4/projects/${gitlab.projectId}/packages/maven</release.repository>
<snapshot.server>ifremer-gitlab-deploy</snapshot.server>
<snapshot.repository>https://gitlab.ifremer.fr/api/v4/projects/${gitlab.projectId}/packages/maven</snapshot.repository>
</properties>
</profile>
<profile>
<id>ifremer-deploy</id>
<properties>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-core</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -44,7 +44,7 @@
# Please fill the missing licenses for dependencies :
#
#
#Mon Jun 21 11:30:51 CEST 2021
#Thu Jun 24 14:53:30 CEST 2021
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
......
......@@ -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-core-client</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-core-server</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-core-shared</artifactId>
......
......@@ -546,6 +546,10 @@ public class QuadrigeConfiguration extends PropertyPlaceholderConfigurer impleme
return applicationConfig.getOption(QuadrigeConfigurationOption.DB_CREATE_SCRIPT_PATH.getKey());
}
public String getPostgisSchema() {
return applicationConfig.getOption(QuadrigeConfigurationOption.POSTGIS_SCHEMA.getKey());
}
/**
* <p>getHibernateDialect.</p>
*
......
......@@ -193,6 +193,12 @@ public enum QuadrigeConfigurationOption implements ConfigOptionDef {
"15",
Integer.class),
POSTGIS_SCHEMA(
"quadrige3.persistence.postgis.schema",
n("quadrige3.config.option.persistence.postgis.schema.description"),
"postgis",
String.class),
HIBERNATE_DIALECT(
"quadrige3.persistence.hibernate.dialect",
n("quadrige3.config.option.persistence.hibernate.dialect.description"),
......
......@@ -56,6 +56,7 @@ quadrige3.config.option.persistence.jdbc.url.description=Database connection URL
quadrige3.config.option.persistence.jdbc.url.shortLabel=URL of database connection
quadrige3.config.option.persistence.jdbc.username.description=Database username
quadrige3.config.option.persistence.jndi-name.description=Database JNDI name (mandatory, if quadrige3.persistence.datasource.type\=jndi)
quadrige3.config.option.persistence.postgis.schema.description=
quadrige3.config.option.persistence.version.description=Current version of Quadrige3 Core
quadrige3.config.option.plugins.directory.description=Directory where application plugins are installed.
quadrige3.config.option.server.port.description=Synchronization server port
......
......@@ -56,6 +56,7 @@ quadrige3.config.option.persistence.jdbc.url.description=URL de conexión a la b
quadrige3.config.option.persistence.jdbc.url.shortLabel=URL jdbc de conexión
quadrige3.config.option.persistence.jdbc.username.description=Inicio de sesión de usuario para conectarse a la base de datos
quadrige3.config.option.persistence.jndi-name.description=Nombre JNDI de la fuente de datos (obligatorio si quadrige3.persistence.datasource.type\=jndi)
quadrige3.config.option.persistence.postgis.schema.description=
quadrige3.config.option.persistence.version.description=Versión actual de la aplicación
quadrige3.config.option.plugins.directory.description=Directorio principal
quadrige3.config.option.server.port.description=Puerto del servidor de sincronización
......
......@@ -57,6 +57,7 @@ quadrige3.config.option.persistence.jdbc.url.description=URL de connexion à la
quadrige3.config.option.persistence.jdbc.url.shortLabel=URL jdbc de connexion
quadrige3.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données
quadrige3.config.option.persistence.jndi-name.description=Nom JNDI du dataSource (obligatoire, si quadrige3.persistence.datasource.type\=jndi)
quadrige3.config.option.persistence.postgis.schema.description=
quadrige3.config.option.persistence.version.description=Version courante de l'application
quadrige3.config.option.plugins.directory.description=Répertoire où sont installés les plugins de l'application.
quadrige3.config.option.server.port.description=Port du serveur de synchronisation
......
......@@ -6,7 +6,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-mda</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-magicdraw-plugin</artifactId>
......
......@@ -14,7 +14,7 @@
# Please fill the missing licenses for dependencies :
#
#
#Mon Jun 21 11:30:30 CEST 2021
#Thu Jun 24 14:47:26 CEST 2021
com.nomagic--javax_jmi-1_0-fr--17.0.2=
com.nomagic--md--17.0.2=
com.nomagic--md_api--17.0.2=
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-mda-client-hsqldb</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-mda-server-oracle</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>fr.ifremer.quadrige3</groupId>
<artifactId>quadrige3-mda</artifactId>
<version>3.7.3</version>
<version>3.7.4-RC1</version>
</parent>
<artifactId>quadrige3-mda-server-pgsql</artifactId>
......
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