You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ac...@apache.org on 2017/08/10 09:45:26 UTC
[1/3] karaf-cellar git commit: [KARAF-5302] Upgrade to Hazelcast 3.8.4
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-4.0.x ecba4d818 -> eec19fd4e
[KARAF-5302] Upgrade to Hazelcast 3.8.4
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/118282d1
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/118282d1
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/118282d1
Branch: refs/heads/cellar-4.0.x
Commit: 118282d150b898663e3c6406fecc8e80a7e30092
Parents: ecba4d8
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 10 11:37:16 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 10 11:37:16 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/118282d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d56b38..cdcaae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
<felix.utils.version>1.10.0</felix.utils.version>
<felix.webconsole.version>4.2.14</felix.webconsole.version>
- <hazelcast.version>3.7.2</hazelcast.version>
+ <hazelcast.version>3.8.4</hazelcast.version>
<jclouds.version>1.9.1</jclouds.version>
<joda-time.version>2.9.1</joda-time.version>
<junit.version>4.11</junit.version>
[2/3] karaf-cellar git commit: [KARAF-5303] Upgrade to
Kubernetes-client 2.6.1
Posted by ac...@apache.org.
[KARAF-5303] Upgrade to Kubernetes-client 2.6.1
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/601f3a3b
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/601f3a3b
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/601f3a3b
Branch: refs/heads/cellar-4.0.x
Commit: 601f3a3b6202dd2f6cdf7cb2c4a8c05b36854b65
Parents: 118282d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 10 11:37:37 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 10 11:37:37 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/601f3a3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cdcaae1..cbde517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<properties>
<easymock.version>3.4</easymock.version>
- <fabric8.kubernetes-client.version>1.4.7</fabric8.kubernetes-client.version>
+ <fabric8.kubernetes-client.version>2.6.1</fabric8.kubernetes-client.version>
<felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
<felix.utils.version>1.10.0</felix.utils.version>
<felix.webconsole.version>4.2.14</felix.webconsole.version>
[3/3] karaf-cellar git commit: [KARAF-5302] Fixed hazelcast.xml
configuration file to work with 3.8.x
Posted by ac...@apache.org.
[KARAF-5302] Fixed hazelcast.xml configuration file to work with 3.8.x
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/eec19fd4
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/eec19fd4
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/eec19fd4
Branch: refs/heads/cellar-4.0.x
Commit: eec19fd4e9a65c9e4bd89fcd1b219e3afc079945
Parents: 601f3a3
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 10 11:44:52 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 10 11:44:52 2017 +0200
----------------------------------------------------------------------
hazelcast/src/test/resources/etc/hazelcast.xml | 26 ++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/eec19fd4/hazelcast/src/test/resources/etc/hazelcast.xml
----------------------------------------------------------------------
diff --git a/hazelcast/src/test/resources/etc/hazelcast.xml b/hazelcast/src/test/resources/etc/hazelcast.xml
index 2e347ec..cc4f20a 100644
--- a/hazelcast/src/test/resources/etc/hazelcast.xml
+++ b/hazelcast/src/test/resources/etc/hazelcast.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hz:hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.6.xsd"
- xmlns:hz="http://www.hazelcast.com/schema/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.6.xsd">
- <hz:network>
- <hz:port auto-increment="true" port-count="100">5701</hz:port>
- <hz:join>
- <hz:multicast enabled="false"/>
- <hz:tcp-ip enabled="true">
- <hz:interface>127.0.0.1</hz:interface>
- </hz:tcp-ip>
- </hz:join>
- </hz:network>
+ <network>
+ <port auto-increment="true" port-count="100">5701</port>
+ <join>
+ <multicast enabled="false"/>
+ <tcp-ip enabled="true">
+ <interface>127.0.0.1</interface>
+ </tcp-ip>
+ </join>
+ </network>
-</hz:hazelcast>
\ No newline at end of file
+</hazelcast>