Commit fdaf226d authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.8.0'

parents cf60a8d5 2218f023
......@@ -8,7 +8,17 @@ stages:
- release
- deploy
build-dev:
.build:
stage: build
tags:
- sih_public_runner
script:
- echo "Test dev build in progress"
- mvn -s ./ci_settings.xml -q clean install -DskipTests
environment:
name: test
build_auto:
extends: .build
only:
- develop
......@@ -16,65 +26,50 @@ build-dev:
except:
- schedules
schedule-build:
schedule_build:
extends: .build
artifacts:
paths:
- sumaris-server/target/*.war
only:
- schedules
.build:
stage: build
tags:
- sih_public_runner
script:
- echo "Test dev build in progress"
- mvn -s ./settings.xml clean install -DskipTests -P oracle
environment:
name: test
build_val:
stage: build
tags:
- sih_public_runner
script:
- echo "Test oracle build in progress"
- mvn -s ./settings.xml clean install -DskipTests -Dspring.liquibase.enabled=false -Dsumaris.name=SUMARiS -Dsumaris.persistence.sequence.increment=1 -Dlogging.level.org.hibernate.SQL=debug
environment:
name: test
artifacts:
paths:
- sumaris-server/target/*.war
build_registry:
extends: .build
after_script:
- echo "Deploy Snapshot in progress"
- SNAPSHOT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
- echo $SNAPSHOT_VERSION
- mvn -s ./ci_settings.xml deploy:deploy-file -DgroupId=fr.ifremer -DartifactId=imagine-pod -Dversion=$SNAPSHOT_VERSION -Dfile=sumaris-server/target/sumaris-server-$SNAPSHOT_VERSION.war -DrepositoryId=job-maven -Durl=https://gitlab.ifremer.fr/api/v4/projects/1272/packages/maven
only:
- develop
- feature/imagine
artifacts:
paths:
- sumaris-server/target/*.war
when: manual
sonarqube:
stage: test
tags:
tags:
- sih_public_runner
variables:
SONAR_TOKEN: "e6f816eee72d3d5c03319ec74b468157b9164d12"
SONAR_HOST_URL: "http://visi-common-sonar:9000"
image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
SONAR_TOKEN: "e6f816eee72d3d5c03319ec74b468157b9164d12"
SONAR_HOST_URL: "http://visi-common-sonar:9000"
image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
script:
- echo "Sonarqube analysis in progress"
- sonar-scanner
-Dsonar.projectKey=imagine-pod
-Dsonar.host.url=$SONAR_HOST_URL
-Dsonar.login=$SONAR_TOKEN
-Dsonar.sourceEncoding=UTF-8
-Dsonar.java.binaries=.
-Dsonar.java.libraries=.
- echo "Sonarqube analysis in progress"
- sonar-scanner
-Dsonar.projectKey=imagine-pod
-Dsonar.host.url=$SONAR_HOST_URL
-Dsonar.login=$SONAR_TOKEN
-Dsonar.sourceEncoding=UTF-8
-Dsonar.java.binaries=.
-Dsonar.java.libraries=.
only:
- develop
- feature/imagine
when: manual
pages:
stage: docs
......@@ -96,11 +91,11 @@ pages:
- develop
- feature/imagine
when: manual
package:
stage: prepare
tags:
tags:
- sih_public_runner
before_script:
- git checkout -B "$CI_BUILD_REF_NAME"
......@@ -110,8 +105,8 @@ package:
script:
- echo "Release in progress"
- mvn release:clean -Dslf4jJclScope=provided
- mvn -s ./settings.xml release:prepare --batch-mode -Dtag=imagine-pod-$RELEASE_VERSION -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$NEW_DEV_VERSION -DscmCommentPrefix="[ci skip] to "
- mvn -s ./settings.xml release:perform -Dslf4jJclScope=provided -X -DscmCommentPrefix="[ci skip] to "
- mvn -s ./ci_settings.xml release:prepare --batch-mode -Dtag=imagine-pod-$RELEASE_VERSION -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$NEW_DEV_VERSION -DscmCommentPrefix="[ci skip] to "
- mvn -s ./ci_settings.xml release:perform -Dslf4jJclScope=provided -X -DscmCommentPrefix="[ci skip] to "
artifacts:
paths:
- web-services/target/*.war
......@@ -125,7 +120,7 @@ package:
release:
stage: release
tags:
tags:
- sih_public_runner
image: registry.gitlab.com/gitlab-org/release-cli:latest
needs:
......@@ -145,11 +140,11 @@ release:
deploy:
stage: deploy
tags:
tags:
- sih_public_runner
script:
- echo "Deploy in progress"
- mvn -s ./settings.xml deploy:deploy-file -DgroupId=fr.ifremer -DartifactId=imagine-pod -Dversion=$TAG -Dfile=web-services/target/ROOT.war -DrepositoryId=gitlab-maven -Durl=https://gitlab.ifremer.fr/api/v4/projects/1226/packages/maven
- mvn -s ./ci_settings.xml deploy:deploy-file -DgroupId=fr.ifremer -DartifactId=imagine-pod -Dversion=$TAG -Dfile=web-services/target/ROOT.war -DrepositoryId=internal-maven -Durl=https://gitlab.ifremer.fr/api/v4/projects/1226/packages/maven
only:
- develop
- feature/imagine
......
......@@ -123,24 +123,27 @@ under the License.
</server>
-->
<!--
<server>
<id>gitlab-maven</id>
<configuration>
<httpHeaders>
<property>
<name>gitlab+deploy-token-34</name>
<value>qmqyr4oesz6hHiGYuEFX</value>
</property>
</httpHeaders>
</configuration>
</server>
-->
<server>
<id>gitlab-maven</id>
<id>internal-maven</id>
<username>${env.MAVEN_REPO_USER}</username>
<password>${env.MAVEN_REPO_PASS}</password>
</server>
<server>
<id>project-maven</id>
<username>gitlab+deploy-token-62</username>
<password>54gJ-pk4XDxmjoxBdirx</password>
</server>
<server>
<id>job-maven</id>
<configuration>
<httpHeaders>
<property>
<name>Job-Token</name>
<value>${env.CI_JOB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
<server>
<id>gitlab.ifremer.fr</id>
<username>${env.GITLAB_REPO_USER}</username>
......@@ -226,43 +229,21 @@ under the License.
</profile>
-->
<!--
| Here is another profile, activated by the system property 'target-env' with a value of 'dev',
| which provides a specific path to the Tomcat instance. To use this, your plugin configuration
| might hypothetically look like:
|
| ...
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
|
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
| </plugin>
| ...
|
| NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
| anything, you could just leave off the <value/> inside the activation-property.
|
<profile>
<id>env-dev</id>
<activation>
<property>
<name>target-env</name>
<value>dev</value>
</property>
</activation>
<properties>
<tomcatPath>/path/to/tomcat/instance</tomcatPath>
</properties>
<id>gitlab-profile</id>
<repositories>
<repository>
<id>project-maven</id>
<url>https://gitlab.ifremer.fr/api/v4/projects/1272/packages/maven</url>
</repository>
</repositories>
<properties>
<release.server>internal-maven</release.server>
<release.repository>https://gitlab.ifremer.fr/api/v4/projects/1272/packages/maven</release.repository>
<snapshot.server>job-maven</snapshot.server>
<snapshot.repository>https://gitlab.ifremer.fr/api/v4/projects/1226/packages/maven</snapshot.repository>
</properties>
</profile>
-->
</profiles>
<!-- activeProfiles
......@@ -276,4 +257,9 @@ under the License.
<activeProfiles>
<activeProfile>staging</activeProfile>
</activeProfiles>-->
<activeProfiles>
<activeProfile>gitlab-profile</activeProfile>
</activeProfiles>
</settings>
\ No newline at end of file
......@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.2</version>
<version>1.8.0</version>
<packaging>pom</packaging>
<name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description>
......@@ -93,17 +93,17 @@
<ojdbc8.version>12.2.0.1</ojdbc8.version>
<pgsql.version>42.2.5</pgsql.version>
<slf4j.version>1.7.27</slf4j.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
<log4j.version>2.12.1</log4j.version>
<jansi.version>1.9</jansi.version>
<guava.version>23.0</guava.version>
<xml-apis.version>2.0.2</xml-apis.version>
<elasticsearch.version>6.2.2</elasticsearch.version>
<jna.version>4.5.2</jna.version>
<tyrus.version>1.15</tyrus.version>
<elasticsearch.version>7.10.2</elasticsearch.version>
<jna.version>5.8.0</jna.version>
<tyrus.version>1.17</tyrus.version>
<jackson.version>2.11.3</jackson.version><!-- /!\ 2.9.8 import kotlin error -->
<stringtemplate.version>4.0.2</stringtemplate.version>
<stringtemplate.version>4.1</stringtemplate.version>
<jTextUtilsVersion>0.3.3</jTextUtilsVersion>
<commonBeanutilsVersion>1.9.4</commonBeanutilsVersion>
<opencsv.version>2.4.3</opencsv.version>
......@@ -113,36 +113,38 @@
<hibernate-search.version>5.11.8.Final</hibernate-search.version>
<hibernate-spatial.version>5.4.27.Final</hibernate-spatial.version>
<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
<spring.version>5.2.12.RELEASE</spring.version>
<spring-web.version>5.2.12.RELEASE</spring-web.version>
<spring-data.version>2.3.6.RELEASE</spring-data.version>
<spring.version>5.3.6</spring.version>
<spring-web.version>5.3.6</spring-web.version>
<spring-data.version>2.5.0</spring-data.version>
<spring-security.version>5.4.6</spring-security.version>
<querydsl.version>4.2.2</querydsl.version>
<aspectj.version>1.9.6</aspectj.version>
<javassist.version>3.27.0-GA</javassist.version>
<cglib.version>3.3.0</cglib.version>
<ehcache.version>2.10.6</ehcache.version>
<ehcache.version>3.8.1</ehcache.version>
<ehcache-monitor.version>2.7.11</ehcache-monitor.version>
<lombok.version>1.18.16</lombok.version>
<lombok.version>1.18.20</lombok.version>
<xmlquery.version>1.2</xmlquery.version>
<jdom2.version>2.0.6</jdom2.version>
<jaxen.version>1.2.0</jaxen.version>
<spring-boot.version>2.3.8.RELEASE</spring-boot.version>
<spring-boot-plugin.version>2.3.8.RELEASE</spring-boot-plugin.version>
<spring-boot.version>2.4.5</spring-boot.version>
<spring-boot-plugin.version>2.4.5</spring-boot-plugin.version>
<ozimov-email.version>0.6.3</ozimov-email.version>
<reflections.version>0.9.12</reflections.version>
<rxjava.version>2.2.20</rxjava.version>
<activemq.version>5.16.0</activemq.version>
<rxjava2.version>2.2.21</rxjava2.version>
<activemq.version>5.16.2</activemq.version>
<jnr-ffi.version>2.2.1</jnr-ffi.version>
<kalium.version>0.5.0_blavenie</kalium.version>
<!--<kalium.version>0.8.1-SNAPSHOT</kalium.version>-->
<jnr-ffi.version>2.2.2</jnr-ffi.version>
<kalium.version>0.8.2</kalium.version>
<scrypt.version>1.4.0</scrypt.version>
<geojson-jackson.version>1.14</geojson-jackson.version>
<graphql-java.version>13.0</graphql-java.version>
<graphql-java-tools.version>6.1.0</graphql-java-tools.version>
<graphql-java-servlet.version>9.2.0</graphql-java-servlet.version>
<spqr.version>0.10.1</spqr.version>
<graphql-java.version>16.2</graphql-java.version>
<graphql-java-tools.version>11.0.1</graphql-java-tools.version>
<graphql-java-servlet.version>11.1.0</graphql-java-servlet.version>
<graphql-spring-boot.version>7.1.0</graphql-spring-boot.version>
<spqr.version>0.11.2</spqr.version>
<kotlin.version>1.3.70</kotlin.version>
<unboundid-ldapsdk.version>4.0.14</unboundid-ldapsdk.version>
<!-- database version management -->
<liquibase.version>3.6.3</liquibase.version>
......@@ -158,7 +160,7 @@
<jmock.version>2.9.0</jmock.version>
<dbunit.version>2.6.0</dbunit.version>
<nuitonConfigVersion>3.4</nuitonConfigVersion>
<nuitonConfigVersion>3.5</nuitonConfigVersion>
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
<nuitonUtilsVersion>3.0</nuitonUtilsVersion>
<nuitonI18nVersion>3.7</nuitonI18nVersion>
......@@ -192,7 +194,7 @@
<!-- apache maven plugins version -->
<jarPluginVersion>3.1.2</jarPluginVersion>
<sitePluginVersion>3.8.2</sitePluginVersion>
<sitePluginVersion>3.9.1</sitePluginVersion>
<changesPluginVersion>2.12.1</changesPluginVersion>
<changelogPluginVersion>2.3</changelogPluginVersion>
<projectInfoReportsPluginVersion>2.9</projectInfoReportsPluginVersion>
......@@ -215,7 +217,7 @@
<findbugsPluginVersion>3.0.5</findbugsPluginVersion>
<!-- web site -->
<locales>en</locales>
<locales>en,fr</locales>
<!-- I18n configuration -->
<i18n.bundles>fr_FR,en_GB</i18n.bundles>
......@@ -248,9 +250,7 @@
<assembly.skip>false</assembly.skip>
<!-- to deploy with scpexe for maven 3 -->
<wagonSshVersion>3.0.0</wagonSshVersion>
<wagonSshVersion>3.4.3</wagonSshVersion>
</properties>
......@@ -368,7 +368,7 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<artifactId>spring-boot-starter-cache</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
......@@ -405,6 +405,12 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${activemq.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
......@@ -412,14 +418,14 @@
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
<version>${rxjava2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -446,11 +452,6 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
......@@ -460,6 +461,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
......@@ -485,7 +494,6 @@
<version>${jnr-ffi.version}</version>
</dependency>
<!-- graphqQL-->
<!-- GraphQL -->
<dependency>
<groupId>com.graphql-java</groupId>
......@@ -618,22 +626,8 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<artifactId>hibernate-jcache</artifactId>
<version>${hibernate.version}</version>
<exclusions>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
......@@ -660,26 +654,33 @@
<artifactId>hibernate-tools</artifactId>
<version>${hibernate-tools.version}</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
<dependency>
</dependency>-->
<!--<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-elasticsearch</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${hibernate.version}</version>
</dependency>
<!-- EhCache -->
<dependency>
<groupId>net.sf.ehcache</groupId>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${ehcache.version}</version>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
<version>1.1.1</version>
</dependency>
<!-- XML Query -->
<dependency>
......@@ -745,6 +746,11 @@
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
......@@ -770,6 +776,11 @@
<artifactId>querydsl-jpa</artifactId>
<version>${querydsl.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
<version>${spring-security.version}</version>
</dependency>
<!-- Compile -->
<dependency>
......@@ -1012,6 +1023,18 @@
<version>${dbunit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-spring-boot-test</artifactId>
<version>${graphql-spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>${unboundid-ldapsdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
......
Subproject commit 851530895e5c2f6a9d8c3b53e4bfc46b66198508
Subproject commit e7edc1c5740b0235d16be41ee00465c746ee0c67
......@@ -72,7 +72,12 @@ DB_PORT=9000
### Oracle
`TODO: write this part`
Download locally oracle propeties file from [isi-sih-sumaris](https://gitlab.ifremer.fr/dev_ops/shared_docker_image_factory/isi-sih-sumaris) project (you can find properties files under `sumaris-server` directory).
Run next command with the right path to oracle tns_name and propertie files :
```bash
spring-boot:run -Dspring-boot.run.fork=false -Doracle.net.tns_admin=\\brest\tnsnames -Dspring.config.location=path-to-file\application-oracle.properties
```
### PostgreSQL
......
......@@ -24,80 +24,84 @@
<project name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.7</version>
</skin>
<custom>
<fluidoSkin>
<topBarEnabled>false</topBarEnabled>
<googleSearch/>
<sideBarEnabled>true</sideBarEnabled>
<searchEnabled>true</searchEnabled>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
</fluidoSkin>
</custom>
<bannerLeft>
<name>${project.name}</name>
<href>./index.html</href>
</bannerLeft>
<bannerRight>
<name>${project.name}</name>
<src>images/logos/logo_sumaris-banner.png</src>
<href>./index.html</href>
</bannerRight>
<publishDate position="right" format="yyyy-MM-dd"/>
<version position="none"/>
<poweredBy>
<logo href="http://maven.apache.org" name="Maven"
img="./images/logos/maven-feather.png"/>
<logo href="https://ionicframework.com/" name="Ionic"
img="./images/logos/ionic-logo.png"/>
</poweredBy>
<body>
<links>
<item name="SUMARiS portal" href="https://www.sumaris.net"/>
<item name="EIS" href="http://www.e-is.pro"/>
</links>
<breadcrumbs>
<item name="${project.name}" href="./index.html"/>
</breadcrumbs>
<menu name="${project.name}" inherit="top">
<item name="Home" href="index.html"/>
<item name="Releases history" href="changes-report.html"/>
</menu>
<menu name="User documentation" inherit="top">
<item name="Quick start guide" href="doc/user-manual/index.html"/>
<item name="Use cases" href="doc/use-case/index_en.html"/>
</menu>
<menu name="Technical documentation" inherit="top">
<item name="App installation" href="app.html"/>
<item name="Database and Pod" href="pod.html"/>
<item name="Configuration options (Pod)" href="config-report.html"/>
</menu>