Repository: camel Updated Branches: refs/heads/master 749f99206 -> 64b16bd2c
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64b16bd2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64b16bd2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64b16bd2 Branch: refs/heads/master Commit: 64b16bd2c256bd0a0d6c195893368b1d639c211e Parents: 749f992 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 3 13:24:30 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 3 13:24:30 2017 +0200 ---------------------------------------------------------------------- .../camel/itest/springboot/util/BOMResolver.java | 18 ++++++++++++------ .../test/resources/components/cache-ehcache.xml | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/64b16bd2/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 7fd76df..8ffaea5 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 @@ -107,12 +107,18 @@ 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"))); - 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(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: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/64b16bd2/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml b/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml index 0d16ddd..dda12a2 100644 --- a/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml +++ b/tests/camel-itest-spring-boot/src/test/resources/components/cache-ehcache.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more
