From 3931c16bdb1cb4dada80a34deb4a645d5b90ff48 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 15 Jun 2014 00:33:40 +0200 Subject: [PATCH] Build with Java 8 Change-Id: I06f811fc46a606b719582c0724e8d0c89e823b37 --- .buckconfig | 2 ++ .settings/org.eclipse.jdt.core.prefs | 6 +++--- Documentation/dev-buck.txt | 4 ++-- Documentation/install-quick.txt | 8 ++++---- Documentation/install.txt | 2 +- gerrit-main/src/main/java/Main.java | 4 ++-- .../main/java/com/google/gerrit/pgm/init/InitAuth.java | 4 ---- .../main/java/com/google/gerrit/pgm/init/InitCache.java | 4 ---- .../java/com/google/gerrit/pgm/init/InitContainer.java | 4 ---- .../java/com/google/gerrit/pgm/init/InitDatabase.java | 4 ---- .../java/com/google/gerrit/pgm/init/InitGitManager.java | 4 ---- .../main/java/com/google/gerrit/pgm/init/InitHttpd.java | 4 ---- .../main/java/com/google/gerrit/pgm/init/InitIndex.java | 4 ---- .../java/com/google/gerrit/pgm/init/InitSendEmail.java | 4 ---- .../main/java/com/google/gerrit/pgm/init/InitSshd.java | 4 ---- .../java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java | 4 ---- .../java/com/google/gerrit/pgm/init/api/InitStep.java | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- plugins/cookbook-plugin | 2 +- plugins/replication | 2 +- plugins/reviewnotes | 2 +- tools/GoogleFormat.xml | 6 +++--- tools/eclipse/project.py | 2 +- tools/java_doc.defs | 3 ++- 29 files changed, 39 insertions(+), 76 deletions(-) diff --git a/.buckconfig b/.buckconfig index 820e55714b..f2ca353a90 100644 --- a/.buckconfig +++ b/.buckconfig @@ -20,6 +20,8 @@ [java] jar_spool_mode = direct_to_jar src_roots = java, resources, src + source_level = 8 + target_level = 8 [project] ignore = .git, eclipse-out, bazel-gerrit diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 828234b965..fd57ff74b8 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -113,7 +113,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.processAnnotations=enabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt index 315c0b06b3..219da7ecdc 100644 --- a/Documentation/dev-buck.txt +++ b/Documentation/dev-buck.txt @@ -3,7 +3,7 @@ == Installation -You need to use Java 7 and Node.js for building gerrit. +You need to use Java 8 and Node.js for building gerrit. There is currently no binary distribution of Buck, so it has to be manually built and installed. Apache Ant and gcc are required. Currently only Linux @@ -547,7 +547,7 @@ heap size: ---- cat > .buckjavaargs <maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 diff --git a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs index 2a585e4257..602b029d99 100644 --- a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs +++ b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs @@ -4,8 +4,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning @@ -85,7 +85,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml index 2c7fe88057..baec648c9f 100644 --- a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml +++ b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml @@ -61,8 +61,8 @@ limitations under the License. maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 diff --git a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs index 2a585e4257..602b029d99 100644 --- a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs +++ b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs @@ -4,8 +4,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning @@ -85,7 +85,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml index 8f4aaddbac..7a3826078b 100644 --- a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml +++ b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml @@ -60,8 +60,8 @@ limitations under the License. maven-compiler-plugin 2.3.2 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin index fc39c552cf..de2d4d7e72 160000 --- a/plugins/cookbook-plugin +++ b/plugins/cookbook-plugin @@ -1 +1 @@ -Subproject commit fc39c552cffb94d15797d02e272fdc543c35b6bd +Subproject commit de2d4d7e7222e1f8b286ea13b316f77fae9ee878 diff --git a/plugins/replication b/plugins/replication index 5cac325cca..a592cc0cb6 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 5cac325cca171205130c53df8b3ee9ab3b115979 +Subproject commit a592cc0cb61ef309f21669c037ee6689780a6d89 diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 46079ec924..982292220c 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 46079ec92478ddc1e9ffd84eae22fb6af788c9fd +Subproject commit 982292220c81dadefae9535e9f439ba50e71df7e diff --git a/tools/GoogleFormat.xml b/tools/GoogleFormat.xml index 8062246c91..2c65b16ee7 100644 --- a/tools/GoogleFormat.xml +++ b/tools/GoogleFormat.xml @@ -45,7 +45,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -227,7 +227,7 @@ - + diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index 46f5680b8f..3d345889a3 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -28,7 +28,7 @@ GWT = ['//gerrit-gwtui:ui_module'] JRE = '/'.join([ 'org.eclipse.jdt.launching.JRE_CONTAINER', 'org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType', - 'JavaSE-1.7', + 'JavaSE-1.8', ]) ROOT = path.abspath(__file__) diff --git a/tools/java_doc.defs b/tools/java_doc.defs index 2bf27cf91e..583407c6d5 100644 --- a/tools/java_doc.defs +++ b/tools/java_doc.defs @@ -10,13 +10,14 @@ def java_doc( ): # TODO(davido): Actually we shouldn't need to extract the source # archive, javadoc should just work with provided archive. - external_docs.insert(0, 'http://docs.oracle.com/javase/7/docs/api') + external_docs.insert(0, 'http://docs.oracle.com/javase/8/docs/api') genrule( name = name, cmd = ' '.join([ 'mkdir $TMP/sourcepath &&', 'unzip $(location %s) -d $TMP/sourcepath &&' % source_jar, 'javadoc', + '-Xdoclint:-missing', '-quiet', '-protected', '-encoding UTF-8',