http://git-wip-us.apache.org/repos/asf/camel/blob/2292d2d7/spring-boot-dm/pom.xml ---------------------------------------------------------------------- diff --git a/spring-boot-dm/pom.xml b/spring-boot-dm/pom.xml index 179e5d0..444c699 100644 --- a/spring-boot-dm/pom.xml +++ b/spring-boot-dm/pom.xml @@ -31,7 +31,6 @@ <name>Camel :: Spring-Boot :: Dependency Management</name> <description>Camel Spring-Boot Dependency Management POM</description> <modules> - <module>camel-spring-boot-bom</module> <module>camel-spring-boot-generator-bom</module> <module>camel-spring-boot-dependencies</module> <module>camel-starter-parent</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/2292d2d7/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 2bde543..6986d03 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 @@ -78,13 +78,19 @@ public final class ArquillianPackager { */ private static final boolean DEBUG_ENABLED = false; - private static final String LIB_FOLDER = "/BOOT-INF/lib"; - private static final String CLASSES_FOLDER = "BOOT-INF/classes"; - + /** + * Configuration of the library checker. + */ private static final boolean FAIL_ON_TEST_LIBRARY_MISMATCH = false; private static final boolean FAIL_ON_RELATED_LIBRARY_MISMATCH = true; private static final boolean VERSION_EQUALITY_MINOR_VERSION = true; + /** + * Spring-boot 1.4+ packaging model + */ + private static final String LIB_FOLDER = "/BOOT-INF/lib"; + private static final String CLASSES_FOLDER = "BOOT-INF/classes"; + private ArquillianPackager() { } @@ -285,30 +291,32 @@ public final class ArquillianPackager { Set<String> ignore = new HashSet<>(); ignore.addAll(config.getIgnoreLibraryMismatch()); - ignore.add("org.apache.commons"); - ignore.add("commons-beanutils:commons-beanutils"); - ignore.add("io.netty:netty:jar"); // an old version - ignore.add("xml-apis:xml-apis-ext"); - ignore.add("org.scala-lang:scala-compiler"); - ignore.add("org.mortbay.jetty:servlet-api-2.5"); - ignore.add("org.apache.geronimo.specs"); - ignore.add("org.apache.qpid:qpid-jms-client"); + // A list of known libraries that don't follow the all-artifacts-same-version convention + ignore.add("com.atlassian.jira:jira-rest-java-client-api"); ignore.add("com.github.jnr"); - ignore.add("stax:stax-api"); - ignore.add("net.openhft"); - ignore.add("org.easytesting"); ignore.add("com.sun.xml.bind:jaxb-xjc"); - ignore.add("io.swagger:swagger-parser"); + ignore.add("commons-beanutils:commons-beanutils"); ignore.add("io.fabric8:kubernetes-"); + ignore.add("io.netty:netty:jar"); // an old version + ignore.add("io.swagger:swagger-parser"); + ignore.add("org.apache.commons"); + ignore.add("org.apache.curator"); + ignore.add("org.apache.cxf:cxf-api"); + ignore.add("org.apache.geronimo.specs"); ignore.add("org.apache.maven"); + ignore.add("org.apache.parquet"); + ignore.add("org.apache.velocity"); + ignore.add("org.apache.qpid:qpid-jms-client"); ignore.add("org.codehaus.plexus"); ignore.add("org.jboss.arquillian.container"); - ignore.add("org.apache.curator"); - ignore.add("org.apache.parquet"); + ignore.add("org.mortbay.jetty:servlet-api-2.5"); + ignore.add("org.scala-lang:scala-compiler"); + ignore.add("org.easytesting"); + ignore.add("net.openhft"); ignore.add("org.springframework.data"); - ignore.add("org.apache.velocity"); - ignore.add("org.apache.cxf:cxf-api"); - ignore.add("com.atlassian.jira:jira-rest-java-client-api"); + ignore.add("stax:stax-api"); + ignore.add("xml-apis:xml-apis-ext"); + Map<String, Map<String, String>> status = new TreeMap<>(); Set<String> mismatches = new TreeSet<>(); http://git-wip-us.apache.org/repos/asf/camel/blob/2292d2d7/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 ae31c66..b5f0036 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 @@ -39,7 +39,7 @@ import org.w3c.dom.NodeList; /** * Resolves the currently used version of a library. Useful to run unit tests directly from the IDE, without passing additional parameters. - * It resolves surefire properties. + * It resolves properties present in spring-boot and camel parent. */ public final class DependencyResolver {
