Skip to content

Commit

Permalink
Update for Ebean 10.1.1 - io.ebean package
Browse files Browse the repository at this point in the history
  • Loading branch information
rbygrave committed Dec 13, 2016
1 parent 9791438 commit 10aa5d9
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 47 deletions.
27 changes: 11 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@

<parent>
<groupId>org.avaje</groupId>
<artifactId>oss-parent</artifactId>
<version>1.1</version>
<artifactId>java8-parent</artifactId>
<version>1.3</version>
</parent>

<groupId>org.avaje.ebean</groupId>
<groupId>io.ebean</groupId>
<artifactId>ebean-hazelcast</artifactId>
<version>1.2.3-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>

<scm>
<developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm-hazelcast.git</developerConnection>
<developerConnection>scm:git:git@github.com:ebean-orm/ebean-hazelcast.git</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<java.version>1.6</java.version>
<hazelcast.version>3.6.2</hazelcast.version>
</properties>

Expand All @@ -37,9 +36,9 @@
</dependency>

<dependency>
<groupId>org.avaje.ebean</groupId>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>8.1.1</version>
<version>10.1.1</version>
<scope>provided</scope>
</dependency>

Expand All @@ -52,15 +51,14 @@
<dependency>
<groupId>org.avaje.composite</groupId>
<artifactId>composite-testing</artifactId>
<version>2.1</version>
<type>pom</type>
<version>3.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.avaje.ebean</groupId>
<groupId>io.ebean</groupId>
<artifactId>ebean-mocker</artifactId>
<version>8.1.1</version>
<version>10.1.1</version>
<scope>test</scope>
</dependency>

Expand All @@ -76,10 +74,7 @@
<extensions>true</extensions>
<configuration>
<tiles>
<tile>org.avaje.tile:java-compile:1.1</tile>
<tile>org.avaje.tile:dependency-tree:1.1</tile>
<tile>org.avaje.tile:pygments-doclet:1.1</tile>
<tile>org.avaje.ebean.tile:enhancement:1.1</tile>
<tile>io.ebean.tile:enhancement:2.1</tile>
</tiles>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.avaje.ebeanorm.hazelcast;
package io.ebean.hazelcast;

import com.avaje.ebean.cache.ServerCache;
import com.avaje.ebean.cache.ServerCacheStatistics;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheStatistics;
import com.hazelcast.core.IMap;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.avaje.ebeanorm.hazelcast;

import com.avaje.ebean.BackgroundExecutor;
import com.avaje.ebean.cache.ServerCache;
import com.avaje.ebean.cache.ServerCacheFactory;
import com.avaje.ebean.cache.ServerCacheOptions;
import com.avaje.ebean.cache.ServerCacheType;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebeaninternal.server.cache.DefaultServerCache;
package io.ebean.hazelcast;

import io.ebean.BackgroundExecutor;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheFactory;
import io.ebean.cache.ServerCacheOptions;
import io.ebean.cache.ServerCacheType;
import io.ebean.config.ServerConfig;
import io.ebeaninternal.server.cache.DefaultServerCache;
import com.hazelcast.client.HazelcastClient;
import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.config.Config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.avaje.ebeanorm.hazelcast;
package io.ebean.hazelcast;

import com.avaje.ebean.BackgroundExecutor;
import com.avaje.ebean.cache.ServerCacheFactory;
import com.avaje.ebean.cache.ServerCachePlugin;
import com.avaje.ebean.config.ServerConfig;
import io.ebean.BackgroundExecutor;
import io.ebean.cache.ServerCacheFactory;
import io.ebean.cache.ServerCachePlugin;
import io.ebean.config.ServerConfig;

/**
* Creates the Hazelcast ServerCacheFactory implementation.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.ebean.hazelcast.HzCachePlugin
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.avaje.ebeanorm.hazelcast;

import com.avaje.ebean.Ebean;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.cache.ServerCache;
import com.avaje.ebean.cache.ServerCacheManager;
import com.avaje.ebean.cache.ServerCacheOptions;
import com.avaje.ebean.cache.ServerCacheType;
import com.avaje.ebean.config.ServerConfig;
package io.ebean.hazelcast;

import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheManager;
import io.ebean.cache.ServerCacheOptions;
import io.ebean.cache.ServerCacheType;
import io.ebean.config.ServerConfig;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.example.domain.EFoo;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/example/domain/EBase.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.example.domain;

import com.avaje.ebean.Model;
import com.avaje.ebean.annotation.WhenCreated;
import com.avaje.ebean.annotation.WhenModified;
import io.ebean.Model;
import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified;

import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/example/domain/EFoo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.example.domain;


import com.avaje.ebean.annotation.Cache;
import io.ebean.annotation.Cache;

import javax.persistence.Entity;

Expand Down

0 comments on commit 10aa5d9

Please sign in to comment.