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 2017/04/13 07:48:21 UTC
[1/5] camel git commit: CAMEL-11130: camel-websocket - Fix itest in
camel-itest-karaf
Repository: camel
Updated Branches:
refs/heads/master 5e9bd7383 -> f8e590c67
CAMEL-11130: camel-websocket - Fix itest in camel-itest-karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8e590c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8e590c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8e590c6
Branch: refs/heads/master
Commit: f8e590c6733b86ca805725189234531bb4e1d8a2
Parents: 6ea3868
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 13:17:50 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8e590c6/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 5e1a7ef..19a39c7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1992,6 +1992,11 @@
<feature name='camel-websocket' version='${project.version}' resolver='(obr)' start-level='50'>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-api/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-common/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-client/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-server/${jetty-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle>
</feature>
[2/5] camel git commit: CAMEL-11130: camel-linkedin - Fix itest in
camel-itest-karaf
Posted by da...@apache.org.
CAMEL-11130: camel-linkedin - Fix itest in camel-itest-karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/926dfd2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/926dfd2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/926dfd2c
Branch: refs/heads/master
Commit: 926dfd2c060702e8258c318d2cd26fa700cfa23a
Parents: d12cbbd
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 12:08:44 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/926dfd2c/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index f82fb6f..61abd4c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1170,6 +1170,9 @@
<feature version='${cxf-version-range}'>cxf-core</feature>
<feature version='${cxf-version-range}'>cxf-jaxrs</feature>
<feature version='${cxf-version-range}'>cxf-http-jetty</feature>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-api/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-common/${jetty-version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty.websocket/websocket-client/${jetty-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
[5/5] camel git commit: CAMEL-11130: camel-juel - Fix itest in
camel-itest-karaf
Posted by da...@apache.org.
CAMEL-11130: camel-juel - Fix itest in camel-itest-karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d12cbbd2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d12cbbd2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d12cbbd2
Branch: refs/heads/master
Commit: d12cbbd27b7e831613b56b9eeb2003d1b2b9162c
Parents: e214df4
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 12:04:57 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d12cbbd2/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index cada7e2..f82fb6f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1110,6 +1110,8 @@
<feature name='camel-juel' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>war</feature>
+ <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el-api-version}</bundle>
+ <bundle dependency='true'>mvn:org.glassfish.web/javax.el/${javax.el-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${project.version}</bundle>
</feature>
[3/5] camel git commit: CAMEL-11130: Make run-tests.sh also use
kill-karaf.sh
Posted by da...@apache.org.
CAMEL-11130: Make run-tests.sh also use kill-karaf.sh
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e214df4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e214df4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e214df4c
Branch: refs/heads/master
Commit: e214df4cbf7c8a4c0a6776c0141db649aed3cf3d
Parents: 5e9bd73
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 11:30:56 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
tests/camel-itest-karaf/run-tests.sh | 2 +-
tests/camel-itest-osgi/run-tests.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e214df4c/tests/camel-itest-karaf/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/run-tests.sh b/tests/camel-itest-karaf/run-tests.sh
index 39a4657..83a772b 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -69,6 +69,6 @@ do
exit 1;
fi
echo "Killing Karaf to ensure no dangling karaf running"
- jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
+ ./kill-karaf.sh
fi
done
http://git-wip-us.apache.org/repos/asf/camel/blob/e214df4c/tests/camel-itest-osgi/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/run-tests.sh b/tests/camel-itest-osgi/run-tests.sh
index a865370..7916870 100755
--- a/tests/camel-itest-osgi/run-tests.sh
+++ b/tests/camel-itest-osgi/run-tests.sh
@@ -69,6 +69,6 @@ do
exit 1;
fi
echo "Killing Karaf to ensure no dangling karaf running"
- jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
+ ./kill-karaf.sh
fi
done
[4/5] camel git commit: CAMEL-11130: camel-protobuf - Fix itest in
camel-itest-karaf
Posted by da...@apache.org.
CAMEL-11130: camel-protobuf - Fix itest in camel-itest-karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ea38689
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ea38689
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ea38689
Branch: refs/heads/master
Commit: 6ea3868941d42164b07ca83537bea5325164b258
Parents: 926dfd2
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 12:33:35 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6ea38689/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 61abd4c..5e1a7ef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1455,6 +1455,10 @@
<feature name='camel-protobuf' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${protobuf-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle>
</feature>
<feature name='camel-quartz' version='${project.version}' resolver='(obr)' start-level='50'>