Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CAMEL-10306: Upgrade from 3.6.5 to 3.7.1 #1166

Closed
wants to merge 2 commits into from
Closed

CAMEL-10306: Upgrade from 3.6.5 to 3.7.1 #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8834529
fix bean reference (test)
Fabryprog Sep 10, 2016
e3a5916
fix testsgit status!
Fabryprog Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion ...amel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
View file
Open in desktop
Expand Up @@ -208,7 +208,6 @@ private HazelcastInstance getOrCreateHzInstance(Map<String, Object> parameters)

// Query param named 'hazelcastInstance' (if exists) overrides the instance that was set
HazelcastInstance hzInstance = resolveAndRemoveReferenceParameter(parameters, HAZELCAST_INSTANCE_PARAM, HazelcastInstance.class);

// check if an already created instance is given then just get instance by its name.
if (hzInstance == null && parameters.get(HAZELCAST_INSTANCE_NAME_PARAM) != null) {
hzInstance = Hazelcast.getHazelcastInstanceByName((String) parameters.get(HAZELCAST_INSTANCE_NAME_PARAM));
Expand Down
5 changes: 3 additions & 2 deletions ...e/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.processor.aggregate.hazelcast;

import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.test.junit4.CamelTestSupport;
Expand All @@ -28,8 +29,8 @@ public class HazelcastAggregationRepositoryCamelTestSupport extends CamelTestSup
private static HazelcastInstance hzTwo;

protected static void doInitializeHazelcastInstances() {
hzOne = Hazelcast.newHazelcastInstance();
hzTwo = Hazelcast.newHazelcastInstance();
hzOne = Hazelcast.newHazelcastInstance(new Config("hzOne"));
hzTwo = Hazelcast.newHazelcastInstance(new Config("hzTwo"));
}

protected static void doDestroyHazelcastInstances() {
Expand Down
12 changes: 8 additions & 4 deletions ...st/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml
View file
Open in desktop
Expand Up @@ -20,12 +20,16 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">

<bean id="hazelcastInstance" class="com.hazelcast.core.Hazelcast"
factory-method="newHazelcastInstance" />
<bean id="hazelcastLifecycle" class="com.hazelcast.core.LifecycleService"

<bean id="hazelcastLifecycle" class="com.hazelcast.core.LifecycleService"
factory-bean="hazelcastInstance" factory-method="getLifecycleService"
destroy-method="shutdown" />

<bean id="config" class="com.hazelcast.config.Config" />

<bean id="hazelcastInstance" class="com.hazelcast.core.Hazelcast" factory-method="newHazelcastInstance">
<constructor-arg type="com.hazelcast.config.Config" ref="config"/>
</bean>

<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="testHazelcastInstanceBeanRefPut">
Expand Down
4 changes: 2 additions & 2 deletions components/camel-hazelcast/src/test/resources/hazelcast-default.xml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd"
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.7.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

Expand Down Expand Up @@ -96,7 +96,7 @@
evicted. Any integer between 0 and 100. If 25 is set for example, 25%
of the entries will get evicted.
-->
<eviction-percentage>100</eviction-percentage>
<!-- DEPRECATED SINCE: 3.7.0 <eviction-percentage>100</eviction-percentage-->

<!--
While recovering from split-brain (network partitioning), map entries
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
View file
Open in desktop
Expand Up @@ -241,7 +241,7 @@
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
<hazelcast-version>3.6.5</hazelcast-version>
<hazelcast-version>3.7.1</hazelcast-version>
<hbase-version>1.2.1</hbase-version>
<hessian-version>4.0.38</hessian-version>
<hibernate-validator-version>5.2.4.Final</hibernate-validator-version>
Expand Down