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
GGCE
GGCE Server
Commits
6930e8fb
Commit
6930e8fb
authored
Dec 08, 2021
by
Matija Obreza
Browse files
[maven-release-plugin] prepare release v2021.14
parent
09fe45c1
Changes
7
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
6930e8fb
...
...
@@ -3,7 +3,7 @@ include:
-
template
:
'
Workflows/Branch-Pipelines.gitlab-ci.yml'
variables
:
VERSION
:
"
2021.1
1
"
VERSION
:
"
2021.1
4
"
DOCKER_HOST
:
"
genesys6.swarm.genesys-pgr.org"
DOCKER_VERSION
:
latest
# This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
...
...
commons/pom.xml
View file @
6930e8fb
...
...
@@ -3,7 +3,7 @@
<parent>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-java
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
<relativePath>
../parent/pom.xml
</relativePath>
</parent>
<artifactId>
ggce-commons
</artifactId>
...
...
@@ -15,7 +15,7 @@
<connection>
scm:https://gitlab.croptrust.org/grin-global/grin-global-server
</connection>
<developerConnection>
scm:git:git@gitlab.croptrust.org:grin-global/grin-global-server.git
</developerConnection>
<url>
git@gitlab.croptrust.org:grin-global/grin-global-server.git
</url>
<tag>
HEAD
</tag>
<tag>
v2021.14
</tag>
</scm>
<issueManagement>
...
...
coverage/pom.xml
View file @
6930e8fb
...
...
@@ -19,7 +19,7 @@
<parent>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-java
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
<relativePath>
../parent/pom.xml
</relativePath>
</parent>
<artifactId>
ggce-coverage
</artifactId>
...
...
@@ -74,12 +74,12 @@
<dependency>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-commons
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
</dependency>
<dependency>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-server
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
<type>
war
</type>
</dependency>
<!-- <dependency>
...
...
parent/pom.xml
View file @
6930e8fb
...
...
@@ -19,7 +19,7 @@
<parent>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
</parent>
<artifactId>
ggce-java
</artifactId>
<packaging>
pom
</packaging>
...
...
pom.xml
View file @
6930e8fb
...
...
@@ -18,7 +18,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
<packaging>
pom
</packaging>
<name>
GRIN-Global Community Edition
</name>
<description>
GG-CE
</description>
...
...
@@ -49,7 +49,7 @@
<connection>
scm:https://gitlab.croptrust.org/grin-global/grin-global-server
</connection>
<developerConnection>
scm:git:git@gitlab.croptrust.org:grin-global/grin-global-server.git
</developerConnection>
<url>
git@gitlab.croptrust.org:grin-global/grin-global-server.git
</url>
<tag>
HEAD
</tag>
<tag>
v2021.14
</tag>
</scm>
<issueManagement>
...
...
server/pom.xml
View file @
6930e8fb
...
...
@@ -3,7 +3,7 @@
<parent>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-java
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
<relativePath>
../parent/pom.xml
</relativePath>
</parent>
<artifactId>
ggce-server
</artifactId>
...
...
@@ -21,7 +21,7 @@
<connection>
https://gitlab.croptrust.org/grin-global/grin-global-server.git
</connection>
<developerConnection>
scm:git:git@gitlab.croptrust.org:grin-global/grin-global-server.git
</developerConnection>
<url>
git@gitlab.croptrust.org:grin-global/grin-global-server.git
</url>
<tag>
HEAD
</tag>
<tag>
v2021.14
</tag>
</scm>
<organization>
...
...
@@ -404,7 +404,7 @@
<dependency>
<groupId>
org.gringlobal
</groupId>
<artifactId>
ggce-commons
</artifactId>
<version>
2021.14
-SNAPSHOT
</version>
<version>
2021.14
</version>
</dependency>
<!-- Java 11 -->
<dependency>
...
...
server/src/test/java/org/gringlobal/test/api/v1/SourceDescObservationControllerTest.java
View file @
6930e8fb
...
...
@@ -444,7 +444,7 @@ public class SourceDescObservationControllerTest extends AbstractApiV1Test {
.
contentType
(
MediaType
.
APPLICATION_JSON
)
.
content
(
verboseMapper
.
writeValueAsString
(
sourceDescObservationFilter2
))
)
.
andDo
(
org
.
springframework
.
test
.
web
.
servlet
.
result
.
MockMvcResultHandlers
.
print
())
//
.andDo(org.springframework.test.web.servlet.result.MockMvcResultHandlers.print())
.
andExpect
(
status
().
isOk
())
.
andExpect
(
content
().
contentType
(
MediaType
.
APPLICATION_JSON
))
.
andExpect
(
jsonPath
(
"$"
,
not
(
nullValue
())))
...
...
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