Skip to content

Commit 28a0df2

Browse files
rbygraverbygrave
committed
Update to Ebean 10.1.1 - io.ebean package
1 parent 9a1267c commit 28a0df2

23 files changed

Lines changed: 59 additions & 63 deletions

‎pom.xml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44

55
<parent>
66
<groupId>org.avaje</groupId>
7-
<artifactId>oss-parent</artifactId>
8-
<version>1.1</version>
7+
<artifactId>java8-parent</artifactId>
8+
<version>1.3</version>
99
</parent>
1010

11-
<groupId>org.avaje.ebean</groupId>
11+
<groupId>io.ebean</groupId>
1212
<artifactId>ebean-ignite</artifactId>
13-
<version>1.3.3-SNAPSHOT</version>
13+
<version>2.1.1-SNAPSHOT</version>
1414

1515
<scm>
16-
<developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm-ignite.git</developerConnection>
16+
<developerConnection>scm:git:git@github.com:ebean-orm/ebean-ignite.git</developerConnection>
1717
<tag>HEAD</tag>
1818
</scm>
1919

2020
<properties>
21-
<java.version>1.7</java.version>
2221
<ignite.version>1.6.0</ignite.version>
2322
</properties>
2423

@@ -49,9 +48,9 @@
4948
</dependency>
5049

5150
<dependency>
52-
<groupId>org.avaje.ebean</groupId>
51+
<groupId>io.ebean</groupId>
5352
<artifactId>ebean</artifactId>
54-
<version>8.1.1</version>
53+
<version>10.1.1</version>
5554
<scope>provided</scope>
5655
</dependency>
5756

@@ -65,9 +64,9 @@
6564
</dependency>
6665

6766
<dependency>
68-
<groupId>org.avaje.ebean</groupId>
67+
<groupId>io.ebean</groupId>
6968
<artifactId>ebean-mocker</artifactId>
70-
<version>8.1.1</version>
69+
<version>10.1.1</version>
7170
<scope>test</scope>
7271
</dependency>
7372

@@ -83,10 +82,7 @@
8382
<extensions>true</extensions>
8483
<configuration>
8584
<tiles>
86-
<tile>org.avaje.tile:java-compile:1.1</tile>
87-
<tile>org.avaje.tile:dependency-tree:1.1</tile>
88-
<tile>org.avaje.tile:pygments-doclet:1.1</tile>
89-
<tile>org.avaje.ebean.tile:enhancement:1.1</tile>
85+
<tile>io.ebean.tile:enhancement:2.1</tile>
9086
</tiles>
9187
</configuration>
9288
</plugin>

src/main/java/org/avaje/ebean/ignite/IgCache.java renamed to src/main/java/io/ebean/ignite/IgCache.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.avaje.ebean.ignite;
1+
package io.ebean.ignite;
22

3-
import com.avaje.ebean.cache.ServerCache;
4-
import com.avaje.ebean.cache.ServerCacheStatistics;
3+
import io.ebean.cache.ServerCache;
4+
import io.ebean.cache.ServerCacheStatistics;
55
import org.apache.ignite.IgniteCache;
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;

