You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/09/11 14:03:33 UTC

[1/2] camel git commit: Upgrade Weld to version 2.4.5.Final

Repository: camel
Updated Branches:
  refs/heads/master c7e190dcd -> c89fa946e


Upgrade Weld to version 2.4.5.Final


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c89fa946
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c89fa946
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c89fa946

Branch: refs/heads/master
Commit: c89fa946ed7add0343b9c758d65cac58e5304afb
Parents: dc487b6
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Sep 11 16:02:37 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Sep 11 16:03:17 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c89fa946/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 709c817..374ba3f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -698,7 +698,7 @@
     <vertx-version>3.4.2</vertx-version>
     <vysper-version>0.7</vysper-version>
     <weld1-version>1.1.28.Final</weld1-version>
-    <weld2-version>2.4.4.Final</weld2-version>
+    <weld2-version>2.4.5.Final</weld2-version>
     <weld3-version>3.0.1.Final</weld3-version>
     <werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
     <wiremock-version>2.7.1</wiremock-version>


[2/2] camel git commit: CAMEL-11770 - spring-boot examples - Should not import camel-parent

Posted by ac...@apache.org.
CAMEL-11770 - spring-boot examples - Should not import camel-parent


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc487b68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc487b68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc487b68

Branch: refs/heads/master
Commit: dc487b685c1b980fa38abea93bb646244ee49b05
Parents: c7e190d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Sep 11 16:01:42 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Sep 11 16:03:17 2017 +0200

----------------------------------------------------------------------
 examples/camel-example-spring-boot-geocoder/pom.xml   |  2 +-
 .../hello-camel-grpc-client/pom.xml                   | 14 +++++++-------
 examples/camel-example-spring-boot-infinispan/pom.xml |  2 +-
 .../camel-example-spring-boot-rest-swagger/pom.xml    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dc487b68/examples/camel-example-spring-boot-geocoder/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-geocoder/pom.xml b/examples/camel-example-spring-boot-geocoder/pom.xml
index 4c2e1bc..504e6e7 100644
--- a/examples/camel-example-spring-boot-geocoder/pom.xml
+++ b/examples/camel-example-spring-boot-geocoder/pom.xml
@@ -48,7 +48,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/dc487b68/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
index 58940ec..720ad3f 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
@@ -38,13 +38,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.camel</groupId>
-				<artifactId>camel-parent</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
+                        <dependency>
+                                <groupId>org.apache.camel</groupId>
+                                <artifactId>camel-spring-boot-dependencies</artifactId>
+                                <version>${project.version}</version>
+                                <type>pom</type>
+                                <scope>import</scope>
+                        </dependency>
 		</dependencies>
 	</dependencyManagement>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/dc487b68/examples/camel-example-spring-boot-infinispan/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-infinispan/pom.xml b/examples/camel-example-spring-boot-infinispan/pom.xml
index 9afea3c..fe708d7 100644
--- a/examples/camel-example-spring-boot-infinispan/pom.xml
+++ b/examples/camel-example-spring-boot-infinispan/pom.xml
@@ -48,7 +48,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/dc487b68/examples/camel-example-spring-boot-rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml b/examples/camel-example-spring-boot-rest-swagger/pom.xml
index 20fc4da..08884ab 100644
--- a/examples/camel-example-spring-boot-rest-swagger/pom.xml
+++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml
@@ -48,7 +48,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>