Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Amphibian
Commits
53457572
Commit
53457572
authored
Jan 25, 2021
by
Matija Obreza
Browse files
Merge branch '2-upgrade-to-j11' into 'master'
Resolve "Upgrade to J11" Closes #2 See merge request genesys-pgr/amphibian!5
parents
51c2b026
0323ee9b
Changes
9
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
53457572
...
...
@@ -2,3 +2,5 @@
target/
bin/
.flattened-pom.xml
.project
.classpath
.gitlab-ci.yml
View file @
53457572
...
...
@@ -21,7 +21,7 @@ stages:
-
deploy
.package_template
:
&maven_package
image
:
maven:3-jdk-
8
image
:
maven:3-
open
jdk-
11
script
:
-
pushd amphibian-server
-
mvn package -B -U
...
...
@@ -87,7 +87,7 @@ dockerize amphibian:
publish snapshot artifacts
:
stage
:
deploy
image
:
maven:3-jdk-
8
image
:
maven:3-
open
jdk-
11
before_script
:
-
echo "${GPG_KEY_SECRET}" | gpg --batch --import
-
gpg --list-keys
...
...
@@ -99,7 +99,7 @@ publish snapshot artifacts:
publish artifacts on central
:
stage
:
deploy
image
:
maven:3-jdk-
8
image
:
maven:3-
open
jdk-
11
before_script
:
-
echo "${GPG_KEY_SECRET}" | gpg --batch --import
-
gpg --list-keys
...
...
amphibian-client/amphibian.yaml
View file @
53457572
swagger
:
'
2.0'
info
:
description
:
This is the description of the Amphibian APIs
version
:
1
.0-SNAPSHOT
version
:
3
.0-SNAPSHOT
title
:
Amphibian API
termsOfService
:
'
https://www.genesys-pgr.org/content/terms-and-conditions'
contact
:
...
...
amphibian-client/parent/pom.xml
View file @
53457572
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
amphibian-client
</artifactId>
<version>
1
.0-SNAPSHOT
</version>
<version>
3
.0-SNAPSHOT
</version>
</parent>
<artifactId>
amphibian-client-parent
</artifactId>
<packaging>
pom
</packaging>
...
...
amphibian-client/pom.xml
View file @
53457572
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
amphibian
</artifactId>
<version>
1
.0-SNAPSHOT
</version>
<version>
3
.0-SNAPSHOT
</version>
</parent>
<artifactId>
amphibian-client
</artifactId>
<packaging>
pom
</packaging>
...
...
@@ -12,20 +12,19 @@
<description>
The amphibian approach to data management
</description>
<properties>
<slf4j.version>
1.7.
25
</slf4j.version>
<slf4j.version>
1.7.
30
</slf4j.version>
<skip.deploy.artifact>
true
</skip.deploy.artifact>
<skipTests>
true
</skipTests>
<java.version>
1
.8
</java.version>
<java.version>
1
1
</java.version>
<maven.compiler.source>
${java.version}
</maven.compiler.source>
<maven.compiler.target>
${java.version}
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<swagger-core.version>
1.5.
15
</swagger-core.version>
<swagger-codegen.version>
2.4.
5
</swagger-codegen.version>
<swagger-core.version>
1.5.
24
</swagger-core.version>
<swagger-codegen.version>
2.4.
18
</swagger-codegen.version>
<junit-version>
4.12
</junit-version>
<jodatime-version>
2.9.3
</jodatime-version>
<junit-version>
4.13.1
</junit-version>
<generated-sources-path>
${project.build.directory}/generated-sources/swagger
</generated-sources-path>
<generated-sources-java-path>
src/main/java
</generated-sources-java-path>
...
...
amphibian-client/resttemplate/pom.xml
View file @
53457572
...
...
@@ -2,7 +2,7 @@
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
amphibian-client-parent
</artifactId>
<version>
1
.0-SNAPSHOT
</version>
<version>
3
.0-SNAPSHOT
</version>
<relativePath>
../parent
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
@@ -15,12 +15,22 @@
<swagger-codegen.language>
java
</swagger-codegen.language>
<swagger-codegen.library>
resttemplate
</swagger-codegen.library>
<org.slf4j.version>
1.7.
25
</org.slf4j.version>
<spring-web-version>
4.3.9
.RELEASE
</spring-web-version>
<jackson-version>
2.
8.9
</jackson-version>
<org.slf4j.version>
1.7.
30
</org.slf4j.version>
<spring-web-version>
5.2.12
.RELEASE
</spring-web-version>
<jackson-version>
2.
11.4
</jackson-version>
</properties>
<dependencies>
<dependency>
<groupId>
javax.annotation
</groupId>
<artifactId>
javax.annotation-api
</artifactId>
<version>
1.3.2
</version>
</dependency>
<dependency>
<groupId>
com.sun.activation
</groupId>
<artifactId>
javax.activation
</artifactId>
<version>
1.2.0
</version>
</dependency>
<dependency>
<groupId>
io.swagger
</groupId>
<artifactId>
swagger-annotations
</artifactId>
...
...
@@ -33,6 +43,11 @@
<artifactId>
spring-web
</artifactId>
<version>
${spring-web-version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<version>
${spring-web-version}
</version>
</dependency>
<!-- JSON processing: jackson -->
<dependency>
...
...
@@ -78,7 +93,7 @@
<dependency>
<groupId>
org.hamcrest
</groupId>
<artifactId>
hamcrest-library
</artifactId>
<version>
1.3
</version>
<version>
2.2
</version>
<scope>
test
</scope>
</dependency>
...
...
amphibian-server/docker/Dockerfile
View file @
53457572
FROM
jetty:9.4.
5
FROM
jetty:9.4.
35-jre11
LABEL
maintainer "Matija Obreza <matija.obreza@croptrust.org>"
...
...
amphibian-server/pom.xml
View file @
53457572
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
amphibian
</artifactId>
<version>
1
.0-SNAPSHOT
</version>
<version>
3
.0-SNAPSHOT
</version>
</parent>
<artifactId>
amphibian-server
</artifactId>
<packaging>
war
</packaging>
...
...
@@ -12,9 +12,9 @@
<description>
The amphibian approach to data management
</description>
<properties>
<slf4j.version>
1.7.
25
</slf4j.version>
<jackson.version>
2.
9.8
</jackson.version>
<spring.framework.version>
5.
1.7
.RELEASE
</spring.framework.version>
<slf4j.version>
1.7.
30
</slf4j.version>
<jackson.version>
2.
11.4
</jackson.version>
<spring.framework.version>
5.
2.12
.RELEASE
</spring.framework.version>
</properties>
<build>
...
...
@@ -32,7 +32,7 @@
<plugin>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-maven-plugin
</artifactId>
<version>
9.4.
18
.v20
190429
</version>
<version>
9.4.
35
.v20
201120
</version>
<configuration>
<scanIntervalSeconds>
0
</scanIntervalSeconds>
<reload>
manual
</reload>
...
...
@@ -72,6 +72,16 @@
</build>
<dependencies>
<dependency>
<groupId>
javax.annotation
</groupId>
<artifactId>
javax.annotation-api
</artifactId>
<version>
1.3.2
</version>
</dependency>
<dependency>
<groupId>
com.sun.activation
</groupId>
<artifactId>
javax.activation
</artifactId>
<version>
1.2.0
</version>
</dependency>
<dependency>
<groupId>
org.slf4j
</groupId>
<artifactId>
slf4j-api
</artifactId>
...
...
@@ -111,7 +121,7 @@
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<version>
3.1.0
</version>
<version>
4.0.1
</version>
<scope>
provided
</scope>
</dependency>
...
...
@@ -130,7 +140,7 @@
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-lang3
</artifactId>
<version>
3.
8.
1
</version>
<version>
3.
1
1
</version>
</dependency>
<dependency>
...
...
@@ -148,7 +158,7 @@
<dependency>
<groupId>
org.springframework.data
</groupId>
<artifactId>
spring-data-mongodb
</artifactId>
<version>
2.1.
8
.RELEASE
</version>
<version>
2.1.
21
.RELEASE
</version>
</dependency>
<dependency>
...
...
pom.xml
View file @
53457572
...
...
@@ -3,7 +3,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
org.genesys-pgr
</groupId>
<artifactId>
amphibian
</artifactId>
<version>
1
.0-SNAPSHOT
</version>
<version>
3
.0-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<name>
All things Amphibian
</name>
<description>
The amphibian approach to data management
</description>
...
...
@@ -38,8 +38,8 @@
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<jdk.target>
1
.8
</jdk.target>
<jdk.source>
1
.8
</jdk.source>
<jdk.target>
1
1
</jdk.target>
<jdk.source>
1
1
</jdk.source>
<show.deprecations>
true
</show.deprecations>
<skip.deploy.artifact>
true
</skip.deploy.artifact>
<skipTests>
true
</skipTests>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment