You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2014/09/11 18:29:23 UTC

[1/2] git commit: Add box osgi example to build

Repository: camel
Updated Branches:
  refs/heads/master 48f599e86 -> 43161eff5


Add box osgi example to build


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

Branch: refs/heads/master
Commit: a3d5c1c9414a274006ad2a1d6aa48578bd74bb13
Parents: 48f599e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 11 13:57:59 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 11 13:57:59 2014 -0230

----------------------------------------------------------------------
 examples/camel-example-box-osgi/pom.xml | 2 +-
 examples/pom.xml                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a3d5c1c9/examples/camel-example-box-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/pom.xml b/examples/camel-example-box-osgi/pom.xml
index 7ef0b24..2308b6f 100644
--- a/examples/camel-example-box-osgi/pom.xml
+++ b/examples/camel-example-box-osgi/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>examples</artifactId>
-    <version>2.14-SNAPSHOT</version>
+    <version>2.14.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-example-box-osgi</artifactId>

http://git-wip-us.apache.org/repos/asf/camel/blob/a3d5c1c9/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 9bcaced..0eb44fb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,6 +34,7 @@
     <module>camel-example-activemq-tomcat</module>
     <module>camel-example-aggregate</module>
     <module>camel-example-bam</module>
+    <module>camel-example-box-osgi</module>
     <module>camel-example-cafe</module>
     <module>camel-example-cdi</module>
     <module>camel-example-cxf</module>


[2/2] git commit: Fix SNAPSHOT version import

Posted by ja...@apache.org.
Fix SNAPSHOT version import


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

Branch: refs/heads/master
Commit: 43161eff52b0727c2a3fdb0b0900709bd35f0f7a
Parents: a3d5c1c
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 11 13:58:29 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 11 13:58:29 2014 -0230

----------------------------------------------------------------------
 components/camel-google-drive/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/43161eff/components/camel-google-drive/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index 5fdd61d..11c9a42 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -144,7 +144,7 @@
             <Export-Package>${componentPackage};version=${project.version}</Export-Package>
             <Import-Package>
               ${componentPackage};version=${project.version},
-              org.apache.camel.*;version=2.14-SNAPSHOT,
+              org.apache.camel.*;version=${project.version},
               *
             </Import-Package>
             <Private-Package>${outPackage}</Private-Package>