Skip to content

Commit 86b0ab6

Browse files
ahornaceVladimir Kotal
authored andcommitted
Try to use mvnw in CI
1 parent 0c5fd07 commit 86b0ab6

File tree

9 files changed

+12
-19
lines changed

9 files changed

+12
-19
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ addons:
1414
name: OpenGrok/OpenGrok
1515
description: Build submitted via Travis CI
1616
branch_pattern: coverity_scan
17-
build_command: mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V compile
17+
build_command: ./mvnw -DskipTests=true -Dmaven.javadoc.skip=false -B -V compile
1818
sonarcloud:
1919
organization: opengrok
2020
token:
@@ -85,7 +85,7 @@ jobs:
8585
services:
8686
- docker
8787
before_install: dev/before_install
88-
before_script: mvn -DskipTests=true -Dmaven.javadoc.skip=true -B -V package
88+
before_script: ./mvnw -DskipTests=true -Dmaven.javadoc.skip=true -B -V package
8989
script: dev/docker.sh
9090
- stage: javadoc
9191
name: Upload javadocs to Github pages

appveyor.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
version: '{build}'
22
skip_tags: true
33
environment:
4-
MAVEN_VERSION: 3.6.0
54
matrix:
65
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
76
PYTHON: C:\Python35
87
install:
98
- ps: |
109
Add-Type -AssemblyName System.IO.Compression.FileSystem
11-
if (!(Test-Path -Path "C:\maven" )) {
12-
Write-Host "Downloading Maven $env:MAVEN_VERSION"
13-
(new-object System.Net.WebClient).DownloadFile("https://repo1.maven.org/maven2/org/apache/maven/apache-maven/$env:MAVEN_VERSION/apache-maven-$env:MAVEN_VERSION-bin.zip", 'C:\maven-bin.zip')
14-
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
15-
}
16-
- cmd: SET M2_HOME=C:\maven\apache-maven-%MAVEN_VERSION%
1710
# Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
18-
- cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PYTHON%;%PATH:C:\Ruby193\bin;=%;
19-
- cmd: mvn --version
11+
- cmd: SET PATH=%JAVA_HOME%\bin;%PYTHON%;%PATH:C:\Ruby193\bin;=%;
12+
- cmd: mvnw.cmd --version
2013
- cmd: java -version
2114
- cmd: python --version
2215
- cmd: hg --version
@@ -30,7 +23,6 @@ install:
3023
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\uctags-bin.zip", "C:\uctags")
3124
}
3225
build_script:
33-
- mvn -B -V -Dorg.opengrok.indexer.analysis.Ctags=c:\uctags\ctags.exe clean verify
26+
- mvnw.cmd -B -V -Dorg.opengrok.indexer.analysis.Ctags=c:\uctags\ctags.exe clean verify
3427
cache:
35-
- C:\maven\ -> appveyor.yml
3628
- C:\Users\appveyor\.m2\ -> pom.xml

dev/javadoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111

1212
echo -e "Publishing javadoc...\n"
1313

14-
mvn -DskipTests=true site
14+
./mvnw -DskipTests=true site
1515

1616
git config --global user.email "[email protected]"
1717
git config --global user.name "travis-ci"

dev/main

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ if [ "x$TRAVIS_REPO_SLUG" == "xoracle/opengrok" ]; then
2424
fi
2525

2626
ret=0
27-
mvn -B -V verify $extra_args || ret=1
27+
./mvnw -B -V verify $extra_args || ret=1
2828
node dev/parse.js || ret=1
2929
exit $ret

dev/pre-deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22

33
# Create distribution that will be uploaded to Github release.
4-
mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V package
4+
./mvnw -DskipTests=true -Dmaven.javadoc.skip=false -B -V package

dev/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if [[ $ver == $VERSION ]]; then
3636
fi
3737

3838
git pull --ff-only
39-
mvn versions:set -DgenerateBackupPoms=false "-DnewVersion=$VERSION"
39+
./mvnw versions:set -DgenerateBackupPoms=false "-DnewVersion=$VERSION"
4040
git commit pom.xml '**/pom.xml' -m "$VERSION"
4141
git push
4242
git tag "$VERSION"

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ docker run -d \
125125

126126
If you want to do your own development, you can build the image yourself:
127127

128-
mvn -DskipTests=true clean package && \
128+
./mvnw -DskipTests=true clean package && \
129129
docker build -t opengrok-dev .
130130

131131
Then run the container:

opengrok-tools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ python3 -m pip uninstall opengrok_tools
129129

130130
```bash
131131
python setup.py install test
132-
mvn test
132+
./mvnw test
133133
```
134134

135135
## Cleanup

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
308308
<failsOnError>true</failsOnError>
309309
<suppressionsLocation>/dev/checkstyle/suppressions.xml</suppressionsLocation>
310310
<headerLocation>/dev/checkstyle/fileheader.txt</headerLocation>
311+
<sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
311312
</configuration>
312313
<goals>
313314
<goal>check</goal>

0 commit comments

Comments
 (0)