diff --git a/docs/pom.xml b/docs/pom.xml index dd3fcf0faa..594845c6c6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -467,7 +467,6 @@ org.apache.maven.plugins maven-site-plugin - ${maven-site-plugin.version} ./target diff --git a/pom.xml b/pom.xml index bea537c2f5..45bcf9540b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache apache - 23 + 37 org.apache.tez tez @@ -30,21 +30,20 @@ The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt Apache Software Foundation - http://www.apache.org + https://www.apache.org - 21 - 21 + 21 + 21 true - 3.0.0-M4 false UTF-8 ${maven.build.timestamp} @@ -61,35 +60,27 @@ 1.79 1.8 1.1 - 8.35 1.3.2 1.6.0 1.15 4.4 2.16.0 3.19.0 - ${user.home}/clover.license 5.9.0 3.2.0 - 3.8.1 4.9.3 4.9.3.0 - 2.3.0 + 2.3.0 1.15.0 32.0.1-jre 3.4.2 - 1.8 1.19.4 1.5.4 3.0.0 4.13.2 1.8 1.0.0 - 3.1.1 - 3.0.0 - 3.1.2 3.6.0 - 3.12.1 3.1.0 4.8.1 4.1.130.Final @@ -148,12 +139,6 @@ - - maven2-repository.atlassian - Atlassian Maven Repository - https://maven.atlassian.com/repository/public - default - ${distMgmtSnapshotsId} ${distMgmtSnapshotsName} @@ -788,9 +773,9 @@ test - com.google.protobuf - protobuf-java - ${protobuf.version} + com.google.protobuf + protobuf-java + ${protobuf.version} com.google.guava @@ -805,7 +790,7 @@ com.sun.jersey jersey-client - ${jersey.version} + ${jersey.version} com.sun.jersey @@ -859,11 +844,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - ${dependency-maven-plugin.version} - org.apache.maven.plugins maven-jar-plugin @@ -959,7 +939,7 @@ false 900 true - -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError + -Xmx2048m -XX:+HeapDumpOnOutOfMemoryError ${test.jvm.args} ${java.home} @@ -975,7 +955,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} org.apache.tez @@ -983,9 +962,9 @@ ${project.version} - com.puppycrawl.tools - checkstyle - ${checkstyle.version} + org.codehaus.plexus + plexus-velocity + ${plexus-velocity.version} @@ -993,8 +972,6 @@ checkstyle/suppressions.xml true false - xml - html ${project.build.directory}/test/checkstyle-errors.xml @@ -1017,7 +994,7 @@ org.codehaus.plexus plexus-velocity - ${spotbugs.plexus-velocity.version} + ${plexus-velocity.version} @@ -1095,18 +1072,18 @@ - + ro.isdc.wro4j wro4j-maven-plugin ${wro4j-maven-plugin.version} - - - - org.mockito - mockito-core - 2.18.0 - - + + + + org.mockito + mockito-core + 2.18.0 + + @@ -1115,7 +1092,6 @@ org.apache.maven.plugins maven-enforcer-plugin - ${maven-enforcer-plugin.version} de.skuzzle.enforcer @@ -1124,6 +1100,19 @@ + + enforce-maven-version + + enforce + + + + + [3.8.7,) + + + + clean @@ -1132,10 +1121,10 @@ - [3.6.3,) + [3.8.7,) - [${maven.compiler.target},) + [${javaVersion},) @@ -1164,34 +1153,14 @@ org.apache.rat apache-rat-plugin - - org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - org.codehaus.mojo buildnumber-maven-plugin - - org.apache.maven.plugins - maven-jar-plugin - org.codehaus.mojo build-helper-maven-plugin - - com.github.spotbugs - spotbugs-maven-plugin - - ${basedir}/findbugs-exclude.xml - false - - com.diffplug.spotless spotless-maven-plugin @@ -1206,16 +1175,16 @@ - - org.owasp - dependency-check-maven - - + + org.owasp + dependency-check-maven + + @@ -1239,138 +1208,6 @@ - - clover - - false - - clover - - - - ${clover.license} - 3.1.11 - - - - - com.atlassian.maven.plugins - maven-clover2-plugin - ${clover.version} - - true - true - 50% - true - true - - **/generated/** - - - - - clover-setup - process-sources - - setup - - - - clover - test - - clover - - - - site - pre-site - - aggregate - - - - - - - - - sources - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - - javadoc - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - attach-javadocs - - jar - - - - - - - - - test-patch - - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - - 9999 - - - - - - - - jdk1.8 - - 1.8 - - - - jdk.tools - jdk.tools - ${jdk.tools.version} - system - ${java.home}/../lib/tools.jar - - - @@ -1442,6 +1279,7 @@ ${basedir}/findbugs-exclude.xml + 2048 diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml index 10579f2c5b..b22b455cd6 100644 --- a/tez-dag/pom.xml +++ b/tez-dag/pom.xml @@ -194,10 +194,10 @@ generate-sources generate-sources - + - + run diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java index 4602b8e7fc..8dd502b2ce 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskScheduler.java @@ -51,7 +51,7 @@ public void maxTasksAllocationsCannotBeExceeded() { TaskSchedulerContext mockContext = TestTaskSchedulerHelpers.setupMockTaskSchedulerContext("", 0, "", true, - appAttemptId, 1000l, null, new Configuration()); + appAttemptId, 1000L, null, new Configuration()); LocalContainerFactory containerFactory = new LocalContainerFactory(appAttemptId, 1000); @@ -69,7 +69,7 @@ public void maxTasksAllocationsCannotBeExceeded() { // Allocate up to max tasks for (int i = 0; i < MAX_TASKS; i++) { Priority priority = Priority.newInstance(20); - requestHandler.addAllocateTaskRequest(new Long(i), null, priority, null); + requestHandler.addAllocateTaskRequest((long) i, null, priority, null); requestHandler.dispatchRequest(); requestHandler.allocateTask(); } @@ -80,7 +80,7 @@ public void maxTasksAllocationsCannotBeExceeded() { // Deallocate down to zero for (int i = 0; i < MAX_TASKS; i++) { - requestHandler.addDeallocateTaskRequest(new Long(i)); + requestHandler.addDeallocateTaskRequest((long) i); requestHandler.dispatchRequest(); } diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskSchedulerService.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskSchedulerService.java index 764b4f3fea..6ec4cbc59b 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskSchedulerService.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestLocalTaskSchedulerService.java @@ -153,14 +153,14 @@ public void preemptDescendantsOnly() { ApplicationId appId = ApplicationId.newInstance(2000, 1); ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId, 1); - Long parentTask1 = new Long(1); - Long parentTask2 = new Long(2); - Long childTask1 = new Long(3); - Long grandchildTask1 = new Long(4); + Long parentTask1 = (long) 1; + Long parentTask2 = (long) 2; + Long childTask1 = (long) 3; + Long grandchildTask1 = (long) 4; TaskSchedulerContext mockContext = TestTaskSchedulerHelpers.setupMockTaskSchedulerContext("", 0, "", true, - appAttemptId, 1000l, null, tezConf); + appAttemptId, 1000L, null, tezConf); when(mockContext.getVertexIndexForTask(parentTask1)).thenReturn(0); when(mockContext.getVertexIndexForTask(parentTask2)).thenReturn(0); when(mockContext.getVertexIndexForTask(childTask1)).thenReturn(1); diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml index c85f542289..bd98fafbe5 100644 --- a/tez-ext-service-tests/pom.xml +++ b/tez-ext-service-tests/pom.xml @@ -146,10 +146,10 @@ generate-sources generate-sources - + - + run diff --git a/tez-plugins/tez-aux-services/pom.xml b/tez-plugins/tez-aux-services/pom.xml index 79960241ea..d935d8ef74 100644 --- a/tez-plugins/tez-aux-services/pom.xml +++ b/tez-plugins/tez-aux-services/pom.xml @@ -195,7 +195,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/objectregistry/TestObjectRegistry.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/objectregistry/TestObjectRegistry.java index acddf0f943..9e5ef5a1ba 100644 --- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/objectregistry/TestObjectRegistry.java +++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/objectregistry/TestObjectRegistry.java @@ -30,9 +30,9 @@ private void testCRUD(ObjectRegistry objectRegistry) { Assert.assertNull(objectRegistry.get("foo")); Assert.assertFalse(objectRegistry.delete("foo")); - Integer one = new Integer(1); - Integer two_1 = new Integer(2); - Integer two_2 = new Integer(3); + Integer one = 1; + Integer two_1 = 2; + Integer two_2 = 3; Assert.assertNull(objectRegistry.cacheForDAG("one", one)); Assert.assertEquals(one, objectRegistry.get("one")); Assert.assertNull(objectRegistry.cacheForDAG("two", two_1)); diff --git a/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManager.java b/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManager.java index 211e2e166f..4d444a1844 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManager.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManager.java @@ -148,8 +148,8 @@ public void testLargeDataSize() throws IOException { Assert.assertEquals(2, newEdgeManagers.size()); Assert.assertEquals(0, manager.pendingTasks.size()); // all tasks scheduled Assert.assertEquals(2, scheduledTasks.size()); - Assert.assertTrue(scheduledTasks.contains(new Integer(0))); - Assert.assertTrue(scheduledTasks.contains(new Integer(1))); + Assert.assertTrue(scheduledTasks.contains(0)); + Assert.assertTrue(scheduledTasks.contains(1)); Assert.assertEquals(4, manager.numBipartiteSourceTasksCompleted); Assert.assertEquals(4, manager.numVertexManagerEventsReceived); Assert.assertEquals(Long.MAX_VALUE >> 1 << 1, manager.completedSourceTasksOutputSize); diff --git a/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManagerBase.java b/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManagerBase.java index 6fa1a62fdf..bead2ce145 100644 --- a/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManagerBase.java +++ b/tez-runtime-library/src/test/java/org/apache/tez/dag/library/vertexmanager/TestShuffleVertexManagerBase.java @@ -423,8 +423,8 @@ public void testAutoParallelism() throws Exception { // TODO improve tests for parallelism Assert.assertEquals(0, manager.pendingTasks.size()); // all tasks scheduled Assert.assertEquals(2, scheduledTasks.size()); - Assert.assertTrue(scheduledTasks.contains(new Integer(0))); - Assert.assertTrue(scheduledTasks.contains(new Integer(1))); + Assert.assertTrue(scheduledTasks.contains(0)); + Assert.assertTrue(scheduledTasks.contains(1)); Assert.assertEquals(2, manager.numBipartiteSourceTasksCompleted); Assert.assertEquals(2, manager.numVertexManagerEventsReceived); Assert.assertEquals(100 * MB, manager.completedSourceTasksOutputSize); diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml index 25e82c66ba..fc628c5cf6 100644 --- a/tez-tests/pom.xml +++ b/tez-tests/pom.xml @@ -145,10 +145,10 @@ generate-sources generate-sources - + - + run diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java index f8b1317a47..f1c4fafc32 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java @@ -75,7 +75,7 @@ public class TestInput extends AbstractLogicalInput { Set failingTaskIndices = Sets.newHashSet(); Set failingTaskAttempts = Sets.newHashSet(); Set failingInputIndices = Sets.newHashSet(); - Integer failAll = new Integer(-1); + Integer failAll = -1; int[] inputValues; /** @@ -227,7 +227,7 @@ public int doRead() { previousAttemptReadFailed = true; } else { for (int i=0 ; i failingTaskIndices = Sets.newHashSet(); int failingTaskAttemptUpto = 0; - Integer failAll = new Integer(-1); + Integer failAll = -1; int verifyValue = -1; Set verifyTaskIndices = Sets.newHashSet(); @@ -293,7 +293,7 @@ public void run(Map inputs, + " attempt: " + getContext().getTaskAttemptNumber() + " is: " + sum); if (verifyTaskIndices - .contains(new Integer(getContext().getTaskIndex()))) { + .contains(getContext().getTaskIndex())) { if (verifyValue != -1 && verifyValue != sum) { // expected output value set and not equal to observed value String msg = "Expected output mismatch of current FailingProcessor: " diff --git a/tez-tools/analyzers/job-analyzer/src/main/java/org/apache/tez/analyzer/plugins/TezAnalyzerBase.java b/tez-tools/analyzers/job-analyzer/src/main/java/org/apache/tez/analyzer/plugins/TezAnalyzerBase.java index a39f7e13bf..bfb08fb1ee 100644 --- a/tez-tools/analyzers/job-analyzer/src/main/java/org/apache/tez/analyzer/plugins/TezAnalyzerBase.java +++ b/tez-tools/analyzers/job-analyzer/src/main/java/org/apache/tez/analyzer/plugins/TezAnalyzerBase.java @@ -264,7 +264,7 @@ public void printResults() throws TezException { String separator = sep.toString(); LOG.debug(separator); - LOG.debug(String.format(format.toString(), (String[]) headers)); + LOG.debug(String.format(format, (String[]) headers)); LOG.debug(separator); Iterator recordsIterator = ((CSVResult) result).getRecordsIterator();