Repository: camel Updated Branches: refs/heads/master bee13d290 -> a15cbb47d
http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml deleted file mode 100644 index 13befd0..0000000 --- a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml +++ /dev/null @@ -1,294 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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 - - http://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. ---> -<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/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>camel-spring-boot-dm</artifactId> - <groupId>org.apache.camel</groupId> - <version>2.19.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-spring-boot-generator-bom</artifactId> - <packaging>pom</packaging> - <name>Camel :: Spring-Boot :: Dependency Management :: BOM Generator</name> - <description>Camel Spring-Boot BOM Generator</description> - - <dependencyManagement> - - <dependencies> - - <!-- Additional libraries related to Avro (version from Camel) --> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <version>${avro-version}</version> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-mapred</artifactId> - <classifier>hadoop2</classifier> - <version>${avro-version}</version> - </dependency> - - - <!-- Add a uniform jackson 1 (version from Camel) --> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson-version}</version> - </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> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-client</artifactId> - <version>${hazelcast-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - <version>${slf4j-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna-platform</artifactId> - <version>${jna-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <!-- Seems that htmlunit 2.21 is not present in Maven central --> - <!--<dependency>--> - <!--<groupId>net.sourceforge.htmlunit</groupId>--> - <!--<artifactId>htmlunit-core-js</artifactId>--> - <!--<version>${htmlunit-version}</version>--> - <!--</dependency>--> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-rewrite</artifactId> - <version>${jetty-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-api</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-common</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> - <version>${jetty-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by Spring-boot --> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_2.11</artifactId> - <version>${scala-jackson2-version}</version> - </dependency> - - - <!-- Dependencies from Camel parent at the end --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-parent</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>bom-generator-maven-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <checkConflicts> - <boms> - <bom> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> - </bom> - <!-- Other BOMs imported by SB should be listed explicitly --> - <bom> - <groupId>org.springframework</groupId> - <artifactId>spring-framework-bom</artifactId> - <version>${spring-version}</version> - </bom> - <bom> - <groupId>org.springframework.data</groupId> - <artifactId>spring-data-releasetrain</artifactId> - <version>${spring-data-releasetrain-version}</version> - </bom> - <bom> - <groupId>org.springframework.integration</groupId> - <artifactId>spring-integration-bom</artifactId> - <version>${spring-integration-version}</version> - </bom> - <bom> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-bom</artifactId> - <version>${spring-security-version}</version> - </bom> - </boms> - </checkConflicts> - <dependencies> - <includes> - <include>*:*</include> - </includes> - <excludes> - - <!-- These artifacts should not be included in the final (generated) BOM --> - - <!-- Different versions from the ones provided by spring-boot --> - <exclude>de.flapdoodle*:*</exclude> - <exclude>org.apache.activemq:*</exclude> - <exclude>org.apache.commons:commons-pool2</exclude> - <exclude>org.apache.httpcomponents:httpasyncclient</exclude> - <exclude>org.apache.httpcomponents:httpclient</exclude> - <exclude>org.apache.httpcomponents:httpclient-cache</exclude> - <exclude>org.apache.httpcomponents:httpclient-osgi</exclude> - <exclude>org.apache.httpcomponents:httpcore</exclude> - <exclude>org.apache.httpcomponents:httpmime</exclude> - <exclude>org.apache.derby:derby</exclude> - <exclude>org.apache.logging.log4j:*</exclude> - <exclude>org.cassandraunit:*</exclude> - <exclude>org.codehaus.groovy:*</exclude> - <exclude>org.hibernate:hibernate-entitymanager</exclude> - <exclude>org.hsqldb:*</exclude> - <exclude>org.mockito:*</exclude> - - <exclude>org.slf4j:jul-to-slf4j</exclude> - <exclude>org.slf4j:log4j-over-slf4j</exclude> - <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> - <exclude>org.slf4j:slf4j-simple</exclude> - - <exclude>org.springframework*:*</exclude> - - <exclude>commons-codec:*</exclude> - <exclude>commons-collections:*</exclude> - <exclude>commons-dbcp:*</exclude> - <exclude>commons-pool:*</exclude> - - <exclude>com.github.ben-manes.caffeine:caffeine</exclude> - <exclude>com.datastax.cassandra:*</exclude> - - <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude> - <exclude>com.fasterxml.jackson.core:jackson-core</exclude> - <exclude>com.fasterxml.jackson.core:jackson-databind</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-smile</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</exclude> - <exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-jaxrs</exclude> - <exclude>com.fasterxml.jackson.datatype:jackson-datatype-joda</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</exclude> - <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</exclude> - <exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</exclude> - - <exclude>com.google.code.gson:*</exclude> - <exclude>javax.servlet:javax.servlet-api</exclude> - <exclude>junit:*</exclude> - <exclude>net.sf.ehcache:ehcache</exclude> - - <exclude>xml-apis:*</exclude> - - <!-- Different versions required by some modules --> - <exclude>com.google.inject:*</exclude> - <exclude>com.google.guava:*</exclude> - <exclude>io.netty*:*</exclude> - <exclude>org.scala-lang:*</exclude> - <exclude>org.apache.lucene:*</exclude> - - - <!-- Unrelated --> - <exclude>org.apache.servicemix.bundles:*</exclude> - <exclude>org.ops4j.pax*:*</exclude> - <exclude>org.codehaus.mojo:*</exclude> - <exclude>org.apache.servicemix:*</exclude> - <exclude>org.apache.aries.blueprint:*</exclude> - <exclude>org.apache.felix:*</exclude> - <exclude>org.apache.maven.archetype:*</exclude> - <exclude>org.osgi:*</exclude> - - <!-- Unuseful --> - <exclude>org.springframework:springloaded</exclude> - <exclude>com.zaxxer:HikariCP-java6</exclude> - </excludes> - </dependencies> - - <sourcePom>${basedir}/src/main/resources/target-template-pom.xml</sourcePom> - <targetPom>${basedir}/../camel-spring-boot-dependencies/pom.xml</targetPom> - </configuration> - - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml b/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml deleted file mode 100644 index 9ef2068..0000000 --- a/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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 - - http://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. ---> -<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/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>camel-spring-boot-dm</artifactId> - <groupId>org.apache.camel</groupId> - <version>${project.version}</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-spring-boot-dependencies</artifactId> - <packaging>pom</packaging> - <name>Camel :: Spring-Boot :: Dependency Management :: BOM</name> - <description>Camel Spring-Boot BOM</description> - - <dependencyManagement> - <dependencies> - <!-- To be filled in --> - </dependencies> - </dependencyManagement> - - <!-- Force the reactor build order --> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-generator-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - </dependencies> - -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/spring-boot-dm/camel-starter-parent/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/camel-starter-parent/pom.xml b/spring-boot-dm/camel-starter-parent/pom.xml deleted file mode 100644 index 259ae70..0000000 --- a/spring-boot-dm/camel-starter-parent/pom.xml +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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 - - http://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. ---> -<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/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>camel-spring-boot-dm</artifactId> - <groupId>org.apache.camel</groupId> - <version>2.19.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-starter-parent</artifactId> - <packaging>pom</packaging> - <name>Camel :: Spring-Boot :: Dependency Management :: Starter Parent</name> - <description>Camel Spring-Boot Starters Parent POM</description> - - <dependencies> - <!-- Dependencies added for all starters --> - - <!-- Logback is the default logging implementation in spring-boot but it doesn't provide the log4j2 binding --> - <!-- Not a problem for now --> - <!--<dependency>--> - <!--<groupId>org.apache.logging.log4j</groupId>--> - <!--<artifactId>log4j-to-slf4j</artifactId>--> - <!--<version>${log4j2-version}</version>--> - <!--</dependency>--> - - <!-- Force the reactor build order --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-dependencies</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - - </dependencies> - - <dependencyManagement> - - <dependencies> - - <!-- The spring-boot dependencies will be used by end users, so it's ok to use it in the parent --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- What's in the user BOM is OK for the parent --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-dependencies</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- Testing --> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>${arquillian-version}</version> - <scope>test</scope> - </dependency> - - <!-- Forcing Hadoop in starters --> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop2-version}</version> - </dependency> - - <!-- Netty cannot be forced at the moment --> - - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-all</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-buffer</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-codec-http</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-codec</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-handler</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-transport-native-epoll</artifactId>--> - <!--<classifier>linux-x86_64</classifier>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-common</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-resolver</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>io.netty</groupId>--> - <!--<artifactId>netty-transport</artifactId>--> - <!--<version>${netty-version}</version>--> - <!--</dependency>--> - - </dependencies> - </dependencyManagement> - -</project> http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/spring-boot-dm/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/pom.xml b/spring-boot-dm/pom.xml deleted file mode 100644 index d0b0459..0000000 --- a/spring-boot-dm/pom.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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 - - http://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. ---> -<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/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>camel</artifactId> - <groupId>org.apache.camel</groupId> - <version>2.19.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>camel-spring-boot-dm</artifactId> - <packaging>pom</packaging> - - <name>Camel :: Spring-Boot :: Dependency Management</name> - <description>Camel Spring-Boot Dependency Management POM</description> - <modules> - <module>camel-spring-boot-generator-bom</module> - <module>camel-spring-boot-dependencies</module> - <module>camel-starter-parent</module> - </modules> - - <properties> - <!-- Spring-Boot target version --> - <spring-boot-version>1.4.1.RELEASE</spring-boot-version> - - <!-- The following dependencies should be aligned with the ones in standard camel parent --> - <avro-version>1.8.1</avro-version> - <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version> - <jackson-version>1.9.12</jackson-version> - - <egit-github-core-version>2.1.5</egit-github-core-version> - <google-guava-version>19.0</google-guava-version> - <lucene3-version>3.6.0</lucene3-version> - <scala-version>2.11.7</scala-version> - <scalaxml-version>1.0.4</scalaxml-version> - - <maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version> - <maven-checkstyle-version>6.17</maven-checkstyle-version> - - <arquillian-version>1.1.11.Final</arquillian-version> - <hadoop2-version>2.7.2</hadoop2-version> - - <!-- Custom dependency required by some modules --> - <ahc-netty-version>4.0.40.Final</ahc-netty-version> - <cassandra-netty-version-testing>4.0.37.Final</cassandra-netty-version-testing> - - <!-- The following versions should be aligned with the ones in spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of spring-boot) --> - <jackson2-version>2.8.3</jackson2-version> - <scala-jackson2-version>2.8.2</scala-jackson2-version> - <jetty9-version>9.3.11.v20160721</jetty9-version> - <jetty-version>${jetty9-version}</jetty-version> - <jna-version>4.2.2</jna-version> - <hazelcast-version>3.6.5</hazelcast-version> - <htmlunit-version>2.21</htmlunit-version> - <log4j2-version>2.6.2</log4j2-version> - <slf4j-version>1.7.21</slf4j-version> - <spring-version>4.3.3.RELEASE</spring-version> - <spring-data-releasetrain-version>Hopper-SR3</spring-data-releasetrain-version> - <spring-integration-version>4.3.2.RELEASE</spring-integration-version> - <spring-security-version>4.1.3.RELEASE</spring-security-version> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${maven-checkstyle-plugin-version}</version> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-buildtools</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>${maven-checkstyle-version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <configuration> - <includeResources>false</includeResources> - <configLocation>camel-checkstyle.xml</configLocation> - <consoleOutput>true</consoleOutput> - <failsOnError>true</failsOnError> - <linkXRef>false</linkXRef> - <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation> - <encoding>UTF-8</encoding> - <sourceDirectory>${basedir}/src</sourceDirectory> - <excludes>**/archetype-resources/**/*.java</excludes> - </configuration> - <goals> - <goal>checkstyle</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin-version}</version> - <configuration> - <source>${jdk.version}</source> - <target>${jdk.version}</target> - <maxmem>512M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <attach>true</attach> - <source>${jdk.version}</source> - <quiet>true</quiet> - <bottom>Apache Camel</bottom> - <detectOfflineLinks>false</detectOfflineLinks> - <javadocVersion>${jdk.version}</javadocVersion> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/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 55e08af..4b86b33 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 @@ -81,7 +81,7 @@ public final class BOMResolver { } } catch (Exception e) { - throw new IllegalStateException("Cannot initialize the version resolver"); + throw new IllegalStateException("Cannot initialize the version resolver", e); } } @@ -109,9 +109,10 @@ public final class BOMResolver { 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"))); - neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dm:pom:" + camelVersion).setFile(camelRoot("spring-boot-dm/pom.xml"))); - neededArtifacts.add(new DefaultArtifact("org.apache.camel:camel-spring-boot-dependencies:pom:" + camelVersion).setFile(camelRoot("spring-boot-dm/camel-spring-boot-dependencies/pom.xml"))); - Artifact camelSpringBootParent = new DefaultArtifact("org.apache.camel:camel-starter-parent:pom:" + camelVersion).setFile(camelRoot("spring-boot-dm/camel-starter-parent/pom.xml")); + 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:" + camelVersion).setFile(camelRoot("platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml")); neededArtifacts.add(camelSpringBootParent); RemoteRepository localRepoDist = new RemoteRepository.Builder("org.apache.camel.itest.springboot", "default", new File(LOCAL_REPO).toURI().toString()).build(); http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/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 09311ae..7b05ff0 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 @@ -99,7 +99,7 @@ public final class DependencyResolver { } public static String resolveSpringBootParentProperty(String property) { - return resolveProperty(camelRoot("spring-boot-dm/pom.xml"), property, 0); + return resolveProperty(camelRoot("platforms/spring-boot/spring-boot-dm/pom.xml"), property, 0); } public static String resolveCamelParentProperty(String property) {
