cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject cayenne git commit: Update dependencies versions. Minor build fixes: - minor assembly cleanup - reconfigure docker profiles to run them on MacOS
Date Wed, 07 Jun 2017 14:57:08 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 45ffc1f4c -> 34e960981


Update dependencies versions.
Minor build fixes:
  - minor assembly cleanup
  - reconfigure docker profiles to run them on MacOS


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/34e96098
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/34e96098
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/34e96098

Branch: refs/heads/master
Commit: 34e960981f71840536e75519491c9ba3506f2f53
Parents: 45ffc1f
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Wed Jun 7 17:56:53 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Wed Jun 7 17:56:53 2017 +0300

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 assembly/pom.xml                                |   5 +-
 build-tools/cayenne-test-utilities/pom.xml      |   2 +-
 cayenne-ant/pom.xml                             |   3 +-
 cayenne-client-jetty/pom.xml                    |   2 +-
 cayenne-client/pom.xml                          |   2 +-
 cayenne-commitlog/pom.xml                       |   2 +-
 cayenne-crypto/pom.xml                          |   2 +-
 .../transformer/bytes/HmacDecryptorTest.java    |   2 +-
 cayenne-dbsync/pom.xml                          |   2 +-
 .../dbimport/DefaultDbImportActionTest.java     |   9 +-
 cayenne-gradle-plugin/pom.xml                   |   4 +-
 cayenne-jcache/pom.xml                          |   2 +-
 cayenne-joda/pom.xml                            |   6 +-
 cayenne-lifecycle/pom.xml                       |   2 +-
 cayenne-protostuff/pom.xml                      |   2 +-
 cayenne-server/pom.xml                          |  12 +-
 .../velocity/SQLTemplateResourceManager.java    |   4 +-
 .../access/jdbc/BatchActionLockingIT.java       |   2 +-
 .../server/DataDomainProviderTest.java          |  20 +--
 .../org/apache/cayenne/cache/test-ehcache.xml   |   6 +-
 eventbridges/cayenne-jgroups/pom.xml            |   5 -
 eventbridges/cayenne-jms/pom.xml                |   5 -
 eventbridges/cayenne-xmpp/pom.xml               |   5 -
 eventbridges/pom.xml                            |   5 +
 maven-plugins/cayenne-maven-plugin/pom.xml      |   2 +-
 maven-plugins/maven-cayenne-plugin/pom.xml      |   2 +-
 maven-plugins/pom.xml                           |  12 +-
 modeler/cayenne-modeler/pom.xml                 |   4 +-
 pom.xml                                         | 135 ++++++++++---------
 tutorials/pom.xml                               |   4 +
 tutorials/tutorial-rop-server-http2/pom.xml     |   1 -
 tutorials/tutorial-rop-server/pom.xml           |  14 +-
 tutorials/tutorial/pom.xml                      |   8 +-
 34 files changed, 148 insertions(+), 146 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6fc0825..ab3cc2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 target
+out
 .classpath
 .project
 .settings/

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index fbc64ef..4f52527 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -295,6 +295,7 @@
 										<descriptor>src/main/resources/assemblies/assembly-mac.xml</descriptor>
 									</descriptors>
 									<finalName>cayenne-${project.version}-macosx</finalName>
+									<attach>false</attach>
 								</configuration>
 							</execution>
 						</executions>
@@ -317,7 +318,7 @@
 									<executable>/bin/chmod</executable>
 									<arguments>
 										<argument>755</argument>
-										<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
+										<argument>target/cayenne-${project.version}-macosx/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -334,7 +335,7 @@
 									<arguments>
 										<argument>create</argument>
 										<argument>-srcfolder</argument>
-										<argument>target/cayenne-${project.version}-macosx</argument>
+										<argument>target/cayenne-${project.version}-macosx/cayenne-${project.version}-macosx</argument>
 										<argument>-format</argument>
 										<argument>UDZO</argument>
 										<argument>-volname</argument>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/build-tools/cayenne-test-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index b6fea4d..8c378f3 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -44,7 +44,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-ant/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml
