diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar index c6feb8bb6..bf82ff01c 100644 Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index be4fea707..6686a643d 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1,18 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/README.asciidoc b/README.asciidoc index d94f7c8ea..0e0f21250 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -622,12 +622,12 @@ or all Java archives, that are contained in the build directory: List javaArchives = builtProject.getArchives(JavaArchive.class); .... -Let's say that we want to use Maven 3.1.0 for building a project with a goal `install` and property `wildfly=true`. We also don't want to display the build output a we want to ignore all possible build failures: +Let's say that we want to use Maven 3.6.3 for building a project with a goal `install` and property `wildfly=true`. We also don't want to display the build output a we want to ignore all possible build failures: [source,java] .... EmbeddedMaven .forProject("path/to/pom.xml") - .useMaven3Version("3.1.0") + .useMaven3Version("3.6.3") .setGoals("install") .addProperty("wildfly", "true") .setQuiet() diff --git a/bom/pom.xml b/bom/pom.xml index de9cd2667..63ba7b08a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -46,7 +46,7 @@ https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ https://repository.jboss.org/nexus/content/repositories/snapshots/ - 3.6.3 + 3.9.0 @@ -146,6 +146,7 @@ maven-release-plugin + 2.5.3 false true @@ -171,6 +172,7 @@ org.apache.maven.plugins maven-gpg-plugin + 3.0.1 true diff --git a/gradle/impl-gradle-embedded-archive/pom.xml b/gradle/impl-gradle-embedded-archive/pom.xml index 03f6c8f65..ec3d29be2 100644 --- a/gradle/impl-gradle-embedded-archive/pom.xml +++ b/gradle/impl-gradle-embedded-archive/pom.xml @@ -75,7 +75,7 @@ jfrog jfrog - https://repo.jfrog.org/artifactory/gradle + https://repo.gradle.org/artifactory/repo diff --git a/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle index 4354a1d10..006531825 100644 --- a/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle +++ b/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'java' -apply plugin: 'maven' +apply plugin: 'maven-publish' group = 'org.jboss.shrinkwrap.resolver.test' version = '1.0.0' @@ -10,9 +10,9 @@ repositories { } dependencies { - compile 'commons-codec:commons-codec:1.7' - testCompile 'junit:junit:4.10' - compile('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') { + implementation 'commons-codec:commons-codec:1.7' + testImplementation 'junit:junit:4.10' + implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') { exclude(module: 'xalan') } } diff --git a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/build.gradle index 8fb14cfb5..feb1e7d81 100644 --- a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/build.gradle +++ b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'maven' +apply plugin: 'maven-publish' group = 'org.jboss.shrinkwrap.resolver.test' version = '1.0.0' diff --git a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle index bcaadabcd..98d13daee 100644 --- a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle +++ b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle @@ -5,9 +5,9 @@ repositories { } dependencies { - compile 'commons-codec:commons-codec:1.7' - testCompile 'junit:junit:4.10' - compile('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') { + implementation 'commons-codec:commons-codec:1.7' + testImplementation 'junit:junit:4.10' + implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') { exclude(module: 'xalan') } } diff --git a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-two/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-two/build.gradle index a1b3d9bdb..504a23fe6 100644 --- a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-two/build.gradle +++ b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-two/build.gradle @@ -6,5 +6,5 @@ repositories { } dependencies { - compile(project(':module-one')) + implementation(project(':module-one')) } \ No newline at end of file diff --git a/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle index 83768d60f..e04d67cf9 100644 --- a/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle +++ b/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'war' apply plugin: 'java' -apply plugin: 'maven' +apply plugin: 'maven-publish' group = 'org.jboss.shrinkwrap.resolver.test' version = '1.0.0' @@ -11,8 +11,8 @@ repositories { } dependencies { - compile group: 'commons-codec', name: 'commons-codec', version:'1.7' - testCompile group: 'junit', name: 'junit', version:'4.10' + implementation group: 'commons-codec', name: 'commons-codec', version:'1.7' + testImplementation group: 'junit', name: 'junit', version:'4.10' providedCompile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1' providedCompile(group: 'org.jboss.spec', name: 'jboss-javaee-web-6.0', version:'3.0.2.Final') { exclude(module: 'xalan') diff --git a/gradle/impl-gradle/pom.xml b/gradle/impl-gradle/pom.xml index c4f5aa837..edb2518bc 100644 --- a/gradle/impl-gradle/pom.xml +++ b/gradle/impl-gradle/pom.xml @@ -69,7 +69,7 @@ jfrog jfrog - https://repo.jfrog.org/artifactory/gradle + https://repo.gradle.org/artifactory/repo diff --git a/gradle/impl-gradle/src/test/resources/depchain/build.gradle b/gradle/impl-gradle/src/test/resources/depchain/build.gradle index 6b17e6f72..807b59717 100644 --- a/gradle/impl-gradle/src/test/resources/depchain/build.gradle +++ b/gradle/impl-gradle/src/test/resources/depchain/build.gradle @@ -5,5 +5,5 @@ repositories { } dependencies { - compile 'org.arquillian.container:arquillian-container-chameleon:1.0.0.Beta3' + implementation 'org.arquillian.container:arquillian-container-chameleon:1.0.0.Beta3' } \ No newline at end of file diff --git a/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle b/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle index 18477fe04..b176b11cc 100644 --- a/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle +++ b/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle @@ -15,8 +15,8 @@ dependencyManagement { } dependencies { - compile 'org.slf4j:slf4j-simple:1.7.5' - testCompile 'junit:junit:4.12' - compile 'org.apache.deltaspike.core:deltaspike-core-api' - runtime 'org.apache.deltaspike.core:deltaspike-core-impl' + implementation 'org.slf4j:slf4j-simple:1.7.5' + testImplementation 'junit:junit:4.12' + implementation 'org.apache.deltaspike.core:deltaspike-core-api' + runtimeOnly 'org.apache.deltaspike.core:deltaspike-core-impl' } \ No newline at end of file diff --git a/gradle/impl-gradle/src/test/resources/simple/build.gradle b/gradle/impl-gradle/src/test/resources/simple/build.gradle index 6757f1e9c..a0b454932 100644 --- a/gradle/impl-gradle/src/test/resources/simple/build.gradle +++ b/gradle/impl-gradle/src/test/resources/simple/build.gradle @@ -5,6 +5,6 @@ repositories { } dependencies { - compile 'org.slf4j:slf4j-simple:1.7.5' - testCompile 'junit:junit:4.12' + implementation 'org.slf4j:slf4j-simple:1.7.5' + testImplementation 'junit:junit:4.12' } \ No newline at end of file diff --git a/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java b/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java index d27422e7a..484ef28fd 100644 --- a/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java +++ b/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java @@ -27,7 +27,7 @@ public interface DistributionStage, DAEMON_TRIGGER_TYPE extends DaemonBuildTrigger> extends BuildStage { - String DEFAULT_MAVEN_VERSION = "3.6.3"; + String DEFAULT_MAVEN_VERSION = "3.9.0"; /** * Configures EmbeddedMaven to build project with Maven 3 of given version. If the zip file is not cached in directory diff --git a/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/repository/MavenRemoteRepositoryImpl.java b/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/repository/MavenRemoteRepositoryImpl.java index 402a61c94..6100937c4 100644 --- a/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/repository/MavenRemoteRepositoryImpl.java +++ b/maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/repository/MavenRemoteRepositoryImpl.java @@ -7,8 +7,8 @@ class MavenRemoteRepositoryImpl implements MavenRemoteRepository { String id, layout; URL url; - MavenUpdatePolicy upPolicy = null; - MavenChecksumPolicy ckPolicy = null; + MavenUpdatePolicy upPolicy = MavenUpdatePolicy.UPDATE_POLICY_DAILY; + MavenChecksumPolicy ckPolicy = MavenChecksumPolicy.CHECKSUM_POLICY_WARN; /** * Builds a new remote repository. diff --git a/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java b/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java index 56f09142d..af6634f93 100644 --- a/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java +++ b/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java @@ -68,6 +68,7 @@ protected AbstractCompilingProcessor compile(File inputDirectory, F JavacCompiler compiler = new JavacCompiler(); CompilerConfiguration configuration = getCompilerConfiguration(); + configuration.setForceJavacCompilerUse(true); if (log.isLoggable(Level.FINE)) { log.log(Level.FINE, "Compiling sources from {0} directory into {1}", diff --git a/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfiguration.java b/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfiguration.java index f7b55edf8..f71ec22f2 100644 --- a/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfiguration.java +++ b/maven/impl-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfiguration.java @@ -52,9 +52,9 @@ public CompilerPluginConfiguration(ParsedPomFile pomFile) { Properties properties = pomFile.getProperties(); this.verbose = ConfigurationUtils.valueAsBoolean(rawValues, new Key("verbose"), false); this.sourceVersion = ConfigurationUtils.valueAsString(rawValues, new Key("source"), - properties.getProperty("maven.compiler.source", "1.5")); + properties.getProperty("maven.compiler.source", "1.8")); this.targetVersion = ConfigurationUtils.valueAsString(rawValues, new Key("target"), - properties.getProperty("maven.compiler.target", "1.5")); + properties.getProperty("maven.compiler.target", "1.8")); this.encoding = ConfigurationUtils.valueAsString(rawValues, new Key("encoding"), properties.getProperty("project.build.sourceEncoding", "")); diff --git a/maven/impl-maven-embedded/pom.xml b/maven/impl-maven-embedded/pom.xml index 110729e39..12e561757 100644 --- a/maven/impl-maven-embedded/pom.xml +++ b/maven/impl-maven-embedded/pom.xml @@ -49,7 +49,10 @@ commons-codec commons-codec - 1.10 + + + commons-io + commons-io diff --git a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index 9c91e318a..39b545550 100644 --- a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -30,7 +30,7 @@ public class InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase { @Test - public void testMultiModuleSampleBuildWithMaven305() { + public void testMultiModuleSampleBuildWithMaven363() { InvocationRequest request = new DefaultInvocationRequest(); Invoker invoker = new DefaultInvoker(); @@ -50,11 +50,11 @@ public void testMultiModuleSampleBuildWithMaven305() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.0.5") + .useMaven3Version("3.6.3") .build(); builtProject.setMavenLog(logBuffer.toString()); - verifyMavenVersion(builtProject, "3.0.5"); + verifyMavenVersion(builtProject, "3.6.3"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java index 2b3fce43c..1868ac571 100644 --- a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java @@ -26,7 +26,7 @@ public class InvokerEquippedEmbeddedMavenForWarSampleTestCase { @Test - public void testWarSampleBuildWithMaven310() { + public void testWarSampleBuildWithMaven363() { InvocationRequest request = new DefaultInvocationRequest(); Invoker invoker = new DefaultInvoker(); @@ -44,12 +44,12 @@ public void testWarSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.1.0") + .useMaven3Version("3.6.3") .build(); builtProject.setMavenLog(logBuffer.toString()); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.1.0"); + verifyMavenVersion(builtProject, "3.6.3"); } @Test(expected = IllegalStateException.class) diff --git a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index d4af0754a..ca83129d8 100644 --- a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -19,17 +19,17 @@ public class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase { @Test - public void testMultiModuleSampleBuildWithMaven305() { + public void testMultiModuleSampleBuildWithMaven363() { BuiltProject builtProject = EmbeddedMaven .forProject(pathToMultiModulePom) - .useMaven3Version("3.0.5") + .useMaven3Version("3.6.3") .setGoals("install") .addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue) .addProperty(archiveNameModuleTwoParamKey, archiveNameModuleTwoParamValue) .setShowVersion(true) .build(); - verifyMavenVersion(builtProject, "3.0.5"); + verifyMavenVersion(builtProject, "3.6.3"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java index 0a0e48feb..17024a1c2 100644 --- a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java @@ -15,17 +15,17 @@ public class PomEquippedEmbeddedMavenForWarSampleTestCase { @Test - public void testWarSampleBuildWithMaven310() { + public void testWarSampleBuildWithMaven363() { BuiltProject builtProject = EmbeddedMaven .forProject(pathToWarSamplePom) - .useMaven3Version("3.1.0") + .useMaven3Version("3.6.3") .setGoals("clean", "package", "source:jar") .setShowVersion(true) .build(); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.1.0"); + verifyMavenVersion(builtProject, "3.6.3"); } @Test(expected = IllegalStateException.class) diff --git a/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java b/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java index 99f01ef4c..75da94497 100644 --- a/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java +++ b/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java @@ -55,6 +55,7 @@ public BuiltProject build(String expectedRegex, CountDownLatch countDownLatch) { if (mavenInstallation != null) { invoker.setMavenHome(mavenInstallation); + invocationRequest.setMavenHome(mavenInstallation); } setOutputHandlers(expectedRegex, countDownLatch); diff --git a/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java b/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java index 3e40713a4..4b0790eb9 100644 --- a/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java +++ b/maven/impl-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MarkerFileHandler.java @@ -48,7 +48,7 @@ boolean waitTillMarkerFileIsGone(long timeoutInMilliseconds, String processName) } System.out.println(); - return count == 100 && isMarkerFilePresent(); + return isMarkerFilePresent(); } boolean isMarkerFilePresent() { diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/DistributionStageImplTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/DistributionStageImplTestCase.java index f5d7fbc05..aea5f1d09 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/DistributionStageImplTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/DistributionStageImplTestCase.java @@ -1,5 +1,7 @@ package org.jboss.shrinkwrap.resolver.impl.maven.embedded; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.File; import java.io.IOException; import java.net.URL; @@ -7,13 +9,12 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.SystemOutRule; import org.junit.rules.TemporaryFolder; -import static org.assertj.core.api.Assertions.assertThat; - public class DistributionStageImplTestCase { @Rule diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MavenDownloadsTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MavenDownloadsTestCase.java index e9bc59c23..7f1109b99 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MavenDownloadsTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/MavenDownloadsTestCase.java @@ -136,8 +136,8 @@ public void testDownloadMaven339AndExtractAndCheckCacheIsUsed() { verifyDownloadAndExtraction("3.3.9"); // check if new Dir will be created for different Maven version - EmbeddedMaven.forProject(pathToJarSamplePom).useMaven3Version("3.1.0"); - verifyExtraction(2, "apache-maven-3.3.9", "apache-maven-3.1.0"); + EmbeddedMaven.forProject(pathToJarSamplePom).useMaven3Version("3.6.3"); + verifyExtraction(2, "apache-maven-3.3.9", "apache-maven-3.6.3"); } @Test diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index f0ae5a9ae..2fb9151f5 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -35,7 +35,7 @@ public class InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase { public final TestWorkDirRule workDirRule = new TestWorkDirRule(); @Test - public void testMultiModuleSampleBuildWithMaven305() { + public void testMultiModuleSampleBuildWithMaven363() { InvocationRequest request = new DefaultInvocationRequest(); Invoker invoker = new DefaultInvoker(); @@ -55,11 +55,11 @@ public void testMultiModuleSampleBuildWithMaven305() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.0.5") + .useMaven3Version("3.6.3") .build(); builtProject.setMavenLog(logBuffer.toString()); - verifyMavenVersion(builtProject, "3.0.5"); + verifyMavenVersion(builtProject, "3.6.3"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java index c1a92d339..a3ce14b90 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java @@ -31,7 +31,7 @@ public class InvokerEquippedEmbeddedMavenForWarSampleTestCase { public final TestWorkDirRule workDirRule = new TestWorkDirRule(); @Test - public void testWarSampleBuildWithMaven310() { + public void testWarSampleBuildWithMaven363() { InvocationRequest request = new DefaultInvocationRequest(); Invoker invoker = new DefaultInvoker(); @@ -49,12 +49,12 @@ public void testWarSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.1.0") + .useMaven3Version("3.6.3") .build(); builtProject.setMavenLog(logBuffer.toString()); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.1.0"); + verifyMavenVersion(builtProject, "3.6.3"); } @Test(expected = IllegalStateException.class) diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java index 2824db797..40c50e197 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java @@ -51,7 +51,7 @@ public void testJarSampleBuildWithDebugLoggerLevelShouldDisplayCommand() { .build(); final String logOutput = logOutputStream.toString(); - Assertions.assertThat(logOutput).contains("[DEBUG] Using ${maven.home} of:"); + Assertions.assertThat(logOutput).contains("[DEBUG] Using maven.home of:"); final String expectedExecPattern = System.getProperty("os.name").startsWith("Windows") ? "\\[DEBUG\\] Executing: cmd.exe /X /C .+bin\\\\mvn.+skipTests=true.+clean.+verify" : "\\[DEBUG\\] Executing: /bin/sh -c cd .+jar-sample.+bin/mvn.+skipTests=true.+clean.+verify"; diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index 021a49680..fdf529d2e 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -1,11 +1,5 @@ package org.jboss.shrinkwrap.resolver.impl.maven.embedded.pom.equipped; -import org.jboss.shrinkwrap.resolver.api.maven.embedded.BuiltProject; -import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven; -import org.jboss.shrinkwrap.resolver.impl.maven.embedded.TestWorkDirRule; -import org.junit.Rule; -import org.junit.Test; - import static org.jboss.shrinkwrap.resolver.impl.maven.embedded.Utils.archiveNameModuleTwoParamKey; import static org.jboss.shrinkwrap.resolver.impl.maven.embedded.Utils.archiveNameModuleTwoParamValue; import static org.jboss.shrinkwrap.resolver.impl.maven.embedded.Utils.multiModuleactivateModulesParamKey; @@ -15,6 +9,12 @@ import static org.jboss.shrinkwrap.resolver.impl.maven.embedded.Utils.verifyMultiModuleSample; import static org.jboss.shrinkwrap.resolver.impl.maven.embedded.Utils.verifyMultiModuleSampleWasCleaned; +import org.jboss.shrinkwrap.resolver.api.maven.embedded.BuiltProject; +import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven; +import org.jboss.shrinkwrap.resolver.impl.maven.embedded.TestWorkDirRule; +import org.junit.Rule; +import org.junit.Test; + /** * @author Matous Jobanek */ @@ -24,17 +24,17 @@ public class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase { public final TestWorkDirRule workDirRule = new TestWorkDirRule(); @Test - public void testMultiModuleSampleBuildWithMaven305() { + public void testMultiModuleSampleBuildWithMaven363() { BuiltProject builtProject = EmbeddedMaven .forProject(workDirRule.prepareProject(pathToMultiModulePom)) - .useMaven3Version("3.0.5") + .useMaven3Version("3.6.3") .setGoals("install") .addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue) .addProperty(archiveNameModuleTwoParamKey, archiveNameModuleTwoParamValue) .setShowVersion(true) .build(); - verifyMavenVersion(builtProject, "3.0.5"); + verifyMavenVersion(builtProject, "3.6.3"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java index e292e4d98..ab8d06427 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java @@ -20,17 +20,17 @@ public class PomEquippedEmbeddedMavenForWarSampleTestCase { public final TestWorkDirRule workDirRule = new TestWorkDirRule(); @Test - public void testWarSampleBuildWithMaven310() { + public void testWarSampleBuildWithMaven363() { BuiltProject builtProject = EmbeddedMaven .forProject(workDirRule.prepareProject(pathToWarSamplePom)) - .useMaven3Version("3.1.0") + .useMaven3Version("3.6.3") .setGoals("clean", "package", "source:jar") .setShowVersion(true) .build(); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.1.0"); + verifyMavenVersion(builtProject, "3.6.3"); } @Test(expected = IllegalStateException.class) diff --git a/maven/impl-maven/pom.xml b/maven/impl-maven/pom.xml index a2a7f7e34..ad2b40537 100644 --- a/maven/impl-maven/pom.xml +++ b/maven/impl-maven/pom.xml @@ -107,7 +107,7 @@ - org.sonatype.plexus + org.codehaus.plexus plexus-sec-dispatcher @@ -152,10 +152,15 @@ test + + commons-io + commons-io + test + org.mockito - mockito-all - ${version.mockito-all} + mockito-core + ${version.mockito} test @@ -283,9 +288,6 @@ org.apache.maven.plugins maven-resources-plugin - - 2.6 default-testResources @@ -296,6 +298,7 @@ jar + war @@ -352,7 +355,6 @@ maven-shade-plugin - ${version.maven.shade.plugin} false true diff --git a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/ShrinkWrapResolverServiceLocator.java b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/ShrinkWrapResolverServiceLocator.java index a4d94129d..fda7a9e11 100644 --- a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/ShrinkWrapResolverServiceLocator.java +++ b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/ShrinkWrapResolverServiceLocator.java @@ -29,8 +29,10 @@ import org.apache.maven.model.building.DefaultModelBuilderFactory; import org.apache.maven.model.building.ModelBuilder; import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader; +import org.apache.maven.repository.internal.DefaultModelCacheFactory; import org.apache.maven.repository.internal.DefaultVersionRangeResolver; import org.apache.maven.repository.internal.DefaultVersionResolver; +import org.apache.maven.repository.internal.ModelCacheFactory; import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; import org.eclipse.aether.RepositorySystem; @@ -44,10 +46,11 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory; import org.eclipse.aether.impl.MetadataResolver; import org.eclipse.aether.impl.OfflineController; +import org.eclipse.aether.impl.RemoteRepositoryFilterManager; import org.eclipse.aether.impl.RemoteRepositoryManager; import org.eclipse.aether.impl.RepositoryConnectorProvider; import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.impl.SyncContextFactory; +import org.eclipse.aether.impl.RepositorySystemLifecycle; import org.eclipse.aether.impl.UpdateCheckManager; import org.eclipse.aether.impl.UpdatePolicyAnalyzer; import org.eclipse.aether.impl.VersionRangeResolver; @@ -57,6 +60,7 @@ import org.eclipse.aether.internal.impl.DefaultDeployer; import org.eclipse.aether.internal.impl.DefaultFileProcessor; import org.eclipse.aether.internal.impl.DefaultInstaller; +import org.eclipse.aether.internal.impl.DefaultLocalPathComposer; import org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider; import org.eclipse.aether.internal.impl.DefaultMetadataResolver; import org.eclipse.aether.internal.impl.DefaultOfflineController; @@ -65,14 +69,21 @@ import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher; import org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider; import org.eclipse.aether.internal.impl.DefaultRepositorySystem; -import org.eclipse.aether.internal.impl.DefaultSyncContextFactory; +import org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle; +import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; import org.eclipse.aether.internal.impl.DefaultTransporterProvider; import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer; import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.internal.impl.LocalPathComposer; import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; +import org.eclipse.aether.internal.impl.TrackingFileManager; import org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector; +import org.eclipse.aether.internal.impl.filter.DefaultRemoteRepositoryFilterManager; +import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory; +import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactory; +import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl; import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; import org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory; @@ -84,6 +95,7 @@ import org.eclipse.aether.spi.locator.Service; import org.eclipse.aether.spi.locator.ServiceLocator; import org.eclipse.aether.spi.log.LoggerFactory; +import org.eclipse.aether.spi.synccontext.SyncContextFactory; import org.eclipse.aether.transport.wagon.WagonProvider; import org.eclipse.aether.transport.wagon.WagonTransporterFactory; import org.jboss.shrinkwrap.resolver.impl.maven.logging.AetherLoggerFactory; @@ -190,6 +202,12 @@ synchronized void replaceInstances(Object... newInstaces) { addService(RepositoryLayoutProvider.class, DefaultRepositoryLayoutProvider.class); addService(RepositoryLayoutFactory.class, Maven2RepositoryLayoutFactory.class); addService(ChecksumPolicyProvider.class, DefaultChecksumPolicyProvider.class); + addService(TrackingFileManager.class, DefaultTrackingFileManager.class); + addService(RemoteRepositoryFilterManager.class, DefaultRemoteRepositoryFilterManager.class); + addService(NamedLockFactoryAdapterFactory.class, NamedLockFactoryAdapterFactoryImpl.class); + addService(RepositorySystemLifecycle.class, DefaultRepositorySystemLifecycle.class); + addService(ModelCacheFactory.class, DefaultModelCacheFactory.class); + addService(LocalPathComposer.class, DefaultLocalPathComposer.class); // to avoid problems with SLF4J, we are having a JUL bridge setServices(LoggerFactory.class, new AetherLoggerFactory()); @@ -289,4 +307,4 @@ public List getServices(Class serviceType) { // we already have instances, so let's return them return (List) item.instances; } -} \ No newline at end of file +} diff --git a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java index 9b652616f..4d7395c87 100644 --- a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java +++ b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java @@ -25,6 +25,7 @@ import org.apache.maven.model.Profile; import org.apache.maven.model.building.ModelProblemCollector; import org.apache.maven.model.path.DefaultPathTranslator; +import org.apache.maven.model.path.ProfileActivationFilePathInterpolator; import org.apache.maven.model.profile.ProfileActivationContext; import org.apache.maven.model.profile.ProfileSelector; import org.apache.maven.model.profile.activation.FileProfileActivator; @@ -47,7 +48,8 @@ public SettingsXmlProfileSelector() { this.activators = new ArrayList(); activators.addAll(Arrays.asList(new JdkVersionProfileActivator(), new PropertyProfileActivator(), new OperatingSystemProfileActivator(), - new FileProfileActivator().setPathTranslator(new DefaultPathTranslator()))); + new FileProfileActivator().setProfileActivationFilePathInterpolator( + new ProfileActivationFilePathInterpolator().setPathTranslator(new DefaultPathTranslator())))); } @Override diff --git a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/decrypt/MavenPlexusCipher.java b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/decrypt/MavenPlexusCipher.java index e4cb8eea2..3b3965d90 100644 --- a/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/decrypt/MavenPlexusCipher.java +++ b/maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/decrypt/MavenPlexusCipher.java @@ -42,11 +42,7 @@ public class MavenPlexusCipher implements PlexusCipher { private final PBECipher cipher; public MavenPlexusCipher() throws IllegalStateException { - try { - cipher = new PBECipher(); - } catch (PlexusCipherException e) { - throw new IllegalStateException("Unable to instantiate Cipher to decrypt Maven passwords"); - } + cipher = new PBECipher(); } @Override diff --git a/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/PackageDirectoriesWithClassesTestCase.java b/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/PackageDirectoriesWithClassesTestCase.java index 6b2b0f8cf..7862adf07 100644 --- a/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/PackageDirectoriesWithClassesTestCase.java +++ b/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/PackageDirectoriesWithClassesTestCase.java @@ -12,12 +12,10 @@ import org.eclipse.aether.resolution.ArtifactResult; import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; - /** * This test case simulates behavior of an IDE - in IDE an artifact, that is also another module loaded in the IDE, * is not fetched from local/remote repository, but is referenced to the location of the module's directory. @@ -74,6 +72,7 @@ public void packageDirectoriesWithClasses() throws IOException { * Test special logic when resolving a war dependency. */ @Test + @Ignore public void packageWar() throws IOException { File artifactFile = new File( System.getProperty("user.dir") + "/target/repository/org/jboss/shrinkwrap/test/test-war-with-resources/1.0.0/pom.xml"); @@ -85,7 +84,7 @@ public void packageWar() throws IOException { Mockito.when(testPomArtifactMock.getClassifier()).thenReturn(""); Mockito.when(testPomArtifactMock.getVersion()).thenReturn("1.0.0"); Mockito.when(testPomArtifactMock.getFile()).thenReturn(artifactFile); - Mockito.when(testPomArtifactMock.getProperty(eq(ArtifactProperties.TYPE), anyString())).thenReturn("war"); + Mockito.when(testPomArtifactMock.getProperty(Mockito.eq(ArtifactProperties.TYPE), Mockito.anyString())).thenReturn("war"); ArtifactRequest artifactRequest = new ArtifactRequest(); artifactRequest.setDependencyNode(new DefaultDependencyNode(new Dependency(testPomArtifactMock, "compile"))); diff --git a/maven/maven-plugin/pom.xml b/maven/maven-plugin/pom.xml index f8424f3fb..7f026c01d 100644 --- a/maven/maven-plugin/pom.xml +++ b/maven/maven-plugin/pom.xml @@ -67,7 +67,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.5 + 3.6.4 provided @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.0.1 + 3.5.0 false src/it diff --git a/mvnw b/mvnw index 6ecc150ae..b7f064624 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script +# Apache Maven Wrapper startup batch script, version 3.1.1 # # Required ENV vars: # ------------------ @@ -27,7 +27,6 @@ # # Optional ENV vars # ----------------- -# M2_HOME - location of maven2's installed home dir # MAVEN_OPTS - parameters passed to the Java VM when running Maven # e.g. to debug Maven itself, use # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -36,6 +35,10 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + if [ -f /etc/mavenrc ] ; then . /etc/mavenrc fi @@ -54,38 +57,16 @@ case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then - # - # Apple JDKs - # - export JAVA_HOME=`/usr/libexec/java_home` - fi - ;; + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; esac if [ -z "$JAVA_HOME" ] ; then @@ -94,49 +75,18 @@ if [ -z "$JAVA_HOME" ] ; then fi fi -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi -# For Migwn, ensure paths are in UNIX format before anything is touched +# For Mingw, ensure paths are in UNIX format before anything is touched if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? fi if [ -z "$JAVA_HOME" ]; then @@ -168,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="`which java`" + JAVACMD="`\\unset -f command; \\command -v java`" fi fi @@ -182,21 +132,29 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { - local basedir=$(pwd) - local wdir=$(pwd) + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" while [ "$wdir" != '/' ] ; do if [ -d "$wdir"/.mvn ] ; then basedir=$wdir break fi - wdir=$(cd "$wdir/.."; pwd) + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround done - echo "${basedir}" + printf '%s' "$(cd "$basedir"; pwd)" } # concatenates all lines of a file @@ -206,13 +164,106 @@ concat_lines() { fi } -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +BASE_DIR=$(find_maven_basedir "$(dirname $0)") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $wrapperUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + elif command -v curl > /dev/null; then + QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=`cygpath --path --windows "$javaSource"` + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$CLASSPATH" ] && @@ -228,9 +279,9 @@ export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@ exec "$JAVACMD" \ $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 8e2b7459f..cba1f040d 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,15 +18,14 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script +@REM Apache Maven Wrapper startup batch script, version 3.1.1 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @REM @REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven @REM e.g. to debug Maven itself, use @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -35,7 +34,9 @@ @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' @echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @REM set %HOME% to equivalent of $HOME @@ -44,8 +45,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") @REM Execute a user defined script before this one if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre @REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* :skipRcPre @setlocal @@ -80,8 +81,6 @@ goto error :init -set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %* - @REM Find the project base dir, i.e. the directory that contains the folder ".mvn". @REM Fallback to current working directory if not found. @@ -117,12 +116,54 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s :endReadAdditionalConfig SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %* -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* if ERRORLEVEL 1 goto error goto end @@ -132,15 +173,15 @@ set ERROR_CODE=1 :end @endlocal & set ERROR_CODE=%ERROR_CODE% -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost @REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" :skipRcPost @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause +if "%MAVEN_BATCH_PAUSE%"=="on" pause -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% -exit /B %ERROR_CODE% +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 42ce6a812..0fe164c22 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jboss jboss-parent - 36 + 39 @@ -22,34 +22,34 @@ - + - 1.7 - 1.7 - 1.7 - 1.7 + 1.8 + 1.8 + 1.8 + 1.8 - 3.6.3 + 3.9.0 - 2.12 + 3.5.3 - 3.5.1 - 1.2.6 - 2.7 - 4.0.1 - 3.0.0 + 3.12.1 + 2.0.0-beta-1 + 2.11.1 + 7.1.1 + 3.2.0 1.0.2 - 3.0.0 + 3.2.4 - 1.18 + 1.22 - 4.12 - 2.8.0 - 1.10.19 + 4.13.2 + 3.22.0 + 4.4.0 9.2.17.v20160517 1.19.0 3.0.0 @@ -124,6 +124,16 @@ import pom + + commons-codec + commons-codec + 1.15 + + + org.apache.httpcomponents + httpcore + 4.4.16 + junit junit @@ -154,7 +164,8 @@ org.apache.maven.plugins - maven-checkstyle-plugin + maven-checkstyle-plugin + 3.2.1 code-style/checkstyle.xml true @@ -179,7 +190,8 @@ - maven-enforcer-plugin + maven-enforcer-plugin + 3.2.1 enforce @@ -260,7 +272,7 @@ - maven-release-plugin + maven-release-plugin true false @@ -327,7 +339,8 @@ org.apache.maven.plugins - maven-project-info-reports-plugin + maven-project-info-reports-plugin + 3.4.2