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 2013/08/12 08:39:17 UTC
[1/2] git commit: Dependency upgrades
Updated Branches:
refs/heads/master 050ccf6f4 -> 7c066bf4e
Dependency upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10761f30
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10761f30
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10761f30
Branch: refs/heads/master
Commit: 10761f3026f548c3d3fc3163dcf9b2afe62a2245
Parents: 050ccf6
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 9 17:16:14 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 9 17:16:14 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/10761f30/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 89390df..0581ef3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -294,7 +294,7 @@
<mybatis-version>3.2.2</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.6.6.Final</netty3-version>
- <netty-version>4.0.6.Final</netty-version>
+ <netty-version>4.0.7.Final</netty-version>
<ode-version>1.3.4</ode-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.1.5</openwebbeans-version>
@@ -365,7 +365,7 @@
<spring-version-range>[3.1,3.3)</spring-version-range>
<spring-version>${spring32-version}</spring-version>
<spring31-version>3.1.4.RELEASE</spring31-version>
- <spring32-version>3.2.3.RELEASE</spring32-version>
+ <spring32-version>3.2.4.RELEASE</spring32-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>3.1.4.RELEASE</spring-security-version>
<spring-ws-version>2.1.3.RELEASE</spring-ws-version>
[2/2] git commit: CAMEL-4075: Added camel-quartz2 to the features
Posted by da...@apache.org.
CAMEL-4075: Added camel-quartz2 to the features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c066bf4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c066bf4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c066bf4
Branch: refs/heads/master
Commit: 7c066bf4e16acd4aeec8f46c41e34b0355b01431
Parents: 10761f3
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 12 08:39:14 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 12 08:39:14 2013 +0200
----------------------------------------------------------------------
components/camel-quartz2/pom.xml | 5 +++
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 6 +++
.../camel/itest/karaf/CamelQuartz2Test.java | 40 ++++++++++++++++++++
4 files changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c066bf4/components/camel-quartz2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index 61041bf..1c4e7bd 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -53,6 +53,11 @@
<artifactId>quartz</artifactId>
<version>${quartz2-version}</version>
</dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>${c3p0-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c066bf4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0581ef3..d1ef2fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -67,6 +67,7 @@
<bsh-version>2.0b5</bsh-version>
<bouncycastle-version>1.49</bouncycastle-version>
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
+ <c3p0-version>0.9.1.2</c3p0-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
<cglib-version>2.2</cglib-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c066bf4/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 f470ecb..4a54dab 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -727,6 +727,12 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${project.version}</bundle>
</feature>
+ <feature name='camel-quartz2' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>wrap:mvn:c3p0/c3p0/${c3p0-version}</bundle>
+ <bundle dependency='true'>mvn:org.quartz-scheduler/quartz/${quartz2-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-quartz2/${project.version}</bundle>
+ </feature>
<feature name='camel-quickfix' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c066bf4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
new file mode 100644
index 0000000..386217c
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
+@RunWith(JUnit4TestRunner.class)
+public class CamelQuartz2Test extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelQuartz2Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file