Skip to content

Commit d762562

Browse files
committed
switch to setup-java@v2
add release-from-tag maven wrapper with maven 3.8.4
1 parent b1adc34 commit d762562

8 files changed

Lines changed: 77 additions & 158 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ jobs:
2020
strategy:
2121
matrix:
2222
java: [8, 11, 17]
23-
os: [ ubuntu-latest ]
23+
os: [ubuntu-latest]
24+
distribution: [temurin]
2425
include:
2526
- java: 11
2627
os: windows-latest
28+
distribution: temurin
2729
- java: 11
2830
os: macos-latest
31+
distribution: temurin
2932

3033
steps:
3134
# Check out Git repository
@@ -34,18 +37,11 @@ jobs:
3437

3538
# Set up environment with Java and Maven
3639
- name: Setup JDK
37-
uses: actions/setup-java@v1
40+
uses: actions/setup-java@v2
3841
with:
42+
distribution: ${{ matrix.distribution }}
3943
java-version: ${{ matrix.java }}
40-
41-
# Set up dependency cache
42-
- name: Cache local Maven repository
43-
uses: actions/cache@v2
44-
with:
45-
path: ~/.m2/repository
46-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
47-
restore-keys: |
48-
${{ runner.os }}-maven-
44+
cache: 'maven'
4945

5046
# Build & install (required for 2nd build: example)
5147
- name: Build and verify

.github/workflows/maven-deploy.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,11 @@ jobs:
2626
2727
# Set up environment with Java and Maven
2828
- name: Setup JDK
29-
uses: actions/setup-java@v1
29+
uses: actions/setup-java@v2
3030
with:
31-
java-version: 1.8
32-
33-
# Set up dependency cache
34-
- name: Cache local Maven repository
35-
uses: actions/cache@v2
36-
with:
37-
path: ~/.m2/repository
38-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
39-
restore-keys: |
40-
${{ runner.os }}-maven-
31+
distribution: temurin
32+
java-version: 8
33+
cache: 'maven'
4134

4235
# Build, deploy to ossrh, generate and stage site
4336
- name: Build, verify, deploy, generate site
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Release from Tag
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
workflow_dispatch:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- uses: actions/checkout@v2
16+
- uses: ncipollo/release-action@v1
17+
with:
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/aem/changes-report.html'
19+
token: ${{ secrets.GITHUB_TOKEN }}

.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 0 additions & 117 deletions
This file was deleted.

.mvn/wrapper/maven-wrapper.jar

7.83 KB
Binary file not shown.
Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

mvnw

Lines changed: 12 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mvnw.cmd

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)