Skip to content

Commit

Permalink
RELEASE 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
loreV committed Jul 10, 2022
1 parent 452651a commit 4522b0d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM openjdk:11

WORKDIR ./home

COPY ./backend/target/backend-2.0-SNAPSHOT.jar .
COPY ./backend/target/backend-1.4.jar .
COPY ./docker/application.properties .

RUN mkdir -p ./deployment ./tmp ./logs

CMD ["java", "-jar", "./backend-2.0-SNAPSHOT.jar", "--spring.config.location=file:///home/application.properties"]
CMD ["java", "-jar", "./backend-1.4.jar", "--spring.config.location=file:///home/application.properties"]

EXPOSE 8990
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Currently, the library supports accessibility-notifications, user reports, maint
After cloning the repo, simply run `mvn install -f root/pom.xml`.

### Deployment Build
To incude all dependencies in a portable uber-jar, run `mvn install -P package`.
To include all dependencies in a portable uber-jar, run `mvn install -f root/pom.xml -P package`.

### Test
There are two main types of tests written to address the S&C QA: unit test and integration test.
Expand Down
8 changes: 4 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.sec</groupId>
<artifactId>root</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
<relativePath>../root</relativePath>
</parent>

<artifactId>backend</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>

<properties>
<java.version>1.8</java.version>
Expand All @@ -27,12 +27,12 @@
<dependency>
<groupId>org.sec</groupId>
<artifactId>rest</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.sec</groupId>
<artifactId>data</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
docker build -t 'sec/backend-2.0-SNAPSHOT' .
docker build -t 'sec/backend-1.4' .
2 changes: 1 addition & 1 deletion docker/docker-compose.cluster.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.0'
services:
sec_backend:
image: "sec/backend-2.0-SNAPSHOT"
image: "sec/backend-1.4"
ports:
- "8990:8990"
restart: always
Expand Down
2 changes: 1 addition & 1 deletion root/data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.sec</groupId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions root/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>org.sec</groupId>
<artifactId>root</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
<name>Sentieri e Cartografia</name>
<description>Sentieri e Cartografia root pom</description>
<packaging>pom</packaging>
Expand Down Expand Up @@ -89,6 +89,6 @@
<log4j2.version>2.15.0</log4j2.version>
<spring-boot-mail.version>2.7.0</spring-boot-mail.version>
<org.mapstruct.version>1.5.1.Final</org.mapstruct.version>
<lombok.version>1.18.10</lombok.version>
<lombok.version>1.18.20</lombok.version>
</properties>
</project>
4 changes: 2 additions & 2 deletions root/rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.sec</groupId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>org.sec</groupId>
<artifactId>data</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down

0 comments on commit 4522b0d

Please sign in to comment.