index fbe964f..9b12f4e 100644
--- a/cayenne-ant/pom.xml
+++ b/cayenne-ant/pom.xml
@@ -90,7 +90,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,6 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant-testutil</artifactId>
-            <version>1.9.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index 4c904ef..d48c579 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -23,7 +23,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jetty.version>9.3.10.v20160621</jetty.version>
+        <jetty.version>9.3.19.v20170502</jetty.version>
     </properties>
 
     <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-client/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index c09b0aa..b591bd9 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -58,7 +58,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-commitlog/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-commitlog/pom.xml b/cayenne-commitlog/pom.xml
index 6770b19..2361144 100644
--- a/cayenne-commitlog/pom.xml
+++ b/cayenne-commitlog/pom.xml
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index 4fb1999..bf9353b 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -53,7 +53,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
index ef155d4..6e80c8e 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HmacDecryptorTest.java
@@ -40,7 +40,7 @@ public class HmacDecryptorTest {
         HmacDecryptor decryptor = mock(HmacDecryptor.class);
         decryptor.delegate = SwapBytesTransformer.decryptor();
         when(decryptor.createHmac(any(byte[].class))).thenReturn(new byte[]{0, 1, 2, 3, 4, 5, 6, 7});
-        when(decryptor.decrypt(any(byte[].class), anyInt(), any(Key.class))).thenCallRealMethod();
+        when(decryptor.decrypt(any(byte[].class), anyInt(), (Key)any())).thenCallRealMethod();
 
         byte[] expectedResult = {-1, -2, -3};
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index c600313..5ca09c5 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -59,7 +59,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
index f390fef..d8781c1 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
@@ -78,7 +78,6 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.stub;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -238,7 +237,7 @@ public class DefaultDbImportActionTest {
         doNothing().when(projectSaver).save(any(Project.class));
 
         MapLoader mapLoader = mock(MapLoader.class);
-        stub(mapLoader.loadDataMap(any(InputSource.class))).toReturn(new DataMapBuilder().with(
+        when(mapLoader.loadDataMap(any(InputSource.class))).thenReturn(new DataMapBuilder().with(
                 dbEntity("ARTGROUP").attributes(
                         dbAttr("NAME").typeVarchar(100).mandatory()
                 )).build());
@@ -288,14 +287,14 @@ public class DefaultDbImportActionTest {
         DbAdapter dbAdapter = mock(DbAdapter.class);
 
         DbAdapterFactory adapterFactory = mock(DbAdapterFactory.class);
-        when(adapterFactory.createAdapter(any(DataNodeDescriptor.class), any(DataSource.class))).thenReturn(dbAdapter);
+        when(adapterFactory.createAdapter((DataNodeDescriptor)any(), (DataSource)any())).thenReturn(dbAdapter);
 
         DataSourceFactory dataSourceFactory = mock(DataSourceFactory.class);
         DataSource mock = mock(DataSource.class);
-        when(dataSourceFactory.getDataSource(any(DataNodeDescriptor.class))).thenReturn(mock);
+        when(dataSourceFactory.getDataSource((DataNodeDescriptor)any())).thenReturn(mock);
 
         MergerTokenFactoryProvider mergerTokenFactoryProvider = mock(MergerTokenFactoryProvider.class);
-        when(mergerTokenFactoryProvider.get(any(DbAdapter.class))).thenReturn(new DefaultMergerTokenFactory());
+        when(mergerTokenFactoryProvider.get((DbAdapter)any())).thenReturn(new DefaultMergerTokenFactory());
 
         return new DefaultDbImportAction(log, projectSaver, dataSourceFactory, adapterFactory, mapLoader, mergerTokenFactoryProvider) {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-gradle-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml
index d20a71e..1b52458 100644
--- a/cayenne-gradle-plugin/pom.xml
+++ b/cayenne-gradle-plugin/pom.xml
@@ -70,7 +70,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.9</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>build-classpath</id>
@@ -89,7 +89,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
                 <executions>
                     <execution>
                         <id>gradle</id>
@@ -134,7 +133,6 @@
     </build>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.cayenne</groupId>
             <artifactId>cayenne-cgen</artifactId>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-jcache/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-jcache/pom.xml b/cayenne-jcache/pom.xml
index cc98612..12281f0 100644
--- a/cayenne-jcache/pom.xml
+++ b/cayenne-jcache/pom.xml
@@ -31,7 +31,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <ehcache-version>3.2.0</ehcache-version>
+        <ehcache-version>3.3.1</ehcache-version>
         <jcache-version>1.0.0</jcache-version>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-joda/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml
index 6c62eec..2dbad8a 100644
--- a/cayenne-joda/pom.xml
+++ b/cayenne-joda/pom.xml
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
-				<version>2.7</version>
+				<version>2.9.9</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -73,8 +73,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>mockrunner</groupId>
-			<artifactId>mockrunner</artifactId>
+			<groupId>com.mockrunner</groupId>
+			<artifactId>mockrunner-jdbc</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml
index 8f20bfd..a9c6283 100644
--- a/cayenne-lifecycle/pom.xml
+++ b/cayenne-lifecycle/pom.xml
@@ -47,7 +47,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-protostuff/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml
index ce159d8..735daf1 100644
--- a/cayenne-protostuff/pom.xml
+++ b/cayenne-protostuff/pom.xml
@@ -21,7 +21,7 @@
     <name>cayenne-protostuff: Cayenne Protostuff Extension</name>
 
     <properties>
-        <protostuff.version>1.4.3</protostuff.version>
+        <protostuff.version>1.5.5</protostuff.version>
     </properties>
 
     <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 301d39a..233c580 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -89,7 +89,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -109,8 +109,13 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>mockrunner</groupId>
-			<artifactId>mockrunner</artifactId>
+			<groupId>com.mockrunner</groupId>
+			<artifactId>mockrunner-jdbc</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.mockrunner</groupId>
+			<artifactId>mockrunner-servlet</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -121,7 +126,6 @@
 		<dependency>
 			<groupId>xmlunit</groupId>
 			<artifactId>xmlunit</artifactId>
-			<version>1.5</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-server/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java b/cayenne-server/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
index e80cd46..085e2be 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/velocity/SQLTemplateResourceManager.java
@@ -46,7 +46,7 @@ public class SQLTemplateResourceManager
 
     protected Map<String, Template> templateCache;
 
-    public void initialize(RuntimeServices rs) throws Exception {
+    public void initialize(RuntimeServices rs) {
         super.rsvc = rs;
         this.templateCache = new LRUMap(100);
     }
@@ -59,7 +59,7 @@ public class SQLTemplateResourceManager
      * Returns a Velocity Resource which is a Template for the given SQL.
      */
     public Resource getResource(String resourceName, int resourceType, String encoding)
-        throws ResourceNotFoundException, ParseErrorException, Exception {
+        throws ResourceNotFoundException, ParseErrorException {
 
         synchronized (templateCache) {
             Template resource = templateCache.get(resourceName);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
index df4b721..4273516 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingIT.java
@@ -121,7 +121,7 @@ public class BatchActionLockingIT extends ServerCase {
 		Collection<String> nullAttributeNames = Collections.singleton("NAME");
 
 		Map<String, Object> qualifierSnapshot = new HashMap<>();
-		qualifierSnapshot.put("LOCKING_TEST_ID", new Integer(1));
+		qualifierSnapshot.put("LOCKING_TEST_ID", 1);
 
 		DeleteBatchQuery batchQuery = new DeleteBatchQuery(dbEntity, qualifierAttributes, nullAttributeNames, 5);
 		batchQuery.setUsingOptimisticLocking(true);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
index 14cc126..d13724c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
@@ -94,15 +94,10 @@ import org.junit.Test;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class DataDomainProviderTest {
 
@@ -144,7 +139,7 @@ public class DataDomainProviderTest {
 		};
 
 		final EventManager eventManager = new MockEventManager();
-		final TestListener mockListener = mock(TestListener.class);
+		final TestListener mockListener = new TestListener();
 
 		Module testModule = new Module() {
 
@@ -266,12 +261,17 @@ public class DataDomainProviderTest {
 		when(mockObjectId.getEntityName()).thenReturn("mock-entity-name");
 		when(mockPersistent.getObjectId()).thenReturn(mockObjectId);
 		domain.getEntityResolver().getCallbackRegistry().performCallbacks(LifecycleEvent.POST_LOAD, mockPersistent);
-		verify(mockListener).postLoadCallback(mockPersistent);
+
+		assertEquals("Should call postLoadCallback() method", 1, TestListener.counter.get());
 	}
 
 	static class TestListener {
+
+		static private AtomicInteger counter = new AtomicInteger();
+
 		@PostLoad
 		public void postLoadCallback(Object object) {
+			counter.incrementAndGet();
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/cayenne-server/src/test/resources/org/apache/cayenne/cache/test-ehcache.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/cache/test-ehcache.xml b/cayenne-server/src/test/resources/org/apache/cayenne/cache/test-ehcache.xml
index 7a6f82f..d35e3a9 100644
--- a/cayenne-server/src/test/resources/org/apache/cayenne/cache/test-ehcache.xml
+++ b/cayenne-server/src/test/resources/org/apache/cayenne/cache/test-ehcache.xml
@@ -17,9 +17,9 @@
 	xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false"
 	monitoring="off" dynamicConfig="false">
 
-	<defaultCache eternal="false" overflowToDisk="false" timeToIdleSeconds="453" timeToLiveSeconds="453" />
+	<defaultCache eternal="false" overflowToDisk="false" timeToIdleSeconds="453" timeToLiveSeconds="453" maxElementsInMemory="10"/>
 
-	<cache name="cg1" timeToLiveSeconds="201" />
-	<cache name="cg2" timeToLiveSeconds="319" />
+	<cache name="cg1" timeToLiveSeconds="201" maxElementsInMemory="10"/>
+	<cache name="cg2" timeToLiveSeconds="319" maxElementsInMemory="10"/>
 
 </ehcache>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/eventbridges/cayenne-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jgroups/pom.xml b/eventbridges/cayenne-jgroups/pom.xml
index b37aaeb..3febaeb 100644
--- a/eventbridges/cayenne-jgroups/pom.xml
+++ b/eventbridges/cayenne-jgroups/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>jgroups-all</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/eventbridges/cayenne-jms/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jms/pom.xml b/eventbridges/cayenne-jms/pom.xml
index 64e606c..863c3aa 100644
--- a/eventbridges/cayenne-jms/pom.xml
+++ b/eventbridges/cayenne-jms/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>geronimo-jms_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/eventbridges/cayenne-xmpp/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-xmpp/pom.xml b/eventbridges/cayenne-xmpp/pom.xml
index 37a793f..66f100e 100644
--- a/eventbridges/cayenne-xmpp/pom.xml
+++ b/eventbridges/cayenne-xmpp/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>smackx</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/eventbridges/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/pom.xml b/eventbridges/pom.xml
index 3d4d0e3..662cfd0 100644
--- a/eventbridges/pom.xml
+++ b/eventbridges/pom.xml
@@ -58,6 +58,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/maven-plugins/cayenne-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml
index d7679b1..72800e5 100644
--- a/maven-plugins/cayenne-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-maven-plugin/pom.xml
@@ -90,7 +90,7 @@
 		<!-- Test deps -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/maven-plugins/maven-cayenne-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/pom.xml b/maven-plugins/maven-cayenne-plugin/pom.xml
index 3aaafd7..a21eeb2 100644
--- a/maven-plugins/maven-cayenne-plugin/pom.xml
+++ b/maven-plugins/maven-cayenne-plugin/pom.xml
@@ -78,7 +78,7 @@
         <!-- Test deps -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index f0144a4..37dda30 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -32,12 +32,12 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-plugin-api</artifactId>
-				<version>3.3.9</version>
+				<version>3.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-artifact</artifactId>
-				<version>3.3.9</version>
+				<version>3.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
@@ -62,22 +62,22 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-core</artifactId>
-				<version>3.3.9</version>
+				<version>3.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-compat</artifactId>
-				<version>3.3.9</version>
+				<version>3.5.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-container-default</artifactId>
-				<version>1.6</version>
+				<version>1.7.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-interpolation</artifactId>
-				<version>1.21</version>
+				<version>1.24</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 2022d1a..586a9f4 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -93,8 +93,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>mockrunner</groupId>
-			<artifactId>mockrunner</artifactId>
+			<groupId>com.mockrunner</groupId>
+			<artifactId>mockrunner-jdbc</artifactId>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b66644..19943a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,9 @@
 	<properties>
 		<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
 		<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
-        <jacoco.version>0.7.1.201405082137</jacoco.version>
+        <jacoco.version>0.7.9</jacoco.version>
 		<slf4j.version>1.7.25</slf4j.version>
+		<ant.version>1.9.9</ant.version>
 
         <pmd.skip>true</pmd.skip>
         <checkstyle.skip>true</checkstyle.skip>
@@ -84,8 +85,9 @@
 			<post>user@cayenne.apache.org</post>
 			<subscribe>user-subscribe@cayenne.apache.org</subscribe>
 			<unsubscribe>user-unsubscribe@cayenne.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/cayenne-user</archive>
+			<archive>https://lists.apache.org/list.html?user@cayenne.apache.org</archive>
 			<otherArchives>
+				<otherArchive>http://mail-archives.apache.org/mod_mbox/cayenne-user</otherArchive>
 				<otherArchive>http://cayenne.markmail.org/search/+list:org.apache.cayenne.user</otherArchive>
 				<otherArchive>http://dir.gmane.org/gmane.comp.java.cayenne.user</otherArchive>
 			</otherArchives>
@@ -95,8 +97,9 @@
 			<post>dev@cayenne.apache.org</post>
 			<subscribe>dev-subscribe@cayenne.apache.org</subscribe>
 			<unsubscribe>dev-unsubscribe@cayenne.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/cayenne-dev</archive>
+			<archive>https://lists.apache.org/list.html?dev@cayenne.apache.org</archive>
 			<otherArchives>
+				<otherArchive>http://mail-archives.apache.org/mod_mbox/cayenne-dev</otherArchive>
 				<otherArchive>http://cayenne.markmail.org/search/+list:org.apache.cayenne.dev</otherArchive>
 				<otherArchive>http://dir.gmane.org/gmane.comp.java.cayenne.devel</otherArchive>
 			</otherArchives>
@@ -105,8 +108,9 @@
 			<name>Cayenne Commits</name>
 			<subscribe>commits-subscribe@cayenne.apache.org</subscribe>
 			<unsubscribe>commits-unsubscribe@cayenne.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/cayenne-commits</archive>
+			<archive>https://lists.apache.org/list.html?commits@cayenne.apache.org</archive>
 			<otherArchives>
+				<otherArchive>http://mail-archives.apache.org/mod_mbox/cayenne-commits</otherArchive>
 				<otherArchive>http://cayenne.markmail.org/search/+list:org.apache.cayenne.commits</otherArchive>
 			</otherArchives>
 		</mailingList>
@@ -274,7 +278,7 @@
 			<dependency>
 				<groupId>org.apache.ant</groupId>
 				<artifactId>ant</artifactId>
-				<version>1.9.4</version>
+				<version>${ant.version}</version>
 				<scope>provided</scope>
 				<exclusions>
 					<exclusion>
@@ -288,9 +292,9 @@
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>ant</groupId>
+				<groupId>org.apache.ant</groupId>
 				<artifactId>ant-junit</artifactId>
-				<version>1.6.5</version>
+				<version>${ant.version}</version>
 				<scope>test</scope>
 				<exclusions>
 					<exclusion>
@@ -304,6 +308,12 @@
 				</exclusions>
 			</dependency>
 			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-testutil</artifactId>
+				<version>${ant.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
 				<groupId>commons-collections</groupId>
 				<artifactId>commons-collections</artifactId>
 				<version>3.2.1</version>
@@ -312,7 +322,7 @@
 			<dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
-                <version>2.1</version>
+                <version>2.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -336,15 +346,21 @@
 				<version>2.7.0</version>
 			</dependency>
 			<dependency>
-				<groupId>mockrunner</groupId>
-				<artifactId>mockrunner</artifactId>
-				<version>0.4.1</version>
+				<groupId>com.mockrunner</groupId>
+				<artifactId>mockrunner-jdbc</artifactId>
+				<version>1.1.2</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.mockrunner</groupId>
+				<artifactId>mockrunner-servlet</artifactId>
+				<version>1.1.2</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>ognl</groupId>
 				<artifactId>ognl</artifactId>
-				<version>2.6.7</version>
+				<version>3.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>opensymphony</groupId>
@@ -355,7 +371,7 @@
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
-				<version>2.4</version>
+				<version>2.5</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -383,7 +399,7 @@
 			<dependency>
 				<groupId>org.apache.velocity</groupId>
 				<artifactId>velocity</artifactId>
-				<version>1.6.3</version>
+				<version>1.7</version>
 			</dependency>
 			<dependency>
 				<groupId>foundrylogic.vpp</groupId>
@@ -408,13 +424,13 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.11</version>
+				<version>4.12</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
-				<artifactId>mockito-all</artifactId>
-				<version>1.8.5</version>
+				<artifactId>mockito-core</artifactId>
+				<version>2.8.9</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -426,7 +442,7 @@
 			<dependency>
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
-				<version>2.3.4</version>
+				<version>2.3.5</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -438,7 +454,7 @@
         	<dependency>
            		<groupId>xmlunit</groupId>
             	<artifactId>xmlunit</artifactId>
-            	<version>1.5</version>
+            	<version>1.6</version>
             	<scope>test</scope>
         	</dependency>
 			<dependency>
@@ -473,7 +489,7 @@
 			<dependency>
 				<groupId>org.apache.geronimo.specs</groupId>
 				<artifactId>geronimo-jms_1.1_spec</artifactId>
-				<version>1.1</version>
+				<version>1.1.1</version>
 				<scope>provided</scope>
 			</dependency>
 		</dependencies>
@@ -514,7 +530,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>1.0-beta-7</version>
+				<version>2.12</version>
 			</extension>
 		</extensions>
 
@@ -693,15 +709,15 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.5</version>
                 </plugin>
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.3</version>
+					<version>3.0.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.2</version>
+					<version>3.6.1</version>
 					<configuration>
 						<source>1.7</source>
 						<target>1.7</target>
@@ -710,53 +726,53 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.8.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.5.3</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jxr-plugin</artifactId>
-					<version>2.2</version>
+					<version>2.5</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-pmd-plugin</artifactId>
-					<version>2.5</version>
+					<version>3.8</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.0-beta-1</version>
+					<version>1.4.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.2</version>
+					<version>1.6.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>2.3.1</version>
+					<version>2.9</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
+					<version>3.0.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.2-beta-5</version>
+					<version>3.0.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.5</version>
+					<version>2.20</version>
 				</plugin>
 				<plugin>   
 					<groupId>org.apache.felix</groupId>
   					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.3.7</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-report-plugin</artifactId>
-					<version>2.8</version>
+					<version>2.20</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -779,7 +795,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.9.1</version>
+					<version>2.10.4</version>
 					<configuration>
 						<!-- Java 8 is too strict about Javadoc omissions --> 
 						<additionalparam>${javadoc.doclint.none}</additionalparam>
@@ -803,7 +819,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.17</version>
+                    <version>2.20</version>
                     <executions>
                         <execution>
                             <id>integration-test</id>
@@ -816,12 +832,12 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.0.2</version>
                 </plugin>
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.15.6</version>
+                    <version>0.21.0</version>
                 </plugin>
             </plugins>
 		</pluginManagement>
@@ -954,7 +970,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-checkstyle-plugin</artifactId>
-                            <version>2.9.1</version>
+                            <version>2.17</version>
                             <configuration>
                                 <skip>${checkstyle.skip}</skip>
                                 <consoleOutput>true</consoleOutput>
@@ -983,7 +999,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-pmd-plugin</artifactId>
-                            <version>3.2</version>
+                            <version>3.8</version>
                             <configuration>
                                 <skip>${pmd.skip}</skip>
                                 <sourceEncoding>utf-8</sourceEncoding>
@@ -1016,7 +1032,7 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>findbugs-maven-plugin</artifactId>
-                            <version>2.5</version>
+                            <version>3.0.4</version>
                             <configuration>
                                 <effort>Max</effort>
                                 <!-- do max effort at CI Server -->
@@ -1035,7 +1051,7 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>clirr-maven-plugin</artifactId>
-                            <version>2.6.1</version>
+                            <version>2.8</version>
                             <configuration>
                                 <comparisonVersion>3.1RC1</comparisonVersion>
                                 <minSeverity>info</minSeverity>
@@ -1165,6 +1181,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -1194,7 +1211,6 @@
 				<dependency>
 					<groupId>org.hsqldb</groupId>
 					<artifactId>hsqldb</artifactId>
-					<version>2.3.4</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -1211,7 +1227,6 @@
 				<dependency>
 					<groupId>org.hsqldb</groupId>
 					<artifactId>hsqldb</artifactId>
-					<version>2.3.4</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -1279,7 +1294,7 @@
 				<dependency>
 					<groupId>com.h2database</groupId>
 					<artifactId>h2</artifactId>
-					<version>1.3.175</version>
+					<version>1.4.195</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -1296,7 +1311,7 @@
 				<dependency>
 					<groupId>mysql</groupId>
 					<artifactId>mysql-connector-java</artifactId>
-					<version>5.1.28</version>
+					<version>5.1.42</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -1313,7 +1328,7 @@
 				<dependency>
 					<groupId>mysql</groupId>
 					<artifactId>mysql-connector-java</artifactId>
-					<version>5.1.28</version>
+					<version>5.1.42</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -1347,12 +1362,8 @@
 											<port>${db.host}:${db.port}:3306</port>
 										</ports>
 										<wait>
-											<tcp>
-												<ports>
-													<port>3306</port>
-												</ports>
-											</tcp>
-											<time>30000</time>
+											<log>MySQL init process done. Ready for start up.</log>
+											<time>60000</time>
 										</wait>
 										<env>
 											<MYSQL_ALLOW_EMPTY_PASSWORD>yes</MYSQL_ALLOW_EMPTY_PASSWORD>
@@ -1449,12 +1460,8 @@
 											<port>${db.host}:${db.port}:5432</port>
 										</ports>
 										<wait>
-											<tcp>
-												<ports>
-													<port>5432</port>
-												</ports>
-											</tcp>
-											<time>30000</time>
+											<log>PostgreSQL init process complete; ready for start up.</log>
+											<time>60000</time>
 										</wait>
 									</run>
 								</image>
@@ -1542,7 +1549,7 @@
 				<dependency>
 					<groupId>org.xerial</groupId>
 					<artifactId>sqlite-jdbc</artifactId>
-					<version>3.15.1</version>
+					<version>3.18.0</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -1591,7 +1598,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -1600,7 +1607,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.20</version>
             </plugin>
         </plugins>
     </reporting>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/tutorials/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index 45edfd6..5947a27 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -30,6 +30,10 @@
 	<name>cayenne-tutorials-parent: Cayenne Tutorials</name>
 	<packaging>pom</packaging>
 
+	<properties>
+		<jetty.version>9.3.19.v20170502</jetty.version>
+	</properties>
+
 	<modules>
 		<module>tutorial</module>
 		<module>tutorial-rop-server</module>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/tutorials/tutorial-rop-server-http2/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server-http2/pom.xml b/tutorials/tutorial-rop-server-http2/pom.xml
index 5c9e998..f092d35 100644
--- a/tutorials/tutorial-rop-server-http2/pom.xml
+++ b/tutorials/tutorial-rop-server-http2/pom.xml
@@ -27,7 +27,6 @@
 
     <properties>
         <main.class>org.apache.cayenne.tutorial.Http2Server</main.class>
-        <jetty.version>9.3.10.v20160621</jetty.version>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/tutorials/tutorial-rop-server/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial-rop-server/pom.xml b/tutorials/tutorial-rop-server/pom.xml
index d9e93d4..b24fa2e 100644
--- a/tutorials/tutorial-rop-server/pom.xml
+++ b/tutorials/tutorial-rop-server/pom.xml
@@ -50,16 +50,16 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.22</version>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jetty.version}</version>
 				<configuration>
-					<userRealms>
-						<userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
+					<loginServices>
+						<loginService implementation="org.eclipse.jetty.security.HashLoginService">
 							<name>Cayenne Realm</name>
 							<config>realm.properties</config>
-						</userRealm>
-					</userRealms>
+						</loginService>
+					</loginServices>
 				</configuration>
 			</plugin>
 			<plugin>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/34e96098/tutorials/tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/tutorial/pom.xml b/tutorials/tutorial/pom.xml
index 5b20b42..42ba519 100644
--- a/tutorials/tutorial/pom.xml
+++ b/tutorials/tutorial/pom.xml
@@ -22,7 +22,7 @@
 	</parent>
 
 	<artifactId>tutorial</artifactId>
-	<name>tutorial: ayenne Tutorial</name>
+	<name>tutorial: Cayenne Tutorial</name>
 
 	<dependencies>
 		<dependency>
@@ -44,9 +44,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.22</version>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jetty.version}</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>


Mime
View raw message