You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/21 04:20:06 UTC
[1/2] camel git commit: Resolve CAMEL-8679 Update Openshift Java
Client Version from 2.5.0.Final to 2.7.0.Final
Repository: camel
Updated Branches:
refs/heads/master b71382600 -> 5099168ca
Resolve CAMEL-8679 Update Openshift Java Client Version from 2.5.0.Final to 2.7.0.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5099168c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5099168c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5099168c
Branch: refs/heads/master
Commit: 5099168cac905b288743613e4a29852a13503bf2
Parents: 10d7f4d
Author: ancosen <an...@gmail.com>
Authored: Mon Apr 20 19:18:09 2015 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Apr 21 10:19:27 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/openshift/OpenShiftHelper.java | 2 +-
.../org/apache/camel/component/openshift/OpenShiftProducer.java | 2 +-
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5099168c/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftHelper.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftHelper.java
index 757ce0f..e05df38 100644
--- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftHelper.java
+++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftHelper.java
@@ -66,7 +66,7 @@ public final class OpenShiftHelper {
public static String getStateForApplication(IApplication application) {
for (IGearGroup group : application.getGearGroups()) {
for (IGear gear : group.getGears()) {
- String state = gear.getState().name().toLowerCase(Locale.ENGLISH);
+ String state = gear.getState().getState().toLowerCase(Locale.ENGLISH);
return state;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5099168c/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
index f4ddd68..cd35cf4 100644
--- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
+++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
@@ -140,7 +140,7 @@ public class OpenShiftProducer extends DefaultProducer {
sb.append("\n {");
sb.append("\n \"id\": \"" + gear.getId() + "\",");
sb.append("\n \"sshUrl\": \"" + gear.getSshUrl() + "\",");
- sb.append("\n \"state\": \"" + gear.getState().name().toLowerCase(Locale.ENGLISH) + "\"");
+ sb.append("\n \"state\": \"" + gear.getState().getState().toLowerCase(Locale.ENGLISH) + "\"");
sb.append("\n }");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5099168c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fff1670..a491f59 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -366,7 +366,7 @@
<oncrpc-version>1.1.2</oncrpc-version>
<openejb-version>4.6.0.2</openejb-version>
<openjpa-version>2.3.0</openjpa-version>
- <openshift-java-client-version>2.5.0.Final</openshift-java-client-version>
+ <openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
<optaplanner-version>6.2.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
[2/2] camel git commit: Resolve CAMEL-8677 Update iCal4j from version
1.5.0.2 to version 1.6.0
Posted by ni...@apache.org.
Resolve CAMEL-8677 Update iCal4j from version 1.5.0.2 to version 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10d7f4d5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10d7f4d5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10d7f4d5
Branch: refs/heads/master
Commit: 10d7f4d55fd819c2299381f601e813a49e5c2d59
Parents: b713826
Author: ancosen <an...@gmail.com>
Authored: Mon Apr 20 17:50:56 2015 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Apr 21 10:19:27 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/10d7f4d5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8400e6d..fff1670 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
<httpclient-version>3.1</httpclient-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
- <ical4j-version>1.0.5.2</ical4j-version>
+ <ical4j-version>1.0.6</ical4j-version>
<infinispan-version>7.1.1.Final</infinispan-version>
<irclib-bundle-version>1.10_5</irclib-bundle-version>
<irclib-version>1.10</irclib-version>