Skip to content

Commit

Permalink
STNG-166 - Add Maven Wrapper to project (#195)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkosternl authored Oct 14, 2024
1 parent a026676 commit 1a4c791
Show file tree
Hide file tree
Showing 12 changed files with 446 additions and 529 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-to-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Build Conformance-Gateway
run: |
mvn package -B -V -DskipTests
./mvnw package -B -V -DskipTests
# No need to run tests, as they are already run in the PR workflow

- name: Build Web UI
Expand Down Expand Up @@ -76,4 +76,4 @@ jobs:
TEST_LOGIN_PASSWORD: ${{ secrets.AWS_DEV_LOGIN_PASSWORD }}
TEST_BASE_URL: ${{ secrets.AWS_DEV_WEB_URL }}
run: |
mvn -B test -Pintegration
./mvnw -B test -Pintegration
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Build and test Conformance-Gateway
run: |
mvn package -B -V --fail-at-end
./mvnw package -B -V --fail-at-end
- name: Set Sonar settings for PR build
if: ${{ (github.event_name == 'pull_request') }}
Expand All @@ -56,5 +56,5 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # SonarCloud
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # SonarCloud
run: |
mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -B ${{env.SONAR_PARAMS}}
./mvnw org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -B ${{env.SONAR_PARAMS}}
4 changes: 2 additions & 2 deletions .github/workflows/webui-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Build Conformance-Gateway
run: |
mvn test-compile -B -V -DskipTests
./mvnw test-compile -B -V -DskipTests
# No need to run tests, as they are already run in the PR workflow

- name: Start Web UI
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Test Conformance-Gateway
run: |
mvn test -B -Pwebui
./mvnw test -B -Pwebui
- name: Stop Web UI
run: |
Expand Down
19 changes: 19 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM maven:3.9.6-eclipse-temurin-21-alpine as builder
FROM eclipse-temurin:21-jdk-alpine AS builder

WORKDIR /build

COPY . .

RUN mvn install -DskipTests -U -B
RUN ./mvnw package spring-boot:repackage -DskipTests -V -B

FROM eclipse-temurin:21
FROM eclipse-temurin:21-jdk-alpine

EXPOSE 8080

Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ Adopters use an AWS deployment of the Conformance Framework managed by DCSA.
### Java
1. Build the project using Maven:
```sh
mvn clean package -DskipTests
./mvnw clean package -DskipTests
```
2. Run the application:
```sh
mvn -pl spring-boot -am spring-boot:run
./mvnw -pl spring-boot -am spring-boot:run
```

### Docker Compose
Instead of building the project and running it locally, you can use Docker Compose to run the application.
Just run `docker compose up` in the root directory of the project. This will build the project and run the application.

### Angular and NodeJS Web UI
1. Navigate to the WebUI project directory:
```sh
Expand Down
7 changes: 2 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
version: '3.5'

services:
conformance-gateway:
container_name: conformance-gateway
build:
.
build: .
ports:
- 8080:8080
- "8080:8080"
Loading

0 comments on commit 1a4c791

Please sign in to comment.