Skip to content

Commit

Permalink
Maven Wrapper with working version 3.8.8 (#923)
Browse files Browse the repository at this point in the history
* Maven Wrapper with working version 3.8.8

* Ensure build pipeline uses mvnw

* Note on using mvnw
  • Loading branch information
brunoborges committed May 24, 2023
1 parent cdd868d commit 43873c0
Show file tree
Hide file tree
Showing 6 changed files with 541 additions and 18 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/pr_build_jdk11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-windup-build-${{ github.sha }}
- name: Build Windup on JDK 11
run: mvn -B clean install -DskipTests
run: ./mvnw -B clean install -DskipTests

windup-rulesets-build:
runs-on: ubuntu-latest
Expand All @@ -53,7 +53,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-windup-build-${{ github.sha }}
- name: Build Windup Rulesets
run: mvn -B clean install -DskipTests
run: ./mvnw -B clean install -DskipTests

windup-cli-build:
runs-on: ubuntu-latest
Expand All @@ -70,10 +70,6 @@ jobs:
java-version: '11'
distribution: 'temurin'
java-package: jdk
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
maven-version: 3.8.7
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand All @@ -82,7 +78,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-windup-rulesets-build-${{ github.sha }}
- name: Build on JDK 11
run: mvn -B clean install -DskipTests
run: ./mvnw -B clean install -DskipTests

windup-web-build:
runs-on: ubuntu-latest
Expand All @@ -97,10 +93,6 @@ jobs:
java-version: '11'
distribution: 'temurin'
java-package: jdk
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
maven-version: 3.8.7
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand All @@ -109,4 +101,4 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-windup-cli-build-${{ github.sha }}
- name: Build
run: mvn clean install -U -s settings.xml
run: ./mvnw clean install -U -s settings.xml
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Requirements
-------------

1. JDK 8
2. Maven 3.2.5+ (3.3.x recommended)
2. Maven 3.8.8 (provided by Maven Wrapper)

Environment setup
-----------------
Expand Down Expand Up @@ -93,7 +93,7 @@ windup-maven-plugin \
git fetch upstream
git branch --set-upstream-to=upstream/master
git pull
mvn clean install -DskipTests
./mvnw clean install -DskipTests
done
cd $BASEDIR
Expand Down Expand Up @@ -124,7 +124,7 @@ windup-web-distribution \
git fetch upstream
git branch --set-upstream-to=upstream/master
git pull
mvn clean install -DskipTests
./mvnw clean install -DskipTests
done
cd $BASEDIR
```
Expand All @@ -133,7 +133,7 @@ cd $BASEDIR
Running the webapp
------------------

- Build: `mvn clean install -DskipTests`
- Build: `./mvnw clean install -DskipTests`
- Wildfly/EAP 7 must be run with `-c standalone-full.xml` as Messaging subsystem is required.
- Execute the CLI script at: scripts/eap-setup.cli on Wildfly/EAP 7

Expand Down Expand Up @@ -194,11 +194,11 @@ It resolves JAX-RS annotated resources and Java annotated POJOs into OpenAPI sch

To get the OpenAPI specifications file, you can compile this project enabling the `swagger` profile:

- from `windup-web/services` folder execute the command `mvn clean compile -Pswagger`
- from `windup-web/services` folder execute the command `../mvnw clean compile -Pswagger`
- in `windup-web/services/target/swagger` folder you'll find `openapi.json` and `openapi.yaml` files with the OpenAPI specifications

If you want to create a MTA Web application that provides the `openapi.json` and `openapi.yaml` files at runtime:

- build this project enabling the `swagger` profile, executing -from `windup-web` folder- the `mvn -DskipTests clean install -Pswagger` command
- build this project enabling the `swagger` profile, executing -from `windup-web` folder- the `../mvnw -DskipTests clean install -Pswagger` command
- the files will be available at <http://localhost:8080/mta-web/api/openapi.json> and <http://localhost:8080/mta-web/api/openapi.yaml>

Loading

0 comments on commit 43873c0

Please sign in to comment.