Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,26 @@ updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: weekly
interval: monthly
allow:
- dependency-type: all
groups:
go:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
interval: monthly
groups:
github-actions:
patterns:
- "*"
- package-ecosystem: maven
directory: "/"
schedule:
interval: weekly
interval: monthly
groups:
maven-dependencies:
patterns:
- "*"
7 changes: 1 addition & 6 deletions .github/workflows/release_on_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ jobs:
distribution: 'temurin'
java-version: '21'

- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.9

- name: Setup maven
run: |
echo -e "$MAVEN_GPG_SIGN_KEY" | gpg --import --batch -
Expand Down Expand Up @@ -67,7 +62,7 @@ jobs:

- name: Deploy on maven central
run: |
mvn -q clean deploy -Dgpg.passphrase=$passphrase
./mvnw -q clean deploy -Dgpg.passphrase=$passphrase


- name: Update metadata in gauge-repository
Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,8 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}

- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.9

- name: Run test
run: mvn -q clean test
run: ./mvnw -q clean test

functional_tests:
name: FTs - java ${{ matrix.java_version }} ${{ matrix.os }}
Expand All @@ -59,11 +54,6 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}

- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.9

- uses: getgauge/setup-gauge@master
with:
gauge-version: master
Expand All @@ -75,7 +65,7 @@ jobs:

- name: Install Gauge Java maven package locally
run: |
mvn -q install -DskipTests -"Dgpg.skip" -D"maven.javadoc.skip=true"
./mvnw -q install -DskipTests -"Dgpg.skip" -D"maven.javadoc.skip=true"

- name: Clone gauge-tests
run: |
Expand Down Expand Up @@ -123,11 +113,6 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}

- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.9

- uses: getgauge/setup-gauge@master
with:
gauge-version: master
Expand Down
20 changes: 20 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 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
distributionSha256Sum=4ec3f26fb1a692473aea0235c300bd20f0f9fe741947c82c1234cefd76ac3a3c
6 changes: 3 additions & 3 deletions build/make.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func main() {
}

func runMavenTests() {
runCommand("mvn", "test")
runCommand("./mvnw", "test")
}

func compileGaugeJava() {
Expand Down Expand Up @@ -300,9 +300,9 @@ func buildGaugeJavaJar() {
os.RemoveAll(targetDir)
os.RemoveAll(libsDir)
if *profile != "" {
runCommand("mvn", "-q", "package", "-P", *profile)
runCommand("./mvnw", "-q", "package", "-P", *profile)
} else {
runCommand("mvn", "-q", "package")
runCommand("./mvnw", "-q", "package")
}
}

Expand Down
2 changes: 1 addition & 1 deletion genproto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ for filename in gauge-proto/*.proto; do
cp "$newName" "$filename"
rm "$newName"
done
mvn protobuf:compile-custom protobuf:compile
./mvnw protobuf:compile-custom protobuf:compile


cp target/generated-sources/protobuf/java/gauge/messages/Messages.java src/main/java/gauge/messages
Expand Down
Loading
Loading