fixing tests and refactoring properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8033b30c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8033b30c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8033b30c Branch: refs/heads/boot2 Commit: 8033b30c9b7e616df638bd849912d3bdf8779d1a Parents: 45d8130 Author: Nicola Ferraro <[email protected]> Authored: Tue Sep 19 02:14:00 2017 +0200 Committer: Nicola Ferraro <[email protected]> Committed: Tue Sep 19 02:14:00 2017 +0200 ---------------------------------------------------------------------- components/camel-ahc-ws/pom.xml | 6 - components/camel-gora/pom.xml | 10 + components/camel-hdfs/pom.xml | 10 + components/camel-hdfs2/pom.xml | 10 + components/camel-restlet/pom.xml | 1 + components/camel-servlet/pom.xml | 1 + components/camel-sjms2/pom.xml | 275 ++++++++++--------- components/camel-spark/pom.xml | 26 ++ .../camel-bam-starter/pom.xml | 8 + pom.xml | 8 +- tests/camel-itest-spring-boot/pom.xml | 47 +--- .../camel/itest/springboot/ITestConfig.java | 14 +- .../itest/springboot/ITestConfigBuilder.java | 8 +- .../itest/springboot/CamelCassandraqlTest.java | 6 - .../springboot/util/ArquillianPackager.java | 36 ++- .../itest/springboot/util/BOMResolver.java | 47 +++- .../springboot/util/DependencyResolver.java | 7 + .../itest/springboot/util/JarExporter.java | 4 +- 18 files changed, 294 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-ahc-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml index 31c77a9..634cff7 100644 --- a/components/camel-ahc-ws/pom.xml +++ b/components/camel-ahc-ws/pom.xml @@ -89,12 +89,6 @@ <!-- Jetty8 for testing--> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-api</artifactId> - <version>${jetty-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> <version>${jetty-version}</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-gora/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml index 0ba69df..20e8b5e 100644 --- a/components/camel-gora/pom.xml +++ b/components/camel-gora/pom.xml @@ -144,10 +144,20 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>${jackson-version}</version> </dependency> <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jdom</artifactId> <version>${jdom-bundle-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml index 7b9442a..24b1bf0 100644 --- a/components/camel-hdfs/pom.xml +++ b/components/camel-hdfs/pom.xml @@ -108,9 +108,19 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>${jackson-version}</version> </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson-version}</version> + </dependency> <!-- testing --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-hdfs2/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml index 40b8b70..e91ee5d 100644 --- a/components/camel-hdfs2/pom.xml +++ b/components/camel-hdfs2/pom.xml @@ -122,9 +122,19 @@ </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>${jackson-version}</version> </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson-version}</version> + </dependency> <!-- testing --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-restlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml index 5a8570e..e41b60f 100644 --- a/components/camel-restlet/pom.xml +++ b/components/camel-restlet/pom.xml @@ -147,6 +147,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>${google-guava-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index a80f3c5..83cde13 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -148,6 +148,7 @@ <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> + <version>${arquillian-version}</version> <scope>test</scope> </dependency> <!--jetty--> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-sjms2/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml index 965ce6e..ce63a7f 100644 --- a/components/camel-sjms2/pom.xml +++ b/components/camel-sjms2/pom.xml @@ -17,152 +17,153 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>components</artifactId> - <groupId>org.apache.camel</groupId> - <version>2.20.0-SNAPSHOT</version> - </parent> + <parent> + <artifactId>components</artifactId> + <groupId>org.apache.camel</groupId> + <version>2.20.0-SNAPSHOT</version> + </parent> - <artifactId>camel-sjms2</artifactId> - <packaging>jar</packaging> - <name>Camel :: Simple JMS2</name> - <description>A pure Java JMS 2.0 Camel Component</description> + <artifactId>camel-sjms2</artifactId> + <packaging>jar</packaging> + <name>Camel :: Simple JMS2</name> + <description>A pure Java JMS 2.0 Camel Component</description> - <properties> - <camel.osgi.export.pkg> - org.apache.camel.component.sjms2, - org.apache.camel.component.sjms2.jms - </camel.osgi.export.pkg> - <camel.osgi.export.service> - org.apache.camel.spi.ComponentResolver;component=sjms2 - </camel.osgi.export.service> - <camel.osgi.import.additional>javax.jms;version="[2,3)"</camel.osgi.import.additional> - </properties> + <properties> + <camel.osgi.export.pkg> + org.apache.camel.component.sjms2, + org.apache.camel.component.sjms2.jms + </camel.osgi.export.pkg> + <camel.osgi.export.service> + org.apache.camel.spi.ComponentResolver;component=sjms2 + </camel.osgi.export.service> + <camel.osgi.import.additional>javax.jms;version="[2,3)"</camel.osgi.import.additional> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-sjms</artifactId> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-sjms</artifactId> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_2.0_spec</artifactId> - <version>${geronimo-jms2-spec-version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - <version>${geronimo-annotation-1.0-spec-version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_2.0_spec</artifactId> + <version>${geronimo-jms2-spec-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + <version>${geronimo-annotation-1.0-spec-version}</version> + <scope>provided</scope> + </dependency> - <!-- logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> - </dependency> + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-pool</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io-version}</version> - <scope>test</scope> - </dependency> + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io-version}</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-server</artifactId> - <version>${activemq-artemis-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-server</artifactId> - <version>${activemq-artemis-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-client</artifactId> - <version>${activemq-artemis-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-amqp-protocol</artifactId> - <version>${activemq-artemis-version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server</artifactId> + <version>${activemq-artemis-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-server</artifactId> + <version>${activemq-artemis-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-client</artifactId> + <version>${activemq-artemis-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-amqp-protocol</artifactId> + <version>${activemq-artemis-version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/activemq-data</directory> - </fileset> - </filesets> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <forkedProcessTimeoutInSeconds>6000</forkedProcessTimeoutInSeconds> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${basedir}/activemq-data</directory> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/components/camel-spark/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml index 94b1331..d9bdf0e 100644 --- a/components/camel-spark/pom.xml +++ b/components/camel-spark/pom.xml @@ -168,6 +168,32 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-mapred</artifactId> + <classifier>hadoop2</classifier> + <version>${avro-version}</version> + </dependency> <!-- Optional --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml index 80c4b10..3ec6564 100644 --- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml @@ -35,6 +35,14 @@ <version>${spring-boot-version}</version> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-bam</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0abd51a..ec755a7 100755 --- a/pom.xml +++ b/pom.xml @@ -648,9 +648,9 @@ <splunk-version>1.6.3.0_1</splunk-version> <spring-batch-version>3.0.8.RELEASE</spring-batch-version> <spring-batch-bundle-version>3.0.8.RELEASE_1</spring-batch-bundle-version> - <spring-boot-version>1.5.6.RELEASE</spring-boot-version> - <spring-boot1-version>1.5.6.RELEASE</spring-boot1-version> - <spring-boot2-version>2.0.0.M3</spring-boot2-version> + <spring-boot-version>1.5.7.RELEASE</spring-boot-version> + <spring-boot1-version>1.5.7.RELEASE</spring-boot1-version> + <spring-boot2-version>2.0.0.M4</spring-boot2-version> <!-- use same version of spring-cloud 1.2.x --> <spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version> <spring-cloud-netflix-version>1.3.4.RELEASE</spring-cloud-netflix-version> @@ -677,7 +677,7 @@ <spring42-version>4.2.9.RELEASE</spring42-version> <spring43-version>4.3.10.RELEASE</spring43-version> <spring4-version>4.3.10.RELEASE</spring4-version> - <spring5-version>5.0.0.RC3</spring5-version> + <spring5-version>5.0.0.RC4</spring5-version> <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>4.2.3.RELEASE</spring-security-version> <spring-security-bundle-version>4.2.3.RELEASE_1</spring-security-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index b525928..9caa6dc 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -193,6 +193,10 @@ <name>itest.springboot.mavenOfflineResolution</name> <value>false</value> </property> + <property> + <name>itest.springboot.springBootVersion</name> + <value>${spring-boot-version}</value> + </property> </systemProperties> </configuration> @@ -218,49 +222,6 @@ <profile> <id>spring-boot2</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <childDelegation>false</childDelegation> - <forkedProcessTimeoutInSeconds>15000</forkedProcessTimeoutInSeconds> - <rerunFailingTestsCount>1</rerunFailingTestsCount> - <includes> - <include>**/*Test.java</include> - </includes> - <systemProperties> - <!-- Test configuration --> - <!-- - It is better disabling unit testing in surefire, as some of them fail for various reasons - (unrelated to spring-boot) when running in the arquillian jar. - - Tests are enabled when running from IDE. See org.apache.camel.itest.springboot.ITestConfigBuilder - for property names and defaults values. - --> - <property> - <name>itest.springboot.unitTestEnabled</name> - <value>false</value> - </property> - <property> - <name>itest.springboot.includeTestDependencies</name> - <value>true</value> - </property> - <property> - <name>itest.springboot.mavenOfflineResolution</name> - <value>false</value> - </property> - <!-- Adding spring-boot version --> - <property> - <name>itest.springboot.springBootMajorVersion</name> - <value>2</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java ---------------------------------------------------------------------- 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 9c194e8..611c9a0 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 @@ -71,7 +71,7 @@ public class ITestConfig implements Serializable { private Map<String, String> testLibraryVersions; - private Integer springBootMajorVersion; + private String springBootVersion; public ITestConfig() { } @@ -252,12 +252,16 @@ public class ITestConfig implements Serializable { this.testLibraryVersions = testLibraryVersions; } + public String getSpringBootVersion() { + return springBootVersion; + } + public Integer getSpringBootMajorVersion() { - return springBootMajorVersion; + return Integer.parseInt(springBootVersion.substring(0, 1)); } - public void setSpringBootMajorVersion(Integer springBootMajorVersion) { - this.springBootMajorVersion = springBootMajorVersion; + public void setSpringBootVersion(String springBootVersion) { + this.springBootVersion = springBootVersion; } @Override @@ -285,7 +289,7 @@ public class ITestConfig implements Serializable { ", useCustomLog=" + useCustomLog + ", ignoreLibraryMismatch=" + ignoreLibraryMismatch + ", testLibraryVersions=" + testLibraryVersions + - ", springBootMajorVersion=" + springBootMajorVersion + + ", springBootVersion=" + springBootVersion + '}'; } } http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java index 614eac7..1b529d8 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java @@ -165,8 +165,8 @@ public class ITestConfigBuilder { return this; } - public ITestConfigBuilder springBootMajorVersion(Integer springBootMajorVersion) { - config.setSpringBootMajorVersion(springBootMajorVersion); + public ITestConfigBuilder springBootVersion(String springBootVersion) { + config.setSpringBootVersion(springBootVersion); return this; } @@ -258,8 +258,8 @@ public class ITestConfigBuilder { config.setTestLibraryVersions(new HashMap<>()); } - if (config.getSpringBootMajorVersion() == null) { - config.setSpringBootMajorVersion(integerPropertyOr("springBootMajorVersion", 1)); + if (config.getSpringBootVersion() == null) { + config.setSpringBootVersion(propertyOr("springBootVersion", null)); } return config; http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java index 17c45c7..ae838cb 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCassandraqlTest.java @@ -36,13 +36,7 @@ public class CamelCassandraqlTest extends AbstractSpringBootTestSupport { public static ITestConfig createTestConfig() { return new ITestConfigBuilder() .module(inferModuleName(CamelCassandraqlTest.class)) - .dependency("io.netty:netty-all:" + DependencyResolver.resolveParentProperty("${cassandra-netty-version-testing}")) - //.dependency(DependencyResolver.withVersion("io.netty:netty-all")) -// .dependency(DependencyResolver.withVersion("io.dropwizard.metrics:metrics-core")) -// .exclusion("com.codahale.metrics:*") .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|CassandraComponentProducerTest$|CassandraComponentBeanRefTest$|CassandraComponentConsumerTest$)") - //.unitTestInclusionPattern(".*NamedCassandraAggregationRepositoryTest$") - // excluded tests have been checked manually (they need to run on their own JVM) .build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java ---------------------------------------------------------------------- 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 56b89e6..7cdc03a 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 @@ -300,8 +300,11 @@ public final class ArquillianPackager { ignore.add("com.github.jnr"); ignore.add("com.sun.xml.bind:jaxb-xjc"); ignore.add("commons-beanutils:commons-beanutils"); + ignore.add("io.dropwizard.metrics:metrics-json"); // PR to spring-boot + ignore.add("io.dropwizard.metrics:metrics-jvm"); // PR to spring-boot ignore.add("io.fabric8:kubernetes-"); ignore.add("io.netty:netty:jar"); // an old version + ignore.add("io.netty:netty-tcnative-boringssl-static"); ignore.add("io.swagger:swagger-parser"); ignore.add("org.apache.commons"); ignore.add("org.apache.curator"); @@ -309,19 +312,27 @@ public final class ArquillianPackager { ignore.add("org.apache.geronimo.specs"); ignore.add("org.apache.maven"); ignore.add("org.apache.parquet"); + ignore.add("org.apache.solr:solr-solrj"); // PR to spring-boot ignore.add("org.apache.velocity"); ignore.add("org.apache.qpid:qpid-jms-client"); ignore.add("org.opensaml"); ignore.add("org.ow2.asm"); // No problem ignore.add("org.codehaus.plexus"); + ignore.add("org.eclipse.jetty.websocket:websocket-api"); // PR to spring-boot + ignore.add("org.infinispan"); ignore.add("org.jboss.arquillian.container"); + ignore.add("org.jboss.logging"); + ignore.add("org.jboss.marshalling"); ignore.add("org.jboss:"); ignore.add("org.hibernate:hibernate-validator"); // does not match with hibernate-core ignore.add("org.mortbay.jetty:servlet-api-2.5"); ignore.add("org.scala-lang:scala-compiler"); + ignore.add("org.slf4j:slf4j-ext"); // PR to spring-boot ignore.add("org.easytesting"); + ignore.add("net.java.dev.jna:jna-platform"); // PR to spring-boot ignore.add("net.openhft"); ignore.add("net.sourceforge.htmlunit:htmlunit-core-js"); // v 2.21 does not exist + ignore.add("org.springframework.cloud"); // too many different versions ignore.add("org.springframework.data"); ignore.add("org.springframework.security:spring-security-jwt"); ignore.add("org.springframework.security:spring-security-rsa"); @@ -329,9 +340,8 @@ public final class ArquillianPackager { ignore.add("org.webjars"); // No problem ignore.add("stax:stax-api"); ignore.add("xml-apis:xml-apis-ext"); - ignore.add("org.infinispan"); - ignore.add("org.jboss.logging"); - ignore.add("org.jboss.marshalling"); + + Map<String, Map<String, String>> status = new TreeMap<>(); Set<String> mismatches = new TreeSet<>(); @@ -487,6 +497,8 @@ public final class ArquillianPackager { pom = pom.replace(property, resolvedProperties.get(property)); } + + pom = pom.replace("#{module}", config.getModuleName()); File pomFile = new File(config.getModuleBasePath() + "/target/itest-spring-boot-pom.xml"); @@ -577,22 +589,28 @@ public final class ArquillianPackager { String groupId = textBetween(dependencyXml, "<groupId>", "</groupId>"); String artifactId = textBetween(dependencyXml, "<artifactId>", "</artifactId>"); - String bomVersion = config.getTestLibraryVersions().get(groupId + ":" + artifactId); - if (bomVersion == null) { - bomVersion = BOMResolver.getInstance().getBOMVersion(groupId, artifactId); + String version = config.getTestLibraryVersions().get(groupId + ":" + artifactId); + boolean stripVersion = false; + if (version == null) { + boolean testsLib = dependencyXml.contains("<classifier>tests"); + stripVersion = !testsLib && BOMResolver.getInstance(config).getBOMVersion(groupId, artifactId) != null; } - if (bomVersion != null) { + if (version != null) { if (dependencyXml.contains("<version>")) { int from = dependencyXml.indexOf("<version>") + 9; int to = dependencyXml.indexOf("</version>"); - dependencyXml = dependencyXml.substring(0, from) + bomVersion + dependencyXml.substring(to); + dependencyXml = dependencyXml.substring(0, from) + version + dependencyXml.substring(to); } else { String kw = "</artifactId>"; int pos = dependencyXml.indexOf(kw) + kw.length(); - dependencyXml = dependencyXml.substring(0, pos) + "<version>" + bomVersion + "</version>" + dependencyXml.substring(pos); + dependencyXml = dependencyXml.substring(0, pos) + "<version>" + version + "</version>" + dependencyXml.substring(pos); } + } else if (stripVersion && dependencyXml.contains("<version>")) { + int from = dependencyXml.indexOf("<version>"); + int to = dependencyXml.indexOf("</version>") + 10; + dependencyXml = dependencyXml.substring(0, from) + dependencyXml.substring(to); } return dependencyXml; http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/BOMResolver.java ---------------------------------------------------------------------- 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 8ffaea5..be0531a 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 @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.apache.camel.itest.springboot.ITestConfig; import org.apache.commons.io.FileUtils; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.eclipse.aether.DefaultRepositorySystemSession; @@ -43,6 +44,7 @@ import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.impl.DefaultServiceLocator; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactDescriptorException; import org.eclipse.aether.resolution.ArtifactDescriptorRequest; import org.eclipse.aether.resolution.ArtifactDescriptorResult; import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; @@ -58,13 +60,16 @@ public final class BOMResolver { private static final File CACHE_FILE = LocationUtils.camelRoot("tests/camel-itest-spring-boot/target/bom-versions-cache"); - private static final BOMResolver INSTANCE = new BOMResolver(); + private static BOMResolver INSTANCE; + + private ITestConfig config; private Map<String, String> versions; @SuppressWarnings("unchecked") - private BOMResolver() { + private BOMResolver(ITestConfig config) { try { + this.config = config; cleanupLocalRepo(); if (canUseCache()) { @@ -107,19 +112,21 @@ public final class BOMResolver { String camelVersion = DependencyResolver.resolveCamelParentProperty("${project.version}"); List<Artifact> neededArtifacts = new LinkedList<>(); - neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel:pom:" - + camelVersion).setFile(camelRoot("pom.xml"))); - neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-parent:pom:" - + camelVersion).setFile(camelRoot("parent/pom.xml"))); + Artifact camelRoot = new DefaultArtifact("org.apache.camel:camel:pom:" + + camelVersion).setFile(camelRoot("pom.xml")); + neededArtifacts.add(camelRoot); + Artifact camelParent = new DefaultArtifact("org.apache.camel:camel-parent:pom:" + + camelVersion).setFile(camelRoot("parent/pom.xml")); + neededArtifacts.add(camelParent); neededArtifacts.add(new DefaultArtifact("org.apache.camel:spring-boot:pom:" + camelVersion).setFile(camelRoot("platforms/spring-boot/pom.xml"))); neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dm:pom:" + camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/pom.xml"))); neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dependencies:pom:" + camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml"))); - Artifact camelSpringBootParent = new DefaultArtifact("org.apache.camel:camel-starter-parent:pom:" + Artifact camelStarterParent = new DefaultArtifact("org.apache.camel:camel-starter-parent:pom:" + camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml")); - neededArtifacts.add(camelSpringBootParent); + neededArtifacts.add(camelStarterParent); RemoteRepository localRepoDist = new RemoteRepository.Builder("org.apache.camel.itest.springboot", "default", new File(LOCAL_REPO).toURI().toString()).build(); @@ -131,22 +138,34 @@ public final class BOMResolver { system.deploy(session, deployRequest); } - RemoteRepository mavenCentral = new RemoteRepository.Builder("central", "default", "http://repo1.maven.org/maven2/").build(); RemoteRepository apacheSnapshots = new RemoteRepository.Builder("apache-snapshots", "default", "http://repository.apache.org/snapshots/").build(); - - ArtifactDescriptorRequest dReq = new ArtifactDescriptorRequest(camelSpringBootParent, Arrays.asList(localRepoDist, mavenCentral, apacheSnapshots), null); - ArtifactDescriptorResult dRes = system.readArtifactDescriptor(session, dReq); + RemoteRepository springMilestones = new RemoteRepository.Builder("spring-milestones", "default", "https://repo.spring.io/libs-milestone/").build(); this.versions = new TreeMap<>(); - for (Dependency dependency : dRes.getManagedDependencies()) { + + 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(); + String key = a.getGroupId() + ":" + a.getArtifactId(); + versions.put(key, dependency.getArtifact().getVersion()); + } + + 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); + ArtifactDescriptorResult springBootDependenciesRes = system.readArtifactDescriptor(session, springBootDependenciesReq); + for (Dependency dependency : springBootDependenciesRes.getManagedDependencies()) { Artifact a = dependency.getArtifact(); String key = a.getGroupId() + ":" + a.getArtifactId(); versions.put(key, dependency.getArtifact().getVersion()); } } - public static BOMResolver getInstance() { + public static BOMResolver getInstance(ITestConfig config) { + if (INSTANCE == null) { + INSTANCE = new BOMResolver(config); + } return INSTANCE; } http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java index 7b05ff0..5bd525e 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java @@ -85,6 +85,9 @@ public final class DependencyResolver { if (property != null && !isResolved(property)) { property = resolveCamelParentProperty(property); } + if (property != null && !isResolved(property)) { + property = resolveCamelProperty(property); + } return property; } @@ -106,6 +109,10 @@ public final class DependencyResolver { return resolveProperty(camelRoot("parent/pom.xml"), property, 0); } + public static String resolveCamelProperty(String property) { + return resolveProperty(camelRoot("pom.xml"), property, 0); + } + private static String resolveProperty(File pom, String property, int depth) { try { http://git-wip-us.apache.org/repos/asf/camel/blob/8033b30c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java index 4449592..10c7aaf 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java @@ -24,7 +24,7 @@ import org.jboss.shrinkwrap.impl.base.exporter.zip.ZipExporterImpl; import org.junit.Test; /** - * Utililty to export a spring-boot jar and check the content. + * Utility to export a spring-boot jar and check the content. */ public class JarExporter { @@ -32,7 +32,7 @@ public class JarExporter { public void exportJar() throws Exception { Archive<?> archive = ArquillianPackager.springBootPackage(new ITestConfigBuilder() - .module("camel-sjms2") + .module("camel-websocket") .build()); new ZipExporterImpl(archive).exportTo(new File("target/export.zip"), true);
