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 2014/09/20 20:24:08 UTC
[1/3] git commit: CAMEL-7843: Upgrade to Karaf 2.4.0
Repository: camel
Updated Branches:
refs/heads/master 42fbf6779 -> a49627216
CAMEL-7843: Upgrade to Karaf 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f23934a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f23934a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f23934a1
Branch: refs/heads/master
Commit: f23934a18afec004cf1a71272617df991f1d79f8
Parents: 42fbf67
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 20 19:34:39 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 20 19:34:39 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java | 2 +-
.../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f23934a1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index be6230e..7b3b73c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -276,7 +276,7 @@
<jython-version>2.5.3</jython-version>
<kafka-version>0.8.1</kafka-version>
<kafka-bundle-version>0.8.1_1</kafka-bundle-version>
- <karaf-version>2.3.7</karaf-version>
+ <karaf-version>2.4.0</karaf-version>
<karaf3-version>3.0.1</karaf3-version>
<kie-version>6.1.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/f23934a1/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index c0d3687..2e7272d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -195,7 +195,7 @@ public abstract class AbstractFeatureTest {
}
if (karafVersion == null) {
// setup the default version of it
- karafVersion = "2.3.7";
+ karafVersion = "2.4.0";
}
return karafVersion;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f23934a1/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index b1061df..bf01f80 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -160,7 +160,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
}
if (karafVersion == null) {
// setup the default version of it
- karafVersion = "2.3.7";
+ karafVersion = "2.4.0";
}
return karafVersion;
}
[2/3] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44d366d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44d366d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44d366d0
Branch: refs/heads/master
Commit: 44d366d05431b77876a76cbe8d0eb1de2d3e4857
Parents: f23934a
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 20 19:34:58 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 20 19:34:58 2014 +0200
----------------------------------------------------------------------
etc/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/44d366d0/etc/pom.xml
----------------------------------------------------------------------
diff --git a/etc/pom.xml b/etc/pom.xml
index 9cc9967..72cdf79 100755
--- a/etc/pom.xml
+++ b/etc/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-etc</artifactId>
<packaging>pom</packaging>
- <name>Camel Etc</name>
+ <name>Camel :: Etc</name>
<description>Misc stuff</description>
<properties>
[3/3] git commit: CAMEL-7843: Upgrade to Karaf 2.4.0
Posted by da...@apache.org.
CAMEL-7843: Upgrade to Karaf 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a4962721
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a4962721
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a4962721
Branch: refs/heads/master
Commit: a49627216b0b5e711748e2a9d0d4cc542e75f96d
Parents: 44d366d
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 20 19:38:58 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 20 19:38:58 2014 +0200
----------------------------------------------------------------------
.../itest/osgi/http/HttpTypeConverterTest.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a4962721/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
index 5eb54cd..6df151d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
@@ -15,8 +15,10 @@
* limitations under the License.
*/
package org.apache.camel.itest.osgi.http;
+
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
@@ -111,6 +113,22 @@ public class HttpTypeConverterTest extends OSGiIntegrationTestSupport {
return null;
}
+ public String getHeader(String s) {
+ return null;
+ }
+
+ public Collection<String> getHeaderNames() {
+ return null;
+ }
+
+ public Collection<String> getHeaders(String s) {
+ return null;
+ }
+
+ public int getStatus() {
+ return 0;
+ }
+
public Locale getLocale() {
return null;
}
@@ -159,7 +177,7 @@ public class HttpTypeConverterTest extends OSGiIntegrationTestSupport {
Message message = new DefaultMessage();
message.setHeader(Exchange.HTTP_SERVLET_RESPONSE, servletResponse);
HttpServletResponse result = context.getTypeConverter().convertTo(HttpServletResponse.class, message);
- Assert.assertNotNull("The http conveter doesn't work", result);
+ Assert.assertNotNull("The http converter doesn't work", result);
}