You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/19 15:46:55 UTC
[1/2] camel git commit: CAMEL-9725: Polished example a bit.
Repository: camel
Updated Branches:
refs/heads/master 420176383 -> 02a652da3
CAMEL-9725: Polished example a bit.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/975ffb2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/975ffb2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/975ffb2b
Branch: refs/heads/master
Commit: 975ffb2bbc6759ab0f974dfe005071b9a27be618
Parents: 4201763
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 19 09:05:05 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 19 09:05:05 2016 +0100
----------------------------------------------------------------------
examples/camel-example-cdi-osgi/README.md | 4 ++--
examples/camel-example-cdi-osgi/pom.xml | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/975ffb2b/examples/camel-example-cdi-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-osgi/README.md b/examples/camel-example-cdi-osgi/README.md
index f1c6db6..2046cd4 100644
--- a/examples/camel-example-cdi-osgi/README.md
+++ b/examples/camel-example-cdi-osgi/README.md
@@ -62,7 +62,7 @@ To run the example, from the command line:
```sh
karaf@root()> chooseurl camel 2.17.0
- karaf@root()> chooseurl activemq 5.12.1
+ karaf@root()> chooseurl activemq 5.13.2
karaf@root()> features:install activemq-broker-noweb pax-cdi-weld camel-sjms camel-cdi
```
@@ -78,7 +78,7 @@ Alternatively, with the new commands introduced since Karaf 3.x:
```sh
karaf@root()> repo-add camel 2.17.0
- karaf@root()> repo-add activemq 5.12.1
+ karaf@root()> repo-add activemq 5.13.2
karaf@root()> feature:install activemq-broker-noweb pax-cdi-weld camel-sjms camel-cdi
```
http://git-wip-us.apache.org/repos/asf/camel/blob/975ffb2b/examples/camel-example-cdi-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml
index ea217cc..e528870 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -120,6 +120,7 @@
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>2.1.1</version>
+ <scope>test</scope>
</dependency>
<!-- Karaf & Command Shell -->
@@ -140,6 +141,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
<version>${karaf4-version}</version>
+ <scope>test</scope>
</dependency>
<!-- Karaf Camel commands -->
@@ -150,8 +152,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -184,12 +190,6 @@
<classifier>features</classifier>
<type>xml</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
[2/2] camel git commit: Upgrade swagger
Posted by da...@apache.org.
Upgrade swagger
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02a652da
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02a652da
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02a652da
Branch: refs/heads/master
Commit: 02a652da3e52be74ee0ba4262b90e09f1cbe22ca
Parents: 975ffb2
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 19 15:46:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 19 15:46:48 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/02a652da/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a6d650..54a3789 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -536,7 +536,7 @@
<swagger-scala-version>1.3.12</swagger-scala-version>
<swagger-scala-guava-version>15.0</swagger-scala-guava-version>
<swagger-scala-bundle-version>1.3.12_1</swagger-scala-bundle-version>
- <swagger-java-version>1.5.7</swagger-java-version>
+ <swagger-java-version>1.5.8</swagger-java-version>
<swagger-java-guava-version>18.0</swagger-java-guava-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>