Skip to content

Commit

Permalink
[Build] Use consistent naming for configuration files
Browse files Browse the repository at this point in the history
 * 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)
  • Loading branch information
mpkorstanje committed Jul 7, 2020
1 parent 868a623 commit ddc3e81
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
File renamed without changes.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ cache:
- "$HOME/.m2"

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

jobs:
include:
# 1.1 Semver check
- stage: test
jdk: openjdk11
script: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true --toolchains .m2/travis-ci-toolchains.xml
script: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true --toolchains .travis-toolchains.xml
env: CHECK_SEMANTIC_VERSION=true

# 1.2 Tests
- stage: test
jdk: openjdk11
script: mvn verify -P-spotless-apply --toolchains .m2/travis-ci-toolchains.xml
script: mvn verify -P-spotless-apply --toolchains .travis-toolchains.xml
env: VERIFY=true

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

# 1.4 Javadoc
- jdk: openjdk11
env: JAVADOC=true
script:
- mvn javadoc:jar --toolchains .m2/travis-ci-toolchains.xml
- mvn javadoc:jar --toolchains .travis-toolchains.xml

branches:
only:
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ update-compatibility:

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

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

update-changelog:
Expand Down

0 comments on commit ddc3e81

Please sign in to comment.