From a4ba62b213057b0ccb4599209f49b0bdf6f2f6e3 Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Sat, 17 Apr 2021 17:52:48 -0400 Subject: [PATCH 1/2] Fix build issues after latest Travis changes --- .travis.yml | 16 +++++----------- pom.xml | 2 +- settings.xml | 30 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 settings.xml diff --git a/.travis.yml b/.travis.yml index 8501c62a9..3f8b2651d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +image: maven:latest osx_image: xcode9.3 sudo: false @@ -25,24 +26,17 @@ before_install: - | if [ "${TRAVIS_OS_NAME}" == windows ]; then choco install -y zulu8 - choco install -y maven - export PATH=/C/Program\ Files/Zulu/zulu-8/bin:/C/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:$PATH + choco install -y maven --version 3.8.1 + export PATH=/C/Program\ Files/Zulu/zulu-8/bin:/C/ProgramData/chocolatey/lib/maven/apache-maven-3.8.1/bin:$PATH echo "PATH=${PATH}" fi install: /usr/bin/env true -script: mvn clean install -V -B -Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - -before_cache: - - | - find $HOME/.m2/repository/ -name *SNAPSHOT | xargs rm -Rf - if [ "${TRAVIS_OS_NAME}" == osx ]; then - brew cleanup - fi +script: mvn clean install -V -B -s settings.xml -Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn cache: - timeout: 1000 + # timeout: 5000 directories: - "$HOME/.m2" - $HOME/AppData/Local/Temp/chocolatey diff --git a/pom.xml b/pom.xml index 94c1435e8..5db476b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-site-plugin - 3.9.0 + 3.9.1 attach-descriptor diff --git a/settings.xml b/settings.xml new file mode 100644 index 000000000..3474e723b --- /dev/null +++ b/settings.xml @@ -0,0 +1,30 @@ + + + + + + maven-central + Maven Central + https://repo1.maven.org/maven2 + central + + + From e94a9f4e5d8a622a6abd0e566fa0ad54cee85cb8 Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Sat, 17 Apr 2021 18:15:05 -0400 Subject: [PATCH 2/2] Updated liense headers --- license-maven-plugin-git/pom.xml | 2 +- .../maven/plugin/license/git/CopyrightAuthorProvider.java | 2 +- .../maven/plugin/license/git/CopyrightRangeProvider.java | 2 +- .../java/com/mycila/maven/plugin/license/git/GitLookup.java | 2 +- .../com/mycila/maven/plugin/license/git/GitPathResolver.java | 2 +- .../maven/plugin/license/git/GitPropertiesProvider.java | 2 +- .../maven/plugin/license/git/CopyrightAuthorProviderTest.java | 2 +- .../maven/plugin/license/git/CopyrightRangeProviderTest.java | 2 +- .../com/mycila/maven/plugin/license/git/GitLookupTest.java | 2 +- .../mycila/maven/plugin/license/git/GitPathResolverTest.java | 2 +- license-maven-plugin-svn/pom.xml | 2 +- .../maven/plugin/license/svn/SVNPropertiesProvider.java | 2 +- license-maven-plugin/pom.xml | 2 +- .../com/mycila/maven/plugin/license/AbstractLicenseMojo.java | 2 +- .../main/java/com/mycila/maven/plugin/license/Callback.java | 2 +- .../java/com/mycila/maven/plugin/license/Credentials.java | 2 +- .../main/java/com/mycila/maven/plugin/license/Default.java | 2 +- .../java/com/mycila/maven/plugin/license/HeaderSection.java | 2 +- .../com/mycila/maven/plugin/license/LicenseCheckMojo.java | 2 +- .../com/mycila/maven/plugin/license/LicenseFormatMojo.java | 2 +- .../com/mycila/maven/plugin/license/LicenseRemoveMojo.java | 2 +- .../main/java/com/mycila/maven/plugin/license/LicenseSet.java | 2 +- .../src/main/java/com/mycila/maven/plugin/license/Multi.java | 2 +- .../com/mycila/maven/plugin/license/PropertiesProvider.java | 2 +- .../com/mycila/maven/plugin/license/document/Document.java | 2 +- .../mycila/maven/plugin/license/document/DocumentFactory.java | 2 +- .../plugin/license/document/DocumentPropertiesLoader.java | 2 +- .../mycila/maven/plugin/license/document/DocumentType.java | 2 +- .../plugin/license/header/AdditionalHeaderDefinition.java | 2 +- .../java/com/mycila/maven/plugin/license/header/Header.java | 2 +- .../mycila/maven/plugin/license/header/HeaderDefinition.java | 2 +- .../com/mycila/maven/plugin/license/header/HeaderParser.java | 2 +- .../com/mycila/maven/plugin/license/header/HeaderSource.java | 2 +- .../com/mycila/maven/plugin/license/header/HeaderType.java | 2 +- .../com/mycila/maven/plugin/license/util/FileContent.java | 2 +- .../java/com/mycila/maven/plugin/license/util/FileUtils.java | 2 +- .../java/com/mycila/maven/plugin/license/util/Selection.java | 2 +- .../com/mycila/maven/plugin/license/util/StringUtils.java | 2 +- .../maven/plugin/license/util/resource/CustomClassLoader.java | 2 +- .../maven/plugin/license/util/resource/ResourceFinder.java | 2 +- pom.xml | 4 ++-- settings.xml | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-) diff --git a/license-maven-plugin-git/pom.xml b/license-maven-plugin-git/pom.xml index 6575dde92..617945a49 100755 --- a/license-maven-plugin-git/pom.xml +++ b/license-maven-plugin-git/pom.xml @@ -1,6 +1,6 @@