Skip to content

Commit ddc3e81

Browse files
committed
[Build] Use consistent naming for configuration files
* Files used to configure maven plugins are put into a `.<plugin-name>` folder. * Files used by travis are prefixed with `.travis` (travis does not support folders)
1 parent 868a623 commit ddc3e81

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed
File renamed without changes.

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ cache:
66
- "$HOME/.m2"
77

88
install:
9-
- mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true -B -V --toolchains .m2/travis-ci-toolchains.xml
9+
- mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true -B -V --toolchains .travis-toolchains.xml
1010

1111
jobs:
1212
include:
1313
# 1.1 Semver check
1414
- stage: test
1515
jdk: openjdk11
16-
script: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true --toolchains .m2/travis-ci-toolchains.xml
16+
script: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true --toolchains .travis-toolchains.xml
1717
env: CHECK_SEMANTIC_VERSION=true
1818

1919
# 1.2 Tests
2020
- stage: test
2121
jdk: openjdk11
22-
script: mvn verify -P-spotless-apply --toolchains .m2/travis-ci-toolchains.xml
22+
script: mvn verify -P-spotless-apply --toolchains .travis-toolchains.xml
2323
env: VERIFY=true
2424

2525
# 1.3 Coverage
2626
- stage: test
2727
jdk: openjdk11
28-
script: mvn jacoco:prepare-agent verify jacoco:report coveralls:report --toolchains .m2/travis-ci-toolchains.xml
28+
script: mvn jacoco:prepare-agent verify jacoco:report coveralls:report --toolchains .travis-toolchains.xml
2929
env: COVERAGE=true
3030

3131
# 1.4 Javadoc
3232
- jdk: openjdk11
3333
env: JAVADOC=true
3434
script:
35-
- mvn javadoc:jar --toolchains .m2/travis-ci-toolchains.xml
35+
- mvn javadoc:jar --toolchains .travis-toolchains.xml
3636

3737
branches:
3838
only:
File renamed without changes.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ update-compatibility:
2828

2929
update-dependency-versions:
3030
mvn versions:force-releases
31-
mvn versions:update-properties -DallowMajorUpdates=false -Dmaven.version.rules="file://`pwd`/.m2/maven-version-rules.xml"
31+
mvn versions:update-properties -DallowMajorUpdates=false -Dmaven.version.rules="file://`pwd`/.versions/rules.xml"
3232
.PHONY: update-dependency-versions
3333

3434
update-major-dependency-versions:
3535
mvn versions:force-releases
36-
mvn versions:update-properties -DallowMajorUpdates=true -Dmaven.version.rules="file://`pwd`/.m2/maven-version-rules.xml"
36+
mvn versions:update-properties -DallowMajorUpdates=true -Dmaven.version.rules="file://`pwd`/.versions/rules.xml"
3737
.PHONY: update-major-dependency-versions
3838

3939
update-changelog:

0 commit comments

Comments
 (0)