Merge branch 'stable-2.12'

* stable-2.12:
  Fix log files not being compressed when running in a web container
  Update replication plugin
  Fix 'is:watched' query hanging issue due to no authenticated user
  Bypass hostname verification with sendemail.sslVerify
  Clarify in documentation that username cannot be changed
  Update 2.12.4 release notes with info about known issue 4323
  Update 2.12.4 release notes

Change-Id: I971d2ac9dc145494581e7cc61c13551d5223f178

Documentation/config-gerrit.txt

@@ -2677,7 +2677,10 @@ the form 'user@example.com' and return only the left hand side, for
 example `${userPrincipalName.localPart}` would provide only 'user'.
 +
 If set, users will be unable to modify their SSH username field, as
-Gerrit will populate it only from the LDAP data.
+Gerrit will populate it only from the LDAP data. Note that once the
+username has been set it cannot be changed, therefore it is
+recommended not to make changes to this setting that would cause the
+value to differ, as this will prevent users from logging in.
 +
 Default is `uid` for RFC 2307 servers,
 and `${sAMAccountName.toLowerCase}` for Active Directory.

Documentation/config-login-register.txt

@@ -89,7 +89,8 @@ The wizard helps you fill out:
 
 * Real name (visible name in Gerrit)
 * Register your email (it must be confirmed later)
-* Select a username with which to communicate with Gerrit over ssh+git
+* Select a username with which to communicate with Gerrit over ssh+git. Note
+that once saved, the username cannot be changed.
 
 * The server will ask you for an RSA public key.
 That's the key we generated above, and it's time to make sure that Gerrit knows

ReleaseNotes/ReleaseNotes-2.12.4.txt

@@ -41,6 +41,17 @@ When upgrading from a version earlier than 2.12, or from 2.12.1 or 2.12.2
 having already done the migration, this manual step is not necessary and
 should be omitted.
 
+== Known Issues
+
+* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4323[Issue 4323]:
+'value too long for type character varying(255)' in patch_sets table when
+migrating to schema version 108.
++
+This error may occur under some circumstances when running the schema
+migration from an earlier version of Gerrit.
++
+On sites where this occurs, it can be fixed with a manual schema update
+according to the comments in the issue.
 
 == Bug Fixes
 
@@ -88,3 +99,6 @@ used by another user.
 * link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4318[Issue 4318]
 Fix 'Rebase if Necessary' merge strategy to prevent introducing a duplicate
 commit when submitting a merge commit.
+
+* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4332[Issue 4332]:
+Allow `local` as a valid TLD for outgoing emails.

gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java

@@ -57,9 +57,11 @@ public class AuthSMTPClient extends SMTPClient {
 
     _socket_ = sslFactory(verify).createSocket(_socket_, hostname, port, true);
 
-    SSLParameters sslParams = new SSLParameters();
-    sslParams.setEndpointIdentificationAlgorithm("HTTPS");
-    ((SSLSocket)_socket_).setSSLParameters(sslParams);
+    if (verify) {
+      SSLParameters sslParams = new SSLParameters();
+      sslParams.setEndpointIdentificationAlgorithm("HTTPS");
+      ((SSLSocket)_socket_).setSSLParameters(sslParams);
+    }
 
     // XXX: Can't call _connectAction_() because SMTP server doesn't
     // give banner information again after STARTTLS, thus SMTP._connectAction_()

gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java

@@ -28,6 +28,7 @@ import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.gerrit.lucene.LuceneIndexModule;
 import com.google.gerrit.metrics.dropwizard.DropWizardMetricMaker;
+import com.google.gerrit.pgm.util.LogFileCompressor;
 import com.google.gerrit.reviewdb.client.AuthType;
 import com.google.gerrit.server.account.InternalAccountDirectory;
 import com.google.gerrit.server.cache.h2.DefaultCacheFactory;
@@ -295,6 +296,7 @@ public class WebAppInitializer extends GuiceServletContextListener
   private Injector createSysInjector() {
     final List<Module> modules = new ArrayList<>();
     modules.add(new DropWizardMetricMaker.RestModule());
+    modules.add(new LogFileCompressor.Module());
     modules.add(new EventBroker.Module());
     modules.add(new H2AccountPatchReviewStore.Module());
     modules.add(cfgInjector.getInstance(GitRepositoryManagerModule.class));