Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7e54a4a

Browse files
matrivmergify[bot]
authored andcommitted
Change Gradle leftovers to Maven
1 parent f999a49 commit 7e54a4a

13 files changed

Lines changed: 21 additions & 45 deletions

File tree

.editorconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,5 @@ indent_style = space
1414
indent_size = 4
1515
trim_trailing_whitespace = true
1616

17-
[*.gradle]
18-
charset = utf-8
19-
indent_style = space
20-
indent_size = 4
21-
2217
[*.rst]
2318
max_line_length = 80

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*.sh text eol=lf
2-
gradlew text eol=lf
2+
mvnw text eol=lf
33
blackbox/bin/** text eol=lf
4-
app/src/main/dist/bin/crate eol=lf
4+
app/src/main/dist/bin/crate eol=lf

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- run: git checkout HEAD^2
2727
if: ${{ github.event_name == 'pull_request' }}
2828

29-
- name: Setup Gradle Java
29+
- name: Setup Maven Java
3030
uses: actions/setup-java@v2
3131
with:
3232
java-version: 17

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- '**.java'
77
- 'pom.xml'
88
- '**/pom.xml'
9-
- 'gradle/version.properties'
109
push:
1110
branches:
1211
- master
@@ -24,7 +23,7 @@ jobs:
2423
os: [ubuntu-latest]
2524
steps:
2625
- uses: actions/checkout@v4
27-
- name: Setup Gradle Java
26+
- name: Setup Maven Java
2827
uses: actions/setup-java@v3
2928
with:
3029
java-version: "21"
@@ -42,7 +41,7 @@ jobs:
4241
runs-on: ubuntu-latest
4342
steps:
4443
- uses: actions/checkout@v4
45-
- name: Setup Gradle Java
44+
- name: Setup Maven Java
4645
uses: actions/setup-java@v3
4746
with:
4847
java-version: "17"
@@ -57,7 +56,7 @@ jobs:
5756
runs-on: ubuntu-latest
5857
steps:
5958
- uses: actions/checkout@v4
60-
- name: Setup Gradle Java
59+
- name: Setup Maven Java
6160
uses: actions/setup-java@v3
6261
with:
6362
java-version: 17

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
os: [windows-latest]
1616
steps:
1717
- uses: actions/checkout@v4
18-
- name: Setup Gradle Java
18+
- name: Setup Maven Java
1919
uses: actions/setup-java@v3
2020
with:
2121
java-version: "17"

.github/workflows/skip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
pull_request:
77
paths-ignore:
88
- '**.java'
9-
- '**.gradle'
10-
- 'gradle/version.properties'
9+
- 'pom.xml'
10+
- '**/pom.xml'
1111

1212
jobs:
1313
test:

.idea/codeStyles/Project.xml

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

CONTRIBUTING.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ Once that is complete, you should:
7979
- Be descriptive in your PR and commit messages. What is it for? Why is it
8080
needed? And so on.
8181

82-
- If applicable, run ``./gradlew test itest`` to check that all tests pass.
82+
- If applicable, run ``./mvnw test && ./blackbox/bin/test`` to check that all
83+
tests pass.
8384

8485
- Squash related commits.
8586

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pipeline {
22
agent any
33
tools {
4-
// used to run gradle
4+
// used to run maven
55
jdk 'jdk11'
66
}
77
options {

blackbox/testutils/paths.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def crate_path():
4343
tarball = next(app_build.glob("crate-*.tar.gz"), None)
4444
if not tarball:
4545
cpus = multiprocessing.cpu_count()
46-
gradlew = root / "mvnw"
47-
run([str(gradlew), "-T", str(cpus), "package", "-DskipTests=true"], cwd=root)
46+
mvnw = root / "mvnw"
47+
run([str(mvnw), "-T", str(cpus), "package", "-DskipTests=true"], cwd=root)
4848
tarball = next(app_build.glob("crate-*.tar.gz"), None)
4949
uri = tarball.as_uri()
5050
return get_crate(uri)

0 commit comments

Comments
 (0)