Commit d4247b39 authored by Matija Obreza's avatar Matija Obreza
Browse files

[maven-release-plugin] prepare release v2021.7

parent 968df4a9
......@@ -3,7 +3,7 @@ include:
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
variables:
VERSION: "2021.6"
VERSION: "2021.7"
DOCKER_HOST: "genesys1.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.
......
......@@ -14,11 +14,11 @@ Reach out to https://gitlab.croptrust.org/grin-global/support for assistance.
# Running the server
**GG-CE Server** is available as a Docker image `dockerhub.croptrust.org/grin-global/grin-global-server:2021.6`.
**GG-CE Server** is available as a Docker image `dockerhub.croptrust.org/grin-global/grin-global-server:2021.7`.
This allows for easy management and updating to newer versions.
```bash
dockerhub.croptrust.org/grin-global/grin-global-server:2021.6
dockerhub.croptrust.org/grin-global/grin-global-server:2021.7
```
The **MSSQL** database is the prefered database engine for GRIN-Global.
......@@ -44,7 +44,7 @@ Start **GG-CE Server** as a Docker container:
```bash
# Pull latest image
docker image pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.6
docker image pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.7
# Create a data volume
docker volume create ggce-server-data
......@@ -62,7 +62,7 @@ docker run --rm --name 'ggce-server' \
-e "FRONTEND_URL=http://${YOUR_DOCKER_HOST_IP}:3000" \
-e "DATA_DIR=/data/gringlobal" \
-v ggce-server-data:/data/gringlobal \
dockerhub.croptrust.org/grin-global/grin-global-server:2021.6
dockerhub.croptrust.org/grin-global/grin-global-server:2021.7
```
**Note:** After hitting **Enter** You should immediately seeing log messages on the console. If not, then your command is not valid. Hit `Ctrl + C` and retry.
......@@ -79,7 +79,7 @@ and port **8081** (if you used the command above) at http://YOUR_DOCKER_HOST_IP:
To get the latest version of the image you need to pull the latest *edge* image and recreate your container:
```bash
docker pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.7-edge
docker pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.8-edge
docker stop ggce-server
docker remove ggce-server # if the container name is still defined
docker run... # as above
......@@ -87,12 +87,12 @@ docker run... # as above
## Next release
The preview of the next version is available as `dockerhub.croptrust.org/grin-global/grin-global-server:2021.7-edge` and
The preview of the next version is available as `dockerhub.croptrust.org/grin-global/grin-global-server:2021.8-edge` and
you should update your copy of the image before **restarting** your container:
```bash
# Preview of the next release
docker image pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.7-edge
docker image pull dockerhub.croptrust.org/grin-global/grin-global-server:2021.8-edge
```
**Note:** You can also just run the current *development* version using the `:edge` tag:
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-java</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</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.7</tag>
</scm>
<issueManagement>
......
......@@ -14,14 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-java</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>ggce-coverage</artifactId>
......@@ -44,7 +42,7 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration></configuration>
<configuration />
<executions>
<execution>
<id>report-aggregate</id>
......@@ -76,12 +74,12 @@
<dependency>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-commons</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</version>
</dependency>
<dependency>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-server</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</version>
<type>war</type>
</dependency>
<!-- <dependency>
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.gringlobal</groupId>
<artifactId>ggce</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</version>
</parent>
<artifactId>ggce-java</artifactId>
<packaging>pom</packaging>
......
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gringlobal</groupId>
<artifactId>ggce</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</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.7</tag>
</scm>
<issueManagement>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-java</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</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.7</tag>
</scm>
<organization>
......@@ -431,7 +431,7 @@
<dependency>
<groupId>org.gringlobal</groupId>
<artifactId>ggce-commons</artifactId>
<version>2021.7-SNAPSHOT</version>
<version>2021.7</version>
</dependency>
<!-- Java 11 -->
<dependency>
......
......@@ -30,7 +30,7 @@ import org.springframework.util.ReflectionUtils;
public abstract class CommunityAppSettings {
public static final String INVENTORYVIABILITY_REPLICATE = "INVENTORYVIABILITY_REPLICATE";
public static final AppSettingDef INVENTORYVIABILITY_REPLICATE_LABEL = new AppSettingDef(INVENTORYVIABILITY_REPLICATE, "LABEL",
public static final AppSettingDef INVENTORYVIABILITY_REPLICATE_LABEL = new AppSettingDef("LABEL", INVENTORYVIABILITY_REPLICATE,
"^XA\n" +
"^CF0,30\n" +
"^FO50,10^FDViability {{ inventoryViability.id }}#{{ replicate }}^FS\n" +
......
Supports Markdown
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