You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/09/20 12:50:23 UTC

[camel] branch CAMEL-13965 updated (edf02e6 -> b12e32b)

This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a change to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard edf02e6  CAMEL-13965: Fixed the build
     new b12e32b  CAMEL-13965: Fixed the build

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (edf02e6)
            \
             N -- N -- N   refs/heads/CAMEL-13965 (b12e32b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-test-spring-junit5/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[camel] 01/01: CAMEL-13965: Fixed the build

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b12e32b91fdb34a190b378986a98a1f0c265c105
Author: aldettinger <al...@gmail.com>
AuthorDate: Wed Sep 18 19:39:59 2019 +0200

    CAMEL-13965: Fixed the build
---
 components/camel-test-spring-junit5/pom.xml | 4 ++--
 components/pom.xml                          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/camel-test-spring-junit5/pom.xml b/components/camel-test-spring-junit5/pom.xml
index 9f50516..dc64f61 100644
--- a/components/camel-test-spring-junit5/pom.xml
+++ b/components/camel-test-spring-junit5/pom.xml
@@ -51,12 +51,12 @@
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-management-impl</artifactId>
+			<artifactId>camel-management</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/components/pom.xml b/components/pom.xml
index 6f512fc..1a0d396 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -67,6 +67,7 @@
         <module>camel-testcontainers</module>
         <module>camel-testcontainers-spring</module>
         <module>camel-test-junit5</module>
+        <module>camel-test-spring-junit5</module>
         <module>camel-blueprint</module>
         <module>camel-spring</module>
         <module>camel-groovy</module>