>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5483 )
Change subject: [ASTERIXDB-2890] Minimum Java version 8->11 ...................................................................... [ASTERIXDB-2890] Minimum Java version 8->11 - user model changes: no - storage format changes: no - interface changes: no Details: - Update Mockito to unbreak tests and put it under dependencyManagement. - Update HttpTestUtil to avoid inspecting fields that are usually invalid in JDK 11 - Enable parallel execution of surefire tests in asterix-om to make up for slowdown of ExceptionTest under Mockito 2+ Change-Id: Ib9aa81fa2e58954846218e9907562685c8cd09e3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5483 Reviewed-by: Ian Maxon <[email protected]> Reviewed-by: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java M asterixdb/asterix-external-data/pom.xml M asterixdb/asterix-metadata/pom.xml M asterixdb/asterix-om/pom.xml M asterixdb/asterix-runtime/pom.xml M asterixdb/asterix-transactions/pom.xml M asterixdb/pom.xml M hyracks-fullstack/algebricks/algebricks-compiler/pom.xml M hyracks-fullstack/algebricks/algebricks-compiler/src/test/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleControllerTest.java M hyracks-fullstack/hyracks/hyracks-api/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml M hyracks-fullstack/hyracks/hyracks-http/pom.xml M hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpTestUtil.java M hyracks-fullstack/hyracks/hyracks-net/pom.xml M hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/FullFrameChannelReadInterfaceTest.java M hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml M hyracks-fullstack/hyracks/hyracks-test-support/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java M hyracks-fullstack/pom.xml 27 files changed, 134 insertions(+), 134 deletions(-) Approvals: Ian Maxon: Looks good to me, but someone else must approve Michael Blow: Looks good to me, approved; Verified Anon. E. Moose #1000171: Jenkins: Verified diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 0ff044d..255583b 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -415,8 +415,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java index c71cf31..53201f5 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java @@ -19,7 +19,6 @@ package org.apache.asterix.test.sqlpp; import static org.apache.hyracks.util.file.FileUtil.canonicalize; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -58,6 +57,7 @@ import org.apache.asterix.testframework.xml.TestGroup; import org.apache.hyracks.test.support.TestUtils; import org.junit.Assert; +import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -136,16 +136,17 @@ when(metadataProvider.getDefaultDataverseName()).thenReturn(dvName); when(metadataProvider.getConfig()).thenReturn(config); when(config.get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS)).thenReturn("true"); - when(metadataProvider.findDataset(anyString(), anyString())).thenAnswer(new Answer<Dataset>() { - @Override - public Dataset answer(InvocationOnMock invocation) { - Object[] args = invocation.getArguments(); - final Dataset mockDataset = mock(Dataset.class); - String fullyQualifiedName = args[0] != null ? args[0] + "." + args[1] : (String) args[1]; - when(mockDataset.getFullyQualifiedName()).thenReturn(fullyQualifiedName); - return mockDataset; - } - }); + when(metadataProvider.findDataset(Mockito.<String> any(), Mockito.<String> any())) + .thenAnswer(new Answer<Dataset>() { + @Override + public Dataset answer(InvocationOnMock invocation) { + Object[] args = invocation.getArguments(); + final Dataset mockDataset = mock(Dataset.class); + String fullyQualifiedName = args[0] != null ? args[0] + "." + args[1] : (String) args[1]; + when(mockDataset.getFullyQualifiedName()).thenReturn(fullyQualifiedName); + return mockDataset; + } + }); for (Statement st : statements) { if (st.getKind() == Statement.Kind.QUERY) { diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index d475caf..e1c638c 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -139,7 +139,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java index 843cb21..779bfd8 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java +++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java @@ -219,7 +219,7 @@ @Override public Void answer(InvocationOnMock invocation) throws Throwable { - List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(0, List.class); + List<ILSMDiskComponent> mergedComponents = invocation.getArgument(0); mergedComponents.forEach(component -> { try { resultComponentIDs.add(component.getId()); diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index 169bcb6..037436a 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -286,7 +286,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-metadata/pom.xml b/asterixdb/asterix-metadata/pom.xml index f4c471d..a5425b1 100644 --- a/asterixdb/asterix-metadata/pom.xml +++ b/asterixdb/asterix-metadata/pom.xml @@ -155,7 +155,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-om/pom.xml b/asterixdb/asterix-om/pom.xml index fc1707f..b123850 100644 --- a/asterixdb/asterix-om/pom.xml +++ b/asterixdb/asterix-om/pom.xml @@ -38,6 +38,28 @@ <root.dir>${basedir}/..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <parallel>all</parallel> + <forkCount>4</forkCount> + <reuseForks>false</reuseForks> + <threadCount>1</threadCount> + <argLine> + -enableassertions -Xmx${test.heap.size}m + -Dfile.encoding=UTF-8 + -DrunSlowAQLTests=${runSlowAQLTests} + -Xdebug + ${coverageArgLine} + </argLine> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.apache.asterix</groupId> @@ -61,7 +83,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-runtime/pom.xml b/asterixdb/asterix-runtime/pom.xml index a226991..5f04280 100644 --- a/asterixdb/asterix-runtime/pom.xml +++ b/asterixdb/asterix-runtime/pom.xml @@ -139,7 +139,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml index 5b84162..72aaaee 100644 --- a/asterixdb/asterix-transactions/pom.xml +++ b/asterixdb/asterix-transactions/pom.xml @@ -110,7 +110,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 43e0dfd..f985b70 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -46,7 +46,8 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <file.encoding>UTF-8</file.encoding> <jvm.extraargs /> - <source.jdk.version>1.8</source.jdk.version> + <source.jdk.version>11</source.jdk.version> + <target.jdk.version>11</target.jdk.version> <javac.xlint.value>all</javac.xlint.value> <source-format.goal>format</source-format.goal> <source-format.skip>false</source-format.skip> @@ -315,6 +316,20 @@ <requireMavenVersion> <version>[3.3.9,)</version> </requireMavenVersion> + <requireJavaVersion> + <version>[11,)</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + <execution> + <id>ensure-no-duplicate-deps</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <banDuplicatePomDependencyVersions/> </rules> </configuration> </execution> @@ -529,7 +544,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.21.0</version> + <version>3.0.0-M5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -577,7 +592,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -626,6 +641,11 @@ <artifactId>impsort-maven-plugin</artifactId> <version>1.2.0</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> + </plugin> </plugins> </pluginManagement> </build> @@ -670,7 +690,7 @@ </property> </activation> <properties> - <test.heap.size>2048</test.heap.size> + <test.heap.size>4096</test.heap.size> </properties> </profile> @@ -683,7 +703,7 @@ </property> </activation> <properties> - <test.heap.size>3072</test.heap.size> + <test.heap.size>4096</test.heap.size> </properties> </profile> <profile> @@ -832,40 +852,6 @@ <failIfNoTests>false</failIfNoTests> </properties> </profile> - <profile> - <id>java8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <properties> - <target.jdk.version>8</target.jdk.version> - </properties> - </profile> - <profile> - <id>java8-bootclasspath</id> - <activation> - <property> - <name>java8-bootclasspath</name> - </property> - </activation> - <properties> - <target.jdk.version>8</target.jdk.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs combine.children="append"> - <arg>-bootclasspath</arg> - <arg>${java8-bootclasspath}</arg> - </compilerArgs> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <modules> diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml index ff92d91..3617593 100644 --- a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml @@ -68,26 +68,22 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.6</version> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - <version>1.6.6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.6</version> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/src/test/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleControllerTest.java b/hyracks-fullstack/algebricks/algebricks-compiler/src/test/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleControllerTest.java index 18aa104..b568417 100644 --- a/hyracks-fullstack/algebricks/algebricks-compiler/src/test/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleControllerTest.java +++ b/hyracks-fullstack/algebricks/algebricks-compiler/src/test/java/org/apache/hyracks/algebricks/compiler/rewriter/rulecontrollers/SequentialFirstRuleCheckFixpointRuleControllerTest.java @@ -41,7 +41,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") +@PowerMockIgnore({ "javax.management.*", "javax.xml.*", "com.sun.org.apache.xerces.*", "org.w3c.*", "org.xml.*" }) @PrepareForTest({ SequentialFirstRuleCheckFixpointRuleController.class, AbstractLogicalOperator.class }) public class SequentialFirstRuleCheckFixpointRuleControllerTest { diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml index 2c50ee4..cb76cb3 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/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> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index dc1b3a8..9c7e52b 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -88,7 +88,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 100c93a..99aa399 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -116,7 +116,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-http/pom.xml b/hyracks-fullstack/hyracks/hyracks-http/pom.xml index bf96e79..50721ca 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-http/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> diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpTestUtil.java b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpTestUtil.java index af5e3e3..4debe7f 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpTestUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpTestUtil.java @@ -21,16 +21,16 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryType; -import java.lang.reflect.Field; import java.util.List; -import java.util.concurrent.atomic.AtomicLong; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.ByteBufAllocatorMetric; +import io.netty.buffer.ByteBufAllocatorMetricProvider; import io.netty.buffer.PooledByteBufAllocator; -import io.netty.util.internal.PlatformDependent; public class HttpTestUtil { private static final Logger LOGGER = LogManager.getLogger(); @@ -66,14 +66,12 @@ report.append("---------------------------- Netty ----------------------------"); report.append('\n'); try { - Field field = PlatformDependent.class.getDeclaredField("DIRECT_MEMORY_COUNTER"); - field.setAccessible(true); - AtomicLong usedDirectMemory = (AtomicLong) field.get(null); - long used = usedDirectMemory.get(); - report.append("Current PlatformDependent.DIRECT_MEMORY_COUNTER: "); + ByteBufAllocatorMetric memUsage = ((ByteBufAllocatorMetricProvider) ByteBufAllocator.DEFAULT).metric(); + long used = memUsage.usedDirectMemory(); + report.append("Current default allocator direct buffer usage: "); report.append(used); report.append('\n'); - report.append("Maximum PlatformDependent.DIRECT_MEMORY_COUNTER: "); + report.append("Maximum default allocator direct buffer usage: "); maxMemUsage = Math.max(maxMemUsage, used); report.append(maxMemUsage); report.append('\n'); diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml b/hyracks-fullstack/hyracks/hyracks-net/pom.xml index 824098c..91d246d 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/FullFrameChannelReadInterfaceTest.java b/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/FullFrameChannelReadInterfaceTest.java index 2180d1d..cf0ae08 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/FullFrameChannelReadInterfaceTest.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/test/java/org/apache/hyracks/net/tests/FullFrameChannelReadInterfaceTest.java @@ -114,7 +114,7 @@ final ChannelControlBlock ccb = Mockito.mock(ChannelControlBlock.class); Mockito.when(ccb.isRemotelyClosed()).thenReturn(false); Mockito.doAnswer(invocation -> { - final Integer delta = invocation.getArgumentAt(0, Integer.class); + final Integer delta = invocation.getArgument(0); credit.addAndGet(delta); synchronized (credit) { credit.notifyAll(); @@ -128,7 +128,7 @@ final ISocketChannel sc = Mockito.mock(ISocketChannel.class); Mockito.when(sc.read(Mockito.any(ByteBuffer.class))).thenAnswer(invocation -> { ccb.addPendingCredits(-FRAME_SIZE); - final ByteBuffer buffer = invocation.getArgumentAt(0, ByteBuffer.class); + final ByteBuffer buffer = invocation.getArgument(0); while (buffer.hasRemaining()) { buffer.put((byte) 0); } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 45330e8..0ccdaaa 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@ -67,25 +67,22 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java index 44af086..0600add 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java @@ -73,7 +73,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") +@PowerMockIgnore({ "javax.management.*", "javax.xml.*", "com.sun.org.apache.xerces.*", "org.w3c.*", "org.xml.*" }) @PrepareForTest({ BTreeUtils.class, FrameTupleAccessor.class, ArrayTupleBuilder.class, IndexSearchOperatorNodePushable.class, FrameUtils.class, FrameTupleAppender.class }) public class FramewriterTest { diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml index 703deb8..f8cb226 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml @@ -102,7 +102,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml index ee9e009..4f8f4f4 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml @@ -118,7 +118,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index c38ba3c..c9e4ba1 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml @@ -90,7 +90,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java index 098aa51..af0be25 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java @@ -166,7 +166,7 @@ Mockito.doAnswer(new Answer<Void>() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(0, List.class); + List<ILSMDiskComponent> mergedComponents = invocation.getArgument(0); mergedComponents.forEach(component -> { mergedSizes.add(component.getComponentSize()); }); diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java index 54fd3bb..2e7b4c6 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java @@ -196,7 +196,7 @@ Mockito.doAnswer(new Answer<Void>() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(0, List.class); + List<ILSMDiskComponent> mergedComponents = invocation.getArgument(0); if (mergedSizes != null) { mergedComponents.forEach(component -> { mergedSizes.add(component.getComponentSize()); diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 85694a5..5af1995 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -49,7 +49,8 @@ <root.dir>${basedir}</root.dir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <file.encoding>UTF-8</file.encoding> - <source.jdk.version>1.8</source.jdk.version> + <source.jdk.version>11</source.jdk.version> + <target.jdk.version>11</target.jdk.version> <javac.xlint.value>all</javac.xlint.value> <jvm.extraargs /> <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath> @@ -244,11 +245,6 @@ <version>${log4j.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>2.0.2-beta</version> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.3.0</version> @@ -283,6 +279,26 @@ <artifactId>maven-plugin-api</artifactId> <version>3.6.3</version> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>3.10.0</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>2.0.9</version> + </dependency> </dependencies> </dependencyManagement> <build> @@ -496,6 +512,20 @@ <requireMavenVersion> <version>[3.3.9,)</version> </requireMavenVersion> + <requireJavaVersion> + <version>[11,)</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + <execution> + <id>ensure-no-duplicate-deps</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <banDuplicatePomDependencyVersions/> </rules> </configuration> </execution> @@ -692,13 +722,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> + <version>3.1.2</version> </plugin> <plugin> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-maven-plugin</artifactId> <version>1.1.4</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> + </plugin> </plugins> </pluginManagement> </build> @@ -831,40 +866,6 @@ <failIfNoTests>false</failIfNoTests> </properties> </profile> - <profile> - <id>java8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <properties> - <target.jdk.version>8</target.jdk.version> - </properties> - </profile> - <profile> - <id>java8-bootclasspath</id> - <activation> - <property> - <name>java8-bootclasspath</name> - </property> - </activation> - <properties> - <target.jdk.version>8</target.jdk.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs combine.children="append"> - <arg>-bootclasspath</arg> - <arg>${java8-bootclasspath}</arg> - </compilerArgs> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <modules> <module>hyracks</module> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5483 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: mad-hatter Gerrit-Change-Id: Ib9aa81fa2e58954846218e9907562685c8cd09e3 Gerrit-Change-Number: 5483 Gerrit-PatchSet: 25 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-MessageType: merged
