Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 21732820a -> 1dc5f8f21
Initial support for Java 10 and 11 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b8fd3dd0 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b8fd3dd0 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b8fd3dd0 Branch: refs/heads/STABLE-4.0 Commit: b8fd3dd0224d2f8b9d255a555c4d0eb41d8c9c26 Parents: 2173282 Author: Nikita Timofeev <[email protected]> Authored: Tue Jun 5 17:46:28 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Tue Jun 5 17:46:28 2018 +0300 ---------------------------------------------------------------------- .travis.yml | 30 ++++++++++-- build-tools/cayenne-test-utilities/pom.xml | 2 +- cayenne-ant/pom.xml | 2 +- cayenne-client/pom.xml | 2 +- cayenne-commitlog/pom.xml | 2 +- cayenne-crypto/pom.xml | 7 ++- .../transformer/bytes/HmacDecryptorTest.java | 2 +- cayenne-dbsync/pom.xml | 2 +- .../dbsync/reverse/dbimport/package-info.java | 24 ---------- .../dbimport/DefaultDbImportActionTest.java | 9 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../apache/cayenne/tools/GradlePluginIT.java | 7 ++- cayenne-lifecycle/pom.xml | 2 +- cayenne-server/pom.xml | 2 +- .../server/DataDomainProviderTest.java | 12 ++++- .../cayenne/asciidoc/CayennePostProcessor.java | 7 ++- docs/asciidoc/pom.xml | 9 +++- maven-plugins/cayenne-maven-plugin/pom.xml | 2 +- maven-plugins/maven-cayenne-plugin/pom.xml | 2 +- pom.xml | 50 +++++++++++++++----- 20 files changed, 112 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6151ad1..68e8fc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,18 @@ # How to fix: Change build setting or fix code. # https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments sudo: required -group: deprecated-2017Q2 +group: deprecated-2017Q2 # needed for jdk 7 services: - docker +before_install: + # use new maven to support "-pl" exclude option + - wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip + - unzip -qq apache-maven-3.5.0-bin.zip + - export M2_HOME=$PWD/apache-maven-3.5.0 + - export PATH=$M2_HOME/bin:$PATH + language: java env: @@ -34,14 +41,29 @@ env: - DB_PROFILE=sqlserver-docker jdk: - - oraclejdk8 - oraclejdk7 + - oraclejdk8 +# - oraclejdk9 -- broken version on deprecated travis image + - oraclejdk10 + +matrix: + include: + - jdk: oraclejdk-ea + env: DB_PROFILE=mysql-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + - jdk: oraclejdk-ea + env: DB_PROFILE=postgres-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + - jdk: oraclejdk-ea + env: DB_PROFILE=sqlserver-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + + allow_failures: + - jdk: oraclejdk-ea script: - - mvn verify -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR + # exclude JavaDocs and assembly from build, to pass on Java 11 + - travis_wait mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR # prevent Travis from unneeded "mvn install" run -install: /bin/true +install: true cache: directories: http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/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 681ccd0..9e98578 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/b8fd3dd0/cayenne-ant/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml index 6e134b7..a01bf0c 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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/cayenne-client/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml index d50ad8d..7dd0ce7 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/b8fd3dd0/cayenne-commitlog/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-commitlog/pom.xml b/cayenne-commitlog/pom.xml index 27f4467..a0fd439 100644 --- a/cayenne-commitlog/pom.xml +++ b/cayenne-commitlog/pom.xml @@ -64,7 +64,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/b8fd3dd0/cayenne-crypto/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml index e3d7b40..3f076da 100644 --- a/cayenne-crypto/pom.xml +++ b/cayenne-crypto/pom.xml @@ -28,6 +28,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -53,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/b8fd3dd0/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/b8fd3dd0/cayenne-dbsync/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml index f9ba812..66ee848 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/b8fd3dd0/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java deleted file mode 100644 index 12cdd1c..0000000 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ - -@XmlSchema(namespace="http://cayenne.apache.org/schema/8/reverseEngineering";, elementFormDefault= XmlNsForm.QUALIFIED) -package org.apache.cayenne.dbsync.reverse.dbimport; - -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/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/b8fd3dd0/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index ae13321..1bb4dd8 100644 --- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java index 4f57302..c6970e5 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java @@ -53,8 +53,11 @@ public class GradlePluginIT extends BaseTaskIT { public void testGradleVersionsCompatibility() throws Exception { String[] versions; - // Old gradle versions will fail on Java 9.0.1 and later - if (getJavaMajorVersion(System.getProperty("java.version")) < 9) { + // Old gradle versions will fail on new JDK + int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version")); + if(javaMajorVersion >= 11) { + versions = new String[]{"4.8"}; + } else if (javaMajorVersion < 9) { versions = new String[]{"4.3", "4.0", "3.5", "3.3", "3.0", "2.12", "2.8"}; } else { versions = new String[]{"4.3.1", "4.3"}; http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/cayenne-lifecycle/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-lifecycle/pom.xml b/cayenne-lifecycle/pom.xml index 4711620..d16607c 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/b8fd3dd0/cayenne-server/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml index 7db74ab..59f5cea 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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/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..0f9c973 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,12 +94,16 @@ 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.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -144,7 +148,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 +270,16 @@ 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/b8fd3dd0/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java ---------------------------------------------------------------------- diff --git a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java index 6a4e1d9..b0dae0e 100644 --- a/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java +++ b/docs/asciidoc/cayenne-asciidoc-extension/src/main/java/org/apache/cayenne/asciidoc/CayennePostProcessor.java @@ -34,7 +34,6 @@ import java.util.Map; import org.asciidoctor.Options; import org.asciidoctor.ast.Document; -import org.asciidoctor.ast.DocumentRuby; import org.asciidoctor.extension.Postprocessor; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; @@ -64,10 +63,14 @@ public class CayennePostProcessor extends Postprocessor { private static final String POSITION_BODY = "body"; private static final String POSITION_BOTTOM = "bottom"; - public CayennePostProcessor(DocumentRuby documentRuby) { + public CayennePostProcessor() { super(); } + public CayennePostProcessor(Map<String, Object> config) { + super(config); + } + public String process(Document document, String output) { output = extractTableOfContents(document, output); output = fixupDom(document, output); http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/docs/asciidoc/pom.xml ---------------------------------------------------------------------- diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml index e45e7e1..6535912 100644 --- a/docs/asciidoc/pom.xml +++ b/docs/asciidoc/pom.xml @@ -41,10 +41,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <asciidoctorj.version>1.5.6</asciidoctorj.version> + <asciidoctorj.version>1.6.0-alpha.6</asciidoctorj.version> <asciidoctor.maven.plugin.version>1.5.6</asciidoctor.maven.plugin.version> <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version> - <jruby.version>9.1.14.0</jruby.version> + <jruby.version>9.1.17.0</jruby.version> <cayenne.major.version>4.0</cayenne.major.version> </properties> @@ -109,6 +109,11 @@ <artifactId>jruby-complete</artifactId> <version>${jruby.version}</version> </dependency> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> + </dependency> </dependencies> </plugin> <!-- Move images to proper path for site --> http://git-wip-us.apache.org/repos/asf/cayenne/blob/b8fd3dd0/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 dec28c6..b6b7e93 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/b8fd3dd0/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 eb21e4d..341938d 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/b8fd3dd0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b4e85e0..d38622d 100644 --- a/pom.xml +++ b/pom.xml @@ -411,12 +411,12 @@ <version>4.11</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.5</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>2.18.3</version> + <scope>test</scope> + </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> @@ -751,7 +751,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20.1</version> + <version>2.21.0</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -760,7 +760,7 @@ </plugin> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.20.1</version> + <version>2.21.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -783,11 +783,18 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.0-M1</version> + <version>3.0.0</version> <configuration> <!-- Java 8 is too strict about Javadoc omissions --> - <additionalparam>${javadoc.doclint.none}</additionalparam> + <doclint>${javadoc.doclint}</doclint> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.7</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -807,7 +814,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.20.1</version> + <version>2.21.0</version> <executions> <execution> <id>integration-test</id> @@ -1628,10 +1635,29 @@ <jdk>[1.8,)</jdk> </activation> <properties> - <javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none> + <javadoc.doclint>none</javadoc.doclint> </properties> </profile> <profile> + <id>java9-javadoc-html5</id> + <activation> + <jdk>[9,)</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclint>none</doclint> + <additionalOptions> + <additionalOption>-html5</additionalOption> + </additionalOptions> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>cayenne-java8-module-to-build</id> <activation> <jdk>[1.8,)</jdk>
