You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/07/31 08:12:57 UTC
[camel] branch master updated: CAMEL-12687 - upgrade shrinkwrap and
arquillian versions
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a5b1957 CAMEL-12687 - upgrade shrinkwrap and arquillian versions
a5b1957 is described below
commit a5b1957a1bbfa38bbaa61940fb5525062d73a09d
Author: onders <on...@apache.org>
AuthorDate: Tue Jul 31 06:23:31 2018 +0300
CAMEL-12687 - upgrade shrinkwrap and arquillian versions
---
parent/pom.xml | 10 ++---
tests/camel-itest-spring-boot/pom.xml | 12 ++++++
.../apache/camel/itest/springboot/ITestConfig.java | 50 +++++++++++-----------
.../itest/springboot/util/ArquillianPackager.java | 6 +--
.../camel/itest/springboot/util/BOMResolver.java | 22 +++++++---
5 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0ca8148..d48db1d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,9 +59,9 @@
<aries-blueprint-proxy-impl-version>1.1.1</aries-blueprint-proxy-impl-version>
<aries-spifly-version>1.0.8</aries-spifly-version>
<aries-util-version>1.1.3</aries-util-version>
- <arquillian-container-se-managed-version>1.0.0.Final</arquillian-container-se-managed-version>
+ <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.4.0.Final</arquillian-version>
- <arquillian-weld-embedded-version>2.0.0.Beta4</arquillian-weld-embedded-version>
+ <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
<asciidoctorj-version>1.5.6</asciidoctorj-version>
<asm-version>5.0.4</asm-version>
<aspectj-version>1.9.1</aspectj-version>
@@ -614,9 +614,9 @@
<servlet-api-3.0-version>1.0</servlet-api-3.0-version>
<servlet-version-range>[3,4)</servlet-version-range>
<shiro-version>1.4.0</shiro-version>
- <shrinkwrap-descriptors-version>2.0.0-alpha-10</shrinkwrap-descriptors-version>
- <shrinkwrap-resolver-version>2.2.4</shrinkwrap-resolver-version>
- <shrinkwrap-version>1.2.3</shrinkwrap-version>
+ <shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
+ <shrinkwrap-resolver-version>3.1.3</shrinkwrap-resolver-version>
+ <shrinkwrap-version>1.2.6</shrinkwrap-version>
<sip-api-version>1.1</sip-api-version>
<slf4j-api-version>1.7.25</slf4j-api-version>
<slf4j-version>1.7.25</slf4j-version>
diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml
index 8619d39..f859eb2 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -87,6 +87,12 @@
<version>${aether-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-basic</artifactId>
+ <version>${aether-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
@@ -120,6 +126,12 @@
<artifactId>shrinkwrap-resolver-api</artifactId>
<version>${shrinkwrap-resolver-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java
index c877cb9..a12622b 100644
--- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java
+++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java
@@ -272,30 +272,30 @@ public class ITestConfig implements Serializable {
@Override
public String toString() {
- return "ITestConfig{" +
- "moduleName='" + moduleName + '\'' +
- ", mavenGroup='" + mavenGroup + '\'' +
- ", mavenVersion='" + mavenVersion + '\'' +
- ", mavenOfflineResolution=" + mavenOfflineResolution +
- ", modulesPath='" + modulesPath + '\'' +
- ", moduleBasePath='" + moduleBasePath + '\'' +
- ", includeTestDependencies=" + includeTestDependencies +
- ", includeProvidedDependencies=" + includeProvidedDependencies +
- ", unitTestEnabled=" + unitTestEnabled +
- ", unitTestInclusionPattern='" + unitTestInclusionPattern + '\'' +
- ", unitTestExclusionPattern='" + unitTestExclusionPattern + '\'' +
- ", unitTestBasePackage='" + unitTestBasePackage + '\'' +
- ", unitTestsExpectedNumber=" + unitTestsExpectedNumber +
- ", resources=" + resources +
- ", additionalDependencies=" + additionalDependencies +
- ", mavenExclusions=" + mavenExclusions +
- ", autoStartComponent=" + autoStartComponent +
- ", jmxDisabledNames=" + jmxDisabledNames +
- ", systemProperties=" + systemProperties +
- ", useCustomLog=" + useCustomLog +
- ", ignoreLibraryMismatch=" + ignoreLibraryMismatch +
- ", testLibraryVersions=" + testLibraryVersions +
- ", springBootVersion=" + springBootVersion +
- '}';
+ return "ITestConfig{"
+ + "moduleName='" + moduleName + '\''
+ + ", mavenGroup='" + mavenGroup + '\''
+ + ", mavenVersion='" + mavenVersion + '\''
+ + ", mavenOfflineResolution=" + mavenOfflineResolution
+ + ", modulesPath='" + modulesPath + '\''
+ + ", moduleBasePath='" + moduleBasePath + '\''
+ + ", includeTestDependencies=" + includeTestDependencies
+ + ", includeProvidedDependencies=" + includeProvidedDependencies
+ + ", unitTestEnabled=" + unitTestEnabled
+ + ", unitTestInclusionPattern='" + unitTestInclusionPattern + '\''
+ + ", unitTestExclusionPattern='" + unitTestExclusionPattern + '\''
+ + ", unitTestBasePackage='" + unitTestBasePackage + '\''
+ + ", unitTestsExpectedNumber=" + unitTestsExpectedNumber
+ + ", resources=" + resources
+ + ", additionalDependencies=" + additionalDependencies
+ + ", mavenExclusions=" + mavenExclusions
+ + ", autoStartComponent=" + autoStartComponent
+ + ", jmxDisabledNames=" + jmxDisabledNames
+ + ", systemProperties=" + systemProperties
+ + ", useCustomLog=" + useCustomLog
+ + ", ignoreLibraryMismatch=" + ignoreLibraryMismatch
+ + ", testLibraryVersions=" + testLibraryVersions
+ + ", springBootVersion=" + springBootVersion
+ + '}';
}
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 1570d56..2e043d8 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -132,7 +132,7 @@ public final class ArquillianPackager {
}
if (version == null) {
// It is missing when launching from IDE
- List<MavenResolvedArtifact> resolved = Arrays.asList(resolver(config).loadPomFromFile("pom.xml").importRuntimeDependencies().resolve().withoutTransitivity().asResolvedArtifact());
+ List<MavenResolvedArtifact> resolved = Arrays.asList(resolver(config).loadPomFromFile("pom.xml").importCompileAndRuntimeDependencies().resolve().withoutTransitivity().asResolvedArtifact());
for (MavenResolvedArtifact dep : resolved) {
if (dep.getCoordinate().getGroupId().equals("org.apache.camel")) {
version = dep.getCoordinate().getVersion();
@@ -667,10 +667,10 @@ public final class ArquillianPackager {
final URLPackageScanner.Callback callback = new URLPackageScanner.Callback() {
@Override
- public void classFound(String className) {
+ public void classFound(String className, Asset asset) {
ArchivePath classNamePath = AssetUtil.getFullPathForClassResource(className);
- Asset asset = new ClassLoaderAsset(classNamePath.get().substring(1), classLoader);
+ asset = new ClassLoaderAsset(classNamePath.get().substring(1), classLoader);
ArchivePath location = new BasicPath(CLASSES_FOLDER + "/", classNamePath);
ark.add(asset, location);
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
index 08794ec..7813c29 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java
@@ -59,7 +59,7 @@ public final class BOMResolver {
private static final File CACHE_FILE = LocationUtils.camelRoot("tests/camel-itest-spring-boot/target/bom-versions-cache");
- private static BOMResolver INSTANCE;
+ private static BOMResolver instance;
private ITestConfig config;
@@ -143,7 +143,12 @@ public final class BOMResolver {
this.versions = new TreeMap<>();
- ArtifactDescriptorRequest springBootParentReq = new ArtifactDescriptorRequest(camelStarterParent, Arrays.asList(localRepoDist, mavenCentral, apacheSnapshots, springMilestones), null);
+ ArtifactDescriptorRequest springBootParentReq = new ArtifactDescriptorRequest(camelStarterParent,
+ Arrays.asList(localRepoDist,
+ mavenCentral,
+ apacheSnapshots,
+ springMilestones),
+ null);
ArtifactDescriptorResult springBootParentRes = system.readArtifactDescriptor(session, springBootParentReq);
for (Dependency dependency : springBootParentRes.getManagedDependencies()) {
Artifact a = dependency.getArtifact();
@@ -152,7 +157,12 @@ public final class BOMResolver {
}
Artifact springBootDependencies = new DefaultArtifact("org.springframework.boot:spring-boot-dependencies:pom:" + config.getSpringBootVersion());
- ArtifactDescriptorRequest springBootDependenciesReq = new ArtifactDescriptorRequest(springBootDependencies, Arrays.asList(localRepoDist, mavenCentral, apacheSnapshots, springMilestones), null);
+ ArtifactDescriptorRequest springBootDependenciesReq = new ArtifactDescriptorRequest(springBootDependencies,
+ Arrays.asList(localRepoDist,
+ mavenCentral,
+ apacheSnapshots,
+ springMilestones),
+ null);
ArtifactDescriptorResult springBootDependenciesRes = system.readArtifactDescriptor(session, springBootDependenciesReq);
for (Dependency dependency : springBootDependenciesRes.getManagedDependencies()) {
Artifact a = dependency.getArtifact();
@@ -162,10 +172,10 @@ public final class BOMResolver {
}
public static BOMResolver getInstance(ITestConfig config) {
- if (INSTANCE == null) {
- INSTANCE = new BOMResolver(config);
+ if (instance == null) {
+ instance = new BOMResolver(config);
}
- return INSTANCE;
+ return instance;
}
public String getBOMVersion(String groupId, String artifactId) {