Update to Ebean 10.1.1 - io.ebean package

pom.xml

@@ -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-ignite</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
 
   <scm>
-    <developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm-ignite.git</developerConnection>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean-ignite.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
   <properties>
-    <java.version>1.7</java.version>
     <ignite.version>1.6.0</ignite.version>
   </properties>
 
@@ -49,9 +48,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>
 
@@ -65,9 +64,9 @@
     </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>
 
@@ -83,10 +82,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>

src/main/java/org/avaje/ebean/ignite/IgCache.java → src/main/java/io/ebean/ignite/IgCache.java

@@ -1,7 +1,7 @@
-package org.avaje.ebean.ignite;
+package io.ebean.ignite;
 
-import com.avaje.ebean.cache.ServerCache;
-import com.avaje.ebean.cache.ServerCacheStatistics;
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheStatistics;
 import org.apache.ignite.IgniteCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/avaje/ebean/ignite/IgCacheFactory.java → src/main/java/io/ebean/ignite/IgCacheFactory.java

@@ -1,23 +1,23 @@
-package org.avaje.ebean.ignite;
-
-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.ignite;
+
+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 org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteMessaging;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.logger.slf4j.Slf4jLogger;
-import org.avaje.ebean.ignite.config.ConfigManager;
-import org.avaje.ebean.ignite.config.ConfigPair;
-import org.avaje.ebean.ignite.config.ConfigXmlReader;
-import org.avaje.ebean.ignite.config.L2Configuration;
+import io.ebean.ignite.config.ConfigManager;
+import io.ebean.ignite.config.ConfigPair;
+import io.ebean.ignite.config.ConfigXmlReader;
+import io.ebean.ignite.config.L2Configuration;
 import org.avaje.ignite.IgniteConfigBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/avaje/ebean/ignite/IgCachePlugin.java → src/main/java/io/ebean/ignite/IgCachePlugin.java

@@ -1,9 +1,9 @@
-package org.avaje.ebean.ignite;
+package io.ebean.ignite;
 
-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;
 
 /**
  * Cache plugin that creates the Ignite ServerCacheFactory.

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

@@ -1,4 +1,4 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import org.apache.ignite.configuration.CacheConfiguration;
 

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

@@ -1,6 +1,6 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
-import com.avaje.ebean.cache.ServerCacheType;
+import io.ebean.cache.ServerCacheType;
 import org.apache.ignite.cache.eviction.lru.LruEvictionPolicy;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;

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

@@ -1,4 +1,4 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;

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

@@ -1,4 +1,4 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 
 import org.slf4j.Logger;

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

@@ -1,5 +1,5 @@
 
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,5 @@
 
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 import org.apache.ignite.cache.CacheAtomicityMode;

src/main/java/org/avaje/ebean/ignite/config/L2CacheMatch.java → src/main/java/io/ebean/ignite/config/L2CacheMatch.java

@@ -1,5 +1,5 @@
 
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/avaje/ebean/ignite/config/L2Configuration.java → src/main/java/io/ebean/ignite/config/L2Configuration.java

@@ -1,5 +1,5 @@
 
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/org/avaje/ebean/ignite/config/ObjectFactory.java → src/main/java/io/ebean/ignite/config/ObjectFactory.java

@@ -1,5 +1,5 @@
 
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import javax.xml.bind.annotation.XmlRegistry;
 

src/main/java/org/avaje/ebean/ignite/config/package-info.java → src/main/java/io/ebean/ignite/config/package-info.java

@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ignite", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;

src/main/resources/META-INF/services/io.ebean.cache.ServerCachePlugin

@@ -0,0 +1 @@
+io.ebean.ignite.IgCachePlugin

src/test/java/org/avaje/ebean/ignite/IgCacheFactoryTest.java → src/test/java/io/ebean/ignite/IgCacheFactoryTest.java

@@ -1,9 +1,9 @@
-package org.avaje.ebean.ignite;
+package io.ebean.ignite;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.cache.ServerCache;
-import com.avaje.ebean.cache.ServerCacheManager;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.cache.ServerCache;
+import io.ebean.cache.ServerCacheManager;
 import main.Server;
 import org.example.domain.EFoo;
 import org.testng.annotations.Test;

src/test/java/org/avaje/ebean/ignite/L2ConfigurationXmlReaderTest.java → src/test/java/io/ebean/ignite/L2ConfigurationXmlReaderTest.java

@@ -1,7 +1,7 @@
-package org.avaje.ebean.ignite;
+package io.ebean.ignite;
 
-import org.avaje.ebean.ignite.config.L2Configuration;
-import org.avaje.ebean.ignite.config.ConfigXmlReader;
+import io.ebean.ignite.config.L2Configuration;
+import io.ebean.ignite.config.ConfigXmlReader;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.*;

src/test/java/org/avaje/ebean/ignite/config/AddL2CacheConfigTest.java → src/test/java/io/ebean/ignite/config/AddL2CacheConfigTest.java

@@ -1,4 +1,4 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;

src/test/java/org/avaje/ebean/ignite/config/ConfigManagerTest.java → src/test/java/io/ebean/ignite/config/ConfigManagerTest.java

@@ -1,6 +1,6 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
-import com.avaje.ebean.cache.ServerCacheType;
+import io.ebean.cache.ServerCacheType;
 import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 import org.apache.ignite.cache.CacheMode;
 import org.testng.annotations.Test;

src/test/java/org/avaje/ebean/ignite/config/L2ConfigurationLoadTest.java → src/test/java/io/ebean/ignite/config/L2ConfigurationLoadTest.java

@@ -1,4 +1,4 @@
-package org.avaje.ebean.ignite.config;
+package io.ebean.ignite.config;
 
 import org.testng.annotations.Test;
 

src/test/java/org/example/domain/EBase.java

@@ -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;

src/test/java/org/example/domain/EFoo.java

@@ -1,7 +1,7 @@
 package org.example.domain;
 
 
-import com.avaje.ebean.annotation.Cache;
+import io.ebean.annotation.Cache;
 
 import javax.persistence.Entity;