Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit cacfb32

Browse files
chtyimchtyim
committedJan 6, 2020
(TWILL-253) Remove support for Java 7
This fixes #81 on Github. Signed-off-by: Terence Yim <terencey@google.com>
·
v0.14.0
1 parent e2fe9d1 commit cacfb32

File tree

5 files changed

+16
-32
lines changed

5 files changed

+16
-32
lines changed
 

‎checkstyle.xml

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
9696
<!-- This ensures that static imports go to the end. -->
9797
<property name="option" value="bottom"/>
9898
<property name="tokens" value="STATIC_IMPORT, IMPORT"/>
99+
<property name="separated" value="true"/>
99100
</module>
100101

101102
<!--

‎pom.xml

+13-20
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,15 @@
192192
<build>
193193
<pluginManagement>
194194
<plugins>
195+
<plugin>
196+
<groupId>org.apache.maven.plugins</groupId>
197+
<artifactId>maven-compiler-plugin</artifactId>
198+
<version>3.8.1</version>
199+
<configuration>
200+
<source>1.8</source>
201+
<target>1.8</target>
202+
</configuration>
203+
</plugin>
195204
<plugin>
196205
<groupId>org.apache.maven.plugins</groupId>
197206
<artifactId>maven-source-plugin</artifactId>
@@ -212,7 +221,7 @@
212221
<plugin>
213222
<groupId>org.apache.maven.plugins</groupId>
214223
<artifactId>maven-javadoc-plugin</artifactId>
215-
<version>2.9</version>
224+
<version>3.1.1</version>
216225
<configuration>
217226
<excludePackageNames>*.internal.*:echo:*.example.*</excludePackageNames>
218227
<links>
@@ -235,14 +244,7 @@
235244
<plugin>
236245
<groupId>org.apache.maven.plugins</groupId>
237246
<artifactId>maven-checkstyle-plugin</artifactId>
238-
<version>2.11</version>
239-
<dependencies>
240-
<dependency>
241-
<groupId>com.puppycrawl.tools</groupId>
242-
<artifactId>checkstyle</artifactId>
243-
<version>6.5</version>
244-
</dependency>
245-
</dependencies>
247+
<version>3.1.0</version>
246248
<executions>
247249
<execution>
248250
<id>validate</id>
@@ -253,7 +255,7 @@
253255
<consoleOutput>true</consoleOutput>
254256
<failsOnError>true</failsOnError>
255257
<includeTestSourceDirectory>true</includeTestSourceDirectory>
256-
<sourceDirectory>${project.build.sourceDirectory}/..</sourceDirectory>
258+
<sourceDirectories>${project.build.sourceDirectory}/..</sourceDirectories>
257259
</configuration>
258260
<goals>
259261
<goal>check</goal>
@@ -264,7 +266,7 @@
264266
<plugin>
265267
<groupId>org.apache.rat</groupId>
266268
<artifactId>apache-rat-plugin</artifactId>
267-
<version>0.11</version>
269+
<version>0.13</version>
268270
<dependencies>
269271
<dependency>
270272
<groupId>org.apache.maven.doxia</groupId>
@@ -304,31 +306,22 @@
304306
<plugin>
305307
<groupId>org.apache.maven.plugins</groupId>
306308
<artifactId>maven-compiler-plugin</artifactId>
307-
<version>3.1</version>
308-
<configuration>
309-
<source>1.7</source>
310-
<target>1.7</target>
311-
</configuration>
312309
</plugin>
313310
<plugin>
314311
<groupId>org.apache.maven.plugins</groupId>
315312
<artifactId>maven-source-plugin</artifactId>
316-
<version>2.2.1</version>
317313
</plugin>
318314
<plugin>
319315
<groupId>org.apache.rat</groupId>
320316
<artifactId>apache-rat-plugin</artifactId>
321-
<version>0.11</version>
322317
</plugin>
323318
<plugin>
324319
<groupId>org.apache.maven.plugins</groupId>
325320
<artifactId>maven-checkstyle-plugin</artifactId>
326-
<version>2.12.1</version>
327321
</plugin>
328322
<plugin>
329323
<groupId>org.apache.maven.plugins</groupId>
330324
<artifactId>maven-javadoc-plugin</artifactId>
331-
<version>2.9.1</version>
332325
</plugin>
333326
<plugin>
334327
<groupId>org.apache.maven.plugins</groupId>

‎twill-java8-test/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@
5757

5858
<build>
5959
<plugins>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-compiler-plugin</artifactId>
63-
<version>3.1</version>
64-
<configuration>
65-
<source>1.8</source>
66-
<target>1.8</target>
67-
</configuration>
68-
</plugin>
69-
7060
<plugin>
7161
<groupId>org.apache.maven.plugins</groupId>
7262
<artifactId>maven-deploy-plugin</artifactId>

‎twill-yarn/src/main/java/org/apache/twill/internal/appmaster/ApplicationMasterService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ private void addContainerRequests(Resource capability,
753753
private void launchRunnable(List<? extends ProcessLauncher<YarnContainerInfo>> launchers,
754754
Queue<ProvisionRequest> provisioning) {
755755
for (ProcessLauncher<YarnContainerInfo> processLauncher : launchers) {
756-
LOG.info("Container allocated: {}", processLauncher.getContainerInfo().getContainer());
756+
LOG.info("Container allocated: {}", processLauncher.getContainerInfo().<Object>getContainer());
757757
ProvisionRequest provisionRequest = provisioning.peek();
758758
if (provisionRequest == null) {
759759
continue;

‎twill-yarn/src/main/java/org/apache/twill/internal/yarn/AbstractYarnAMClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public final synchronized void allocate(float progress, AllocateHandler handler)
144144
if (!launcher.isLaunched()) {
145145
YarnContainerInfo containerInfo = launcher.getContainerInfo();
146146
// Casting is needed in Java 8, otherwise it complains about ambiguous method over the info(String, Throwable)
147-
LOG.info("Nothing to run in container, releasing it: {}", containerInfo.getContainer());
147+
LOG.info("Nothing to run in container, releasing it: {}", containerInfo.<Object>getContainer());
148148
releaseAssignedContainer(containerInfo);
149149
}
150150
}

0 commit comments

Comments
 (0)
This repository has been archived.