From 3e3ea2628ff8e90b6e0e960e58c3d8f9462a4f56 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 10 Sep 2016 13:11:01 +0900 Subject: [PATCH 1/3] OutgoingEmailValidator: Revert back to using static initialization Using AtomicBoolean is racy. It's actually safer to use static initialization. The problem being addressed in change I92a6c98d8 was fixed by making the usage of OutgoingEmailValidator consistent in CreateEmail and CreateAccount. This partially reverts commit 3aaf8318936d08fbb2f4c5bdf4aaa475037d651a. Change-Id: Ia10c74705a3e467c9f31896ac72ec231acb37635 --- .../gerrit/server/mail/OutgoingEmailValidator.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java index 956b69357c..5ab5f4e3db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java @@ -19,15 +19,12 @@ import static org.apache.commons.validator.routines.DomainValidator.ArrayType.GE import org.apache.commons.validator.routines.DomainValidator; import org.apache.commons.validator.routines.EmailValidator; -import java.util.concurrent.atomic.AtomicBoolean; - public class OutgoingEmailValidator { - private static final AtomicBoolean initialized = new AtomicBoolean(false); + static { + DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"}); + } public static boolean isValid(String addr) { - if (!initialized.getAndSet(true)) { - DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"}); - } return EmailValidator.getInstance(true, true).isValid(addr); } } From 89c36ab07fa159d6144bc496216184e363b207df Mon Sep 17 00:00:00 2001 From: Paladox none Date: Fri, 9 Sep 2016 16:46:54 +0000 Subject: [PATCH 2/3] Fix the DiffPreference and EditPreference dialogs on diffs and edits If you don't have a big enough screen the options at the bottom get cut off so it makes it very hard to change the options Change-Id: I99ca18842b99a486589409f8c57d4ee901d0796a --- .../java/com/google/gerrit/client/diff/PreferencesBox.ui.xml | 3 ++- .../com/google/gerrit/client/editor/EditPreferencesBox.ui.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml index a2202ab54b..2b4817cf79 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml @@ -32,7 +32,8 @@ limitations under the License. color: #ffffff; font-family: arial,sans-serif; font-weight: bold; - overflow: hidden; + overflow: auto !important; + bottom: 0; text-align: left; text-shadow: 1px 1px 7px #000000; min-width: 300px; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml index ec8ad39b69..ab2adcda53 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml @@ -32,7 +32,8 @@ limitations under the License. color: #ffffff; font-family: arial,sans-serif; font-weight: bold; - overflow: hidden; + overflow: auto !important; + bottom: 0; text-align: left; text-shadow: 1px 1px 7px #000000; min-width: 300px; From f6fd4558fcd3faf10fdf335e1d7465fab558a298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Mon, 12 Sep 2016 09:23:26 -0400 Subject: [PATCH 3/3] Upgrade JGit to 4.4.1.201607150455-r.148-gabeaafc This snapshot includes the following changes since the previous: abeaafc Don't log error if system git config does not exist c711361 Add missing dependency to slf4j-log4j bridge a4508f9 Rename FSJava7Test to FSTest 5a4dcce Improve JavaDoc for LfsProtocolServlet.getLargeFileRepository The plan is to release Gerrit 2.13 with JGit 4.5 so this upgrade is to release 2.13-rc1 with a JGit version that is closer to what will be JGit 4.5. Change-Id: I75cf16a19abc5401f75be64efe72aa6013bd53b9 --- lib/JGIT_VERSION | 2 +- lib/jgit/org.eclipse.jgit.archive/BUCK | 2 +- lib/jgit/org.eclipse.jgit.http.server/BUCK | 2 +- lib/jgit/org.eclipse.jgit.junit/BUCK | 2 +- lib/jgit/org.eclipse.jgit/BUCK | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION index 83a2d7aa4d..5817fe8dcf 100644 --- a/lib/JGIT_VERSION +++ b/lib/JGIT_VERSION @@ -1,6 +1,6 @@ include_defs('//lib/maven.defs') REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.4.1.201607150455-r.144-gb67df51' +VERS = '4.4.1.201607150455-r.148-gabeaafc' DOC_VERS = '4.4.1.201607150455-r' # Set to VERS unless using a snapshot JGIT_DOC_URL="http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs" diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK index 4a60b16718..af0284f47a 100644 --- a/lib/jgit/org.eclipse.jgit.archive/BUCK +++ b/lib/jgit/org.eclipse.jgit.archive/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit-archive', id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = 'abaee87ff5d85ff0f32de5e56669063b73e5fae0', + sha1 = '73c3dd7d57c54b4ec95db6325e2d51dd3a0e6036', license = 'jgit', repository = REPO, deps = ['//lib/jgit/org.eclipse.jgit:jgit'], diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK index 2b5ad6eae8..c93ea99300 100644 --- a/lib/jgit/org.eclipse.jgit.http.server/BUCK +++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit-servlet', id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = 'a48e93266eb4a7a04a1767d6a16d2f0acf11402a', + sha1 = 'a85e11f0f31f71a4e4e83313c4c24167e99d330c', license = 'jgit', repository = REPO, deps = ['//lib/jgit/org.eclipse.jgit:jgit'], diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK index 09b072ee6e..9d4a2dd61e 100644 --- a/lib/jgit/org.eclipse.jgit.junit/BUCK +++ b/lib/jgit/org.eclipse.jgit.junit/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'junit', id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = 'ccd60b0f344e98af051449c52542a18576cf69ba', + sha1 = 'cd7e83bb138d0c3dad9d2dea27c238824d056a4b', license = 'DO_NOT_DISTRIBUTE', repository = REPO, unsign = True, diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK index 3cc27f7993..da1ad9a96d 100644 --- a/lib/jgit/org.eclipse.jgit/BUCK +++ b/lib/jgit/org.eclipse.jgit/BUCK @@ -4,8 +4,8 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit', id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - bin_sha1 = 'b28b6e0d14adfcf0a3afcf4002fe16dc2cc3e453', - src_sha1 = '362c6913beb90a278c5cd479f7536813fe007b60', + bin_sha1 = '0bbcd8846f2731e50fccfb9f3ced43e2298844d4', + src_sha1 = '72d8aa79f8e645bb44f9f2fe74d02c6021516261', license = 'jgit', repository = REPO, unsign = True,