Merge branch 'stable-2.10'

* stable-2.10:
  Update 2.10 release notes with information from 2.9.2
  Fix NullPointerException in Reindex
  Add CSS style name on review comment div
  Fix incorrect formatting in json documentation
  Don't use deprecated PGPPublicKeyRingCollection constructor
  Add InitStep to fix wrong primary key column order

This reverts commit 12b44cb390
(Add InitStep to fix wrong primary key column order) which is not
needed on master.

This reworks commit db88d15399
(Fix NullPointerException in Reindex) due to injection setup for
the reindex being changed between stable-2.10 and master.

Conflicts:
	gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java

Change-Id: I2061bd2265a7117f1a978c68ac692fe2f09b1884

Documentation/json.txt

@@ -149,8 +149,7 @@ was added or last updated.
 by:: Reviewer of the patch set in <<account,account attribute>>.
 
 [[refUpdate]]
-refUpdate
---------
+== refUpdate
 Information about a ref that was updated.
 
 oldRev:: The old value of the ref, prior to the update.

ReleaseNotes/ReleaseNotes-2.10.txt

@@ -8,7 +8,8 @@ link:https://gerrit-releases.storage.googleapis.com/gerrit-2.10.war[
 https://gerrit-releases.storage.googleapis.com/gerrit-2.10.war]
 
 Gerrit 2.10 includes the bug fixes done with
-link:ReleaseNotes-2.9.1.html[Gerrit 2.9.1].
+link:ReleaseNotes-2.9.1.html[Gerrit 2.9.1] and
+link:ReleaseNotes-2.9.2.html[Gerrit 2.9.2].
 These bug fixes are *not* listed in these release notes.
 
 Important Notes
@@ -21,6 +22,11 @@ Important Notes
   java -jar gerrit.war reindex --recheck-mergeable -d site_path
 ----
 
+*WARNING:* When upgrading from an existing site that was initialised with Gerrit
+version 2.6 to version 2.9.1, the primary key column order will be updated for
+some tables. It is therefore important to upgrade the site with the init program,
+rather than only copying the .war file over the existing one.
+
 *WARNING:* Upgrading to 2.10.x requires the server be first upgraded to 2.1.7 (or
 a later 2.1.x version), and then to 2.10.x.  If you are upgrading from 2.2.x.x or
 later, you may ignore this warning and upgrade directly to 2.10.x.

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml

@@ -104,6 +104,8 @@ limitations under the License.
     .closed .reply {
       visibility: HIDDEN;
     }
+    .comment {
+    }
   </ui:style>
 
   <g:HTMLPanel
@@ -124,7 +126,8 @@ limitations under the License.
       </g:HTMLPanel>
       <div ui:field='message'
            aria-hidden='true'
-           style='display: NONE'/>
+           style='display: NONE'
+           styleName='{style.comment}'/>
       <g:FlowPanel ui:field='comments' visible='false'/>
     </div>
   </g:HTMLPanel>

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java

@@ -127,6 +127,7 @@ public class Reindex extends SiteProgram {
     }
     modules.add(changeIndexModule);
     modules.add(dbInjector.getInstance(BatchProgramModule.class));
+
     return dbInjector.createChildInjector(modules);
   }
 

gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java

@@ -19,6 +19,7 @@ import static com.google.inject.Scopes.SINGLETON;
 import com.google.common.cache.Cache;
 import com.google.gerrit.extensions.registration.DynamicMap;
 import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.reviewdb.client.AccountGroup;
 import com.google.gerrit.rules.PrologModule;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.IdentifiedUser;
@@ -37,6 +38,8 @@ import com.google.gerrit.server.config.CanonicalWebUrlProvider;
 import com.google.gerrit.server.config.DisableReverseDnsLookup;
 import com.google.gerrit.server.config.DisableReverseDnsLookupProvider;
 import com.google.gerrit.server.config.FactoryModule;
+import com.google.gerrit.server.config.GitReceivePackGroups;
+import com.google.gerrit.server.config.GitUploadPackGroups;
 import com.google.gerrit.server.git.ChangeCache;
 import com.google.gerrit.server.git.MergeUtil;
 import com.google.gerrit.server.git.TagCache;
@@ -44,10 +47,11 @@ import com.google.gerrit.server.group.GroupModule;
 import com.google.gerrit.server.mail.ReplacePatchSetSender;
 import com.google.gerrit.server.notedb.NoteDbModule;
 import com.google.gerrit.server.patch.PatchListCacheImpl;
-import com.google.gerrit.server.project.AccessControlModule;
+import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.CommentLinkInfo;
 import com.google.gerrit.server.project.CommentLinkProvider;
 import com.google.gerrit.server.project.ProjectCacheImpl;
+import com.google.gerrit.server.project.ProjectControl;
 import com.google.gerrit.server.project.ProjectState;
 import com.google.gerrit.server.project.SectionSortCache;
 import com.google.gerrit.server.query.change.ChangeData;
@@ -56,7 +60,9 @@ import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Providers;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Module for programs that perform batch operations on a site.
@@ -97,7 +103,16 @@ public class BatchProgramModule extends FactoryModule {
     bind(CurrentUser.class).to(IdentifiedUser.class);
     factory(MergeUtil.Factory.class);
     factory(PatchSetInserter.Factory.class);
-    install(new AccessControlModule());
+
+    bind(new TypeLiteral<Set<AccountGroup.UUID>>() {})
+      .annotatedWith(GitUploadPackGroups.class)
+      .toInstance(Collections.<AccountGroup.UUID> emptySet());
+    bind(new TypeLiteral<Set<AccountGroup.UUID>>() {})
+      .annotatedWith(GitReceivePackGroups.class)
+      .toInstance(Collections.<AccountGroup.UUID> emptySet());
+    factory(ChangeControl.AssistedFactory.class);
+    factory(ProjectControl.AssistedFactory.class);
+
     install(new BatchGitModule());
     install(new DefaultCacheFactory.Module());
     install(new GroupModule());

gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java

@@ -129,7 +129,7 @@ public class ChangeControl {
     }
   }
 
-  interface AssistedFactory {
+  public interface AssistedFactory {
     ChangeControl create(RefControl refControl, Change change);
     ChangeControl create(RefControl refControl, ChangeNotes notes);
   }

gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java

@@ -138,7 +138,7 @@ public class ProjectControl {
     }
   }
 
-  interface AssistedFactory {
+  public interface AssistedFactory {
     ProjectControl create(CurrentUser who, ProjectState ps);
   }