src/main/java/org/avaje/ebean/ignite/IgCacheFactory.java renamed to src/main/java/io/ebean/ignite/IgCacheFactory.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package org.avaje.ebean.ignite;
2-
3-
import com.avaje.ebean.BackgroundExecutor;
4-
import com.avaje.ebean.cache.ServerCache;
5-
import com.avaje.ebean.cache.ServerCacheFactory;
6-
import com.avaje.ebean.cache.ServerCacheOptions;
7-
import com.avaje.ebean.cache.ServerCacheType;
8-
import com.avaje.ebean.config.ServerConfig;
9-
import com.avaje.ebeaninternal.server.cache.DefaultServerCache;
1+
package io.ebean.ignite;
2+
3+
import io.ebean.BackgroundExecutor;
4+
import io.ebean.cache.ServerCache;
5+
import io.ebean.cache.ServerCacheFactory;
6+
import io.ebean.cache.ServerCacheOptions;
7+
import io.ebean.cache.ServerCacheType;
8+
import io.ebean.config.ServerConfig;
9+
import io.ebeaninternal.server.cache.DefaultServerCache;
1010
import org.apache.ignite.Ignite;
1111
import org.apache.ignite.IgniteCache;
1212
import org.apache.ignite.IgniteMessaging;
1313
import org.apache.ignite.Ignition;
1414
import org.apache.ignite.configuration.IgniteConfiguration;
1515
import org.apache.ignite.lang.IgniteBiPredicate;
1616
import org.apache.ignite.logger.slf4j.Slf4jLogger;
17-
import org.avaje.ebean.ignite.config.ConfigManager;
18-
import org.avaje.ebean.ignite.config.ConfigPair;
19-
import org.avaje.ebean.ignite.config.ConfigXmlReader;
20-
import org.avaje.ebean.ignite.config.L2Configuration;
17+
import io.ebean.ignite.config.ConfigManager;
18+
import io.ebean.ignite.config.ConfigPair;
19+
import io.ebean.ignite.config.ConfigXmlReader;
20+
import io.ebean.ignite.config.L2Configuration;
2121
import org.avaje.ignite.IgniteConfigBuilder;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;

src/main/java/org/avaje/ebean/ignite/IgCachePlugin.java renamed to src/main/java/io/ebean/ignite/IgCachePlugin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.avaje.ebean.ignite;
1+
package io.ebean.ignite;
22

3-
import com.avaje.ebean.BackgroundExecutor;
4-
import com.avaje.ebean.cache.ServerCacheFactory;
5-
import com.avaje.ebean.cache.ServerCachePlugin;
6-
import com.avaje.ebean.config.ServerConfig;
3+
import io.ebean.BackgroundExecutor;
4+
import io.ebean.cache.ServerCacheFactory;
5+
import io.ebean.cache.ServerCachePlugin;
6+
import io.ebean.config.ServerConfig;
77

88
/**
99
* Cache plugin that creates the Ignite ServerCacheFactory.

src/main/java/org/avaje/ebean/ignite/config/AddL2CacheConfig.java renamed to src/main/java/io/ebean/ignite/config/AddL2CacheConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.avaje.ebean.ignite.config;
1+
package io.ebean.ignite.config;
22

33
import org.apache.ignite.configuration.CacheConfiguration;
44

src/main/java/org/avaje/ebean/ignite/config/ConfigManager.java renamed to src/main/java/io/ebean/ignite/config/ConfigManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.avaje.ebean.ignite.config;
1+
package io.ebean.ignite.config;
22

3-
import com.avaje.ebean.cache.ServerCacheType;
3+
import io.ebean.cache.ServerCacheType;
44
import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
55
import org.apache.ignite.configuration.CacheConfiguration;
66
import org.apache.ignite.configuration.NearCacheConfiguration;

src/main/java/org/avaje/ebean/ignite/config/ConfigPair.java renamed to src/main/java/io/ebean/ignite/config/ConfigPair.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.avaje.ebean.ignite.config;
1+
package io.ebean.ignite.config;
22

33
import org.apache.ignite.configuration.CacheConfiguration;
44
import org.apache.ignite.configuration.NearCacheConfiguration;

src/main/java/org/avaje/ebean/ignite/config/ConfigXmlReader.java renamed to src/main/java/io/ebean/ignite/config/ConfigXmlReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.avaje.ebean.ignite.config;
1+
package io.ebean.ignite.config;
22

33

44
import org.slf4j.Logger;

src/main/java/org/avaje/ebean/ignite/config/L2Apply.java renamed to src/main/java/io/ebean/ignite/config/L2Apply.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.avaje.ebean.ignite.config;
2+
package io.ebean.ignite.config;
33

44
import java.util.ArrayList;
55
import java.util.List;

src/main/java/org/avaje/ebean/ignite/config/L2CacheConfig.java renamed to src/main/java/io/ebean/ignite/config/L2CacheConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.avaje.ebean.ignite.config;
2+
package io.ebean.ignite.config;
33

44
import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
55
import org.apache.ignite.cache.CacheAtomicityMode;

0 commit comments

Comments
 (0)