Skip to content

Commit 18a7005

Browse files
vorburgervorburger
committed
Merge branch 'main' into parent-pom
* main: chore: Use fixed Maven version (via Wrapper) in GitHub Validation Workflow (CI) chore: Add Maven ./mvnw wrapper to fix version and avoid having to separately download it
2 parents 868fff8 + 4a4007a commit 18a7005

5 files changed

Lines changed: 432 additions & 5 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mvnw.cmd text eol=crlf

‎.github/workflows/validation.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
branches:
77
- main
88
paths:
9-
- 'core/**'
10-
- 'dev/**'
9+
- "core/**"
10+
- "dev/**"
1111
# Add other module paths here
1212

1313
jobs:
1414
build-modules:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
java-version: ['17', '21']
18+
java-version: ["17", "21"]
1919

2020
steps:
2121
- name: Checkout code
@@ -37,5 +37,4 @@ jobs:
3737
${{ runner.os }}-maven-
3838
3939
- name: Compile and test (all) modules with Java ${{ matrix.java-version }}
40-
# TODO After https://github.com/google/adk-java/pull/151: run: ./mvnw clean test
41-
run: mvn clean test
40+
run: ./mvnw clean test

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-3/apache-maven-4.0.0-rc-3-bin.zip

‎mvnw‎

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

0 commit comments

Comments
 (0)