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/12/08 09:48:27 UTC
camel git commit: Upgraded deltaspike
Repository: camel
Updated Branches:
refs/heads/master 1318153dc -> c00bc44d1
Upgraded deltaspike
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c00bc44d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c00bc44d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c00bc44d
Branch: refs/heads/master
Commit: c00bc44d12972bd99fec89e3c29a93b972f44f6e
Parents: 1318153
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 8 09:48:18 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 8 09:48:18 2014 +0100
----------------------------------------------------------------------
.../test/java/org/apache/camel/cdi/support/CdiConfigFile.java | 7 ++++++-
parent/pom.xml | 2 +-
.../org/apache/camel/itest/cdi/properties/Camel1Config.java | 7 ++++++-
.../org/apache/camel/itest/cdi/properties/Camel2Config.java | 5 +++++
4 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c00bc44d/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CdiConfigFile.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CdiConfigFile.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CdiConfigFile.java
index 7c6326c..e50418a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CdiConfigFile.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/support/CdiConfigFile.java
@@ -29,6 +29,11 @@ public class CdiConfigFile implements PropertyFileConfig {
@Override
public String getPropertyFileName() {
return "META-INF/camel.properties";
- };
+ }
+
+ @Override
+ public boolean isOptional() {
+ return false;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c00bc44d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ed14b9c..dc2c541 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -118,7 +118,7 @@
<cxf-version>3.0.2</cxf-version>
<cxf-version-range>[2.7,4.0)</cxf-version-range>
<cxf-xjc-utils-version>3.0.2</cxf-xjc-utils-version>
- <deltaspike-version>1.1.0</deltaspike-version>
+ <deltaspike-version>1.2.0</deltaspike-version>
<derby-version>10.10.2.0</derby-version>
<disruptor-version>3.3.0</disruptor-version>
<dnsjava-version>2.1.6</dnsjava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/c00bc44d/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
index e9d3432..dcc1a03 100644
--- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
+++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
@@ -28,6 +28,11 @@ public class Camel1Config implements PropertyFileConfig {
@Override
public String getPropertyFileName() {
return "camel1.properties";
- };
+ }
+
+ @Override
+ public boolean isOptional() {
+ return false;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c00bc44d/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
index 0446757..db03ff6 100644
--- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
+++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
@@ -30,4 +30,9 @@ public class Camel2Config implements PropertyFileConfig {
return "camel2.properties";
};
+ @Override
+ public boolean isOptional() {
+ return false;
+ }
+
}
\ No newline at end of file