Merge "Don't import Id/Key/NameKey directly"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.java
index 55f5470..8d5b72c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.java
@@ -17,7 +17,7 @@
import com.google.gwt.i18n.client.Messages;
public interface ChangeMessages extends Messages {
- String patchSets(String currentlyViewedPatchSet, String currentPatchSet);
+ String patchSets(String currentlyViewedPatchSet, int currentPatchSet);
String changeWithNoRevisions(int changeId);
String relatedChanges(int count);
String relatedChanges(String count);
@@ -27,4 +27,5 @@
String cherryPicks(String count);
String sameTopic(int count);
String sameTopic(String count);
+ String editPatchSet(int patchSet);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.properties
index 5fddd8e..6e095fb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeMessages.properties
@@ -4,3 +4,4 @@
conflictingChanges = Conflicts With ({0})
cherryPicks = Cherry-Picks ({0})
sameTopic = Same Topic ({0})
+editPatchSet = edit:{0}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
index ad763f8..cfc1fa1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
@@ -360,17 +360,25 @@
}
private void initRevisionsAction(ChangeInfo info, String revision) {
- String currentPatchSet;
+ int currentPatchSet;
if (info.current_revision() != null
&& info.revisions().containsKey(info.current_revision())) {
- currentPatchSet = info.revision(info.current_revision()).id();
+ currentPatchSet = info.revision(info.current_revision())._number();
} else {
JsArray<RevisionInfo> revList = info.revisions().values();
RevisionInfo.sortRevisionInfoByNumber(revList);
- currentPatchSet = revList.get(revList.length() - 1).id();
+ currentPatchSet = revList.get(revList.length() - 1)._number();
}
- String currentlyViewedPatchSet = info.revision(revision).id();
+ String currentlyViewedPatchSet;
+ if (info.revision(revision).id().equals("edit")) {
+ currentlyViewedPatchSet =
+ Resources.M.editPatchSet(RevisionInfo.findEditParent(info.revisions()
+ .values()));
+ currentPatchSet = info.revisions().values().length() - 1;
+ } else {
+ currentlyViewedPatchSet = info.revision(revision).id();
+ }
patchSetsText.setInnerText(Resources.M.patchSets(
currentlyViewedPatchSet, currentPatchSet));
patchSetsAction = new PatchSetsAction(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileBox.java
index 803990f..0a3d356 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileBox.java
@@ -32,6 +32,7 @@
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.TextBoxBase;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwtexpui.globalkey.client.NpTextArea;
@@ -56,12 +57,8 @@
this.fileName = fileName;
this.fileContent = fileC;
initWidget(uiBinder.createAndBindUi(this));
- new TextBoxChangeListener(content) {
- public void onTextChanged(String newText) {
- save.setEnabled(!file.getText().trim().isEmpty()
- && !newText.trim().equals(fileContent));
- }
- };
+ new EditFileBoxListener(content);
+ new EditFileBoxListener(file);
}
@Override
@@ -107,4 +104,16 @@
}
}
}
+
+ private class EditFileBoxListener extends TextBoxChangeListener {
+ public EditFileBoxListener(TextBoxBase base) {
+ super(base);
+ }
+
+ @Override
+ public void onTextChanged(String newText) {
+ save.setEnabled(!file.getText().trim().isEmpty()
+ && !newText.trim().equals(fileContent));
+ }
+ }
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
index b90a743..bf9999f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
@@ -270,7 +270,7 @@
});
}
- private static int findEditParent(JsArray<RevisionInfo> list) {
+ public static int findEditParent(JsArray<RevisionInfo> list) {
for (int i = 0; i < list.length(); i++) {
// edit under revisions?
RevisionInfo editInfo = list.get(i);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
index f0115ad..e5ad340 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
@@ -25,8 +25,10 @@
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.util.ErrorLogFile;
import com.google.gerrit.pgm.util.IoUtil;
+import com.google.gerrit.pgm.util.SecureStoreProvider;
import com.google.gerrit.server.config.GerritServerConfigModule;
import com.google.gerrit.server.config.SitePath;
+import com.google.gerrit.server.securestore.SecureStore;
import com.google.gerrit.server.util.HostPlatform;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -102,6 +104,7 @@
protected void configure() {
bind(File.class).annotatedWith(SitePath.class).toInstance(getSitePath());
bind(Browser.class);
+ bind(SecureStore.class).toProvider(SecureStoreProvider.class);
}
});
modules.add(new GerritServerConfigModule());
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SecureStoreProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SecureStoreProvider.java
new file mode 100644
index 0000000..27437d9
--- /dev/null
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SecureStoreProvider.java
@@ -0,0 +1,86 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.pgm.util;
+
+import com.google.common.base.Strings;
+import com.google.gerrit.server.config.SitePaths;
+import com.google.gerrit.server.securestore.DefaultSecureStore;
+import com.google.gerrit.server.securestore.SecureStore;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+
+import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.util.FS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+
+public class SecureStoreProvider implements Provider<SecureStore> {
+ private static final Logger log = LoggerFactory
+ .getLogger(SecureStoreProvider.class);
+
+ private final File libdir;
+ private final Injector injector;
+ private final String secureStoreClassName;
+
+ private SecureStore instance;
+
+ @Inject
+ SecureStoreProvider(
+ Injector injector,
+ SitePaths sitePaths) {
+ FileBasedConfig cfg =
+ new FileBasedConfig(sitePaths.gerrit_config, FS.DETECTED);
+ try {
+ cfg.load();
+ } catch (IOException | ConfigInvalidException e) {
+ throw new RuntimeException("Cannot read gerrit.config file", e);
+ }
+ this.injector = injector;
+ this.libdir = sitePaths.lib_dir;
+ this.secureStoreClassName =
+ cfg.getString("gerrit", null, "secureStoreClass");
+ }
+
+ @Override
+ public SecureStore get() {
+ if (instance == null) {
+ instance = injector.getInstance(getSecureStoreImpl());
+ }
+ return instance;
+ }
+
+ @SuppressWarnings("unchecked")
+ private Class<? extends SecureStore> getSecureStoreImpl() {
+ if (Strings.isNullOrEmpty(secureStoreClassName)) {
+ return DefaultSecureStore.class;
+ }
+
+ SiteLibraryLoaderUtil.loadSiteLib(libdir);
+ try {
+ return (Class<? extends SecureStore>) Class.forName(secureStoreClassName);
+ } catch (ClassNotFoundException e) {
+ String msg =
+ String.format("Cannot load secure store class: %s",
+ secureStoreClassName);
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+ }
+}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
index 3c60510..a0fad18 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -30,6 +30,7 @@
import com.google.gerrit.server.schema.DataSourceType;
import com.google.gerrit.server.schema.DatabaseModule;
import com.google.gerrit.server.schema.SchemaModule;
+import com.google.gerrit.server.securestore.SecureStore;
import com.google.gwtorm.server.OrmException;
import com.google.inject.AbstractModule;
import com.google.inject.Binding;
@@ -96,6 +97,7 @@
@Override
protected void configure() {
bind(File.class).annotatedWith(SitePath.class).toInstance(sitePath);
+ bind(SecureStore.class).toProvider(SecureStoreProvider.class);
}
};
modules.add(sitePathModule);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfig.java
new file mode 100644
index 0000000..56fe964
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfig.java
@@ -0,0 +1,46 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.config;
+
+import com.google.gerrit.server.securestore.SecureStore;
+
+import org.eclipse.jgit.lib.Config;
+
+class GerritConfig extends Config {
+ private final SecureStore secureStore;
+
+ GerritConfig(Config baseConfig, SecureStore secureStore) {
+ super(baseConfig);
+ this.secureStore = secureStore;
+ }
+
+ @Override
+ public String getString(String section, String subsection, String name) {
+ String secure = secureStore.get(section, subsection, name);
+ if (secure != null) {
+ return secure;
+ }
+ return super.getString(section, subsection, name);
+ }
+
+ @Override
+ public String[] getStringList(String section, String subsection, String name) {
+ String[] secure = secureStore.getList(section, subsection, name);
+ if (secure != null) {
+ return secure;
+ }
+ return super.getStringList(section, subsection, name);
+ }
+}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
index 92a2614..4dd9fd4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
@@ -14,6 +14,7 @@
package com.google.gerrit.server.config;
+import com.google.gerrit.server.securestore.SecureStore;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.ProvisionException;
@@ -33,10 +34,12 @@
LoggerFactory.getLogger(GerritServerConfigProvider.class);
private final SitePaths site;
+ private final SecureStore secureStore;
@Inject
- GerritServerConfigProvider(final SitePaths site) {
+ GerritServerConfigProvider(final SitePaths site, final SecureStore secureStore) {
this.site = site;
+ this.secureStore = secureStore;
}
@Override
@@ -46,7 +49,7 @@
if (!cfg.getFile().exists()) {
log.info("No " + site.gerrit_config.getAbsolutePath()
+ "; assuming defaults");
- return cfg;
+ return new GerritConfig(cfg, secureStore);
}
try {
@@ -57,17 +60,6 @@
throw new ProvisionException(e.getMessage(), e);
}
- if (site.secure_config.exists()) {
- cfg = new FileBasedConfig(cfg, site.secure_config, FS.DETECTED);
- try {
- cfg.load();
- } catch (IOException e) {
- throw new ProvisionException(e.getMessage(), e);
- } catch (ConfigInvalidException e) {
- throw new ProvisionException(e.getMessage(), e);
- }
- }
-
- return cfg;
+ return new GerritConfig(cfg, secureStore);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
index 4d3043b..aa16562 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
@@ -27,6 +27,7 @@
import com.google.common.base.Supplier;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -178,8 +179,11 @@
return;
} else if (hashtagsLines.size() > 1) {
throw expectedOneFooter(FOOTER_HASHTAGS, hashtagsLines);
+ } else if (hashtagsLines.get(0).isEmpty()) {
+ hashtags = ImmutableSet.of();
+ } else {
+ hashtags = Sets.newHashSet(Splitter.on(',').split(hashtagsLines.get(0)));
}
- hashtags = Sets.newHashSet(Splitter.on(',').split(hashtagsLines.get(0)));
}
private Change.Status parseStatus(RevCommit commit)
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java
index 4c54cc8..19d183f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java
@@ -14,11 +14,8 @@
package com.google.gerrit.server.securestore;
-import com.google.gerrit.extensions.annotations.ExtensionPoint;
-
import java.util.List;
-@ExtensionPoint
public interface SecureStore {
String get(String section, String subsection, String name);
diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK
index 2e3d84d..fcd6c82 100644
--- a/lib/jetty/BUCK
+++ b/lib/jetty/BUCK
@@ -1,12 +1,12 @@
include_defs('//lib/maven.defs')
-VERSION = '9.2.1.v20140609'
+VERSION = '9.2.2.v20140723'
EXCLUDE = ['about.html']
maven_jar(
name = 'servlet',
id = 'org.eclipse.jetty:jetty-servlet:' + VERSION,
- sha1 = 'f2327faaf09a3f306babc209f9a7ae01b1528464',
+ sha1 = '98d3dde183295cf3356c7ac2c968e5b684fcaba1',
license = 'Apache2.0',
deps = [
':security',
@@ -18,7 +18,7 @@
maven_jar(
name = 'security',
id = 'org.eclipse.jetty:jetty-security:' + VERSION,
- sha1 = '8ac8cc9e5c66eb6022cbe80f4e22d4e42dc5e643',
+ sha1 = 'b66f8f4b9afd82af24b9f7ffcd5312eb628ee0c9',
license = 'Apache2.0',
deps = [':server'],
exclude = EXCLUDE,
@@ -28,7 +28,7 @@
maven_jar(
name = 'webapp',
id = 'org.eclipse.jetty:jetty-webapp:' + VERSION,
- sha1 = '906e0f4ba7a0cebb8af61513c8511981ba2ccf6e',
+ sha1 = 'b3f79ac363c6e5ff283834762093da3818e2834b',
license = 'Apache2.0',
deps = [':xml'],
exclude = EXCLUDE,
@@ -41,7 +41,7 @@
maven_jar(
name = 'servlets',
id = 'org.eclipse.jetty:jetty-servlets:' + VERSION,
- sha1 = '36053479af8213a14d320845e5b5b1b595778f74',
+ sha1 = '457063f20e3676ddd7e7c4dfce90ef74dd54a276',
license = 'Apache2.0',
exclude = EXCLUDE,
visibility = [
@@ -53,7 +53,7 @@
maven_jar(
name = 'xml',
id = 'org.eclipse.jetty:jetty-xml:' + VERSION,
- sha1 = '0d589789eb98d31160d11413b6323b9ea4569046',
+ sha1 = '577f736d6e3a7284a78cf9b58f1fc809551a7329',
license = 'Apache2.0',
exclude = EXCLUDE,
visibility = [],
@@ -62,7 +62,7 @@
maven_jar(
name = 'server',
id = 'org.eclipse.jetty:jetty-server:' + VERSION,
- sha1 = 'd02c51c4f8eec3174b09b6e978feaaf05c3dc4ea',
+ sha1 = 'dbf076744c15ef879c89464c1d0cfd3a250a9766',
license = 'Apache2.0',
exported_deps = [
':continuation',
@@ -74,7 +74,7 @@
maven_jar(
name = 'jmx',
id = 'org.eclipse.jetty:jetty-jmx:' + VERSION,
- sha1 = '1258d5ac618b120026da8a82283e6cb8ff4638a6',
+ sha1 = '64b3ff4d0cee0acee363a1c98193332e8f845a6e',
license = 'Apache2.0',
exported_deps = [
':continuation',
@@ -86,7 +86,7 @@
maven_jar(
name = 'continuation',
id = 'org.eclipse.jetty:jetty-continuation:' + VERSION,
- sha1 = 'e5bf20cdcd9c2878677f3c0f43baea2725f8c59e',
+ sha1 = 'a39e8cee9c36d159c6ab3283eb59f8bc2fd16c43',
license = 'Apache2.0',
exclude = EXCLUDE,
)
@@ -94,7 +94,7 @@
maven_jar(
name = 'http',
id = 'org.eclipse.jetty:jetty-http:' + VERSION,
- sha1 = 'a132617cb898afc9d4ce5d586e11ad90b9831fff',
+ sha1 = '6301fc80fa66d9b1462613fd9c137402663b4d1e',
license = 'Apache2.0',
exported_deps = [':io'],
exclude = EXCLUDE,
@@ -103,7 +103,7 @@
maven_jar(
name = 'io',
id = 'org.eclipse.jetty:jetty-io:' + VERSION,
- sha1 = '8465fe92159632e9f0a1bfe6951dba8163ac0b12',
+ sha1 = 'f2237b1705fcac83cedf8390eb4b29ac845cde1c',
license = 'Apache2.0',
exported_deps = [':util'],
exclude = EXCLUDE,
@@ -113,7 +113,7 @@
maven_jar(
name = 'util',
id = 'org.eclipse.jetty:jetty-util:' + VERSION,
- sha1 = '4ae7ac5d3cfcb21bc288dd3f4ec3ba2823442f0d',
+ sha1 = '2e199b14a57b0336b4f2c9fdf8add525d6112833',
license = 'Apache2.0',
exclude = EXCLUDE,
visibility = [],
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK
index 0c35900..ba390ab 100644
--- a/lib/jgit/BUCK
+++ b/lib/jgit/BUCK
@@ -1,14 +1,12 @@
include_defs('//lib/maven.defs')
-VERS = '3.4.1.201406201815-r.112-g94c4d7e'
-REPO = GERRIT
+VERS = '3.5.0.201409071800-rc1'
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
- repository = REPO,
- bin_sha1 = '71a742daa0b0c00ed4cfcc92a5c1118ab88dbcff',
- src_sha1 = '6862fad24075de2f7cbdd8193f6ce533154a8352',
+ bin_sha1 = 'e520f25877d6ec940ac98faa5ffa97a75d83b653',
+ src_sha1 = '2c9eda84801364e9b07a458114a5a5c04bb8c99b',
license = 'jgit',
unsign = True,
deps = [':ewah'],
@@ -22,8 +20,7 @@
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
- repository = REPO,
- sha1 = '8954853d1cb126fe2f6ac8a28eb3d3b58d720fa0',
+ sha1 = '089e041d5065a7aa30366c3f1610868bac50bdba',
license = 'jgit',
deps = [':jgit'],
unsign = True,
@@ -36,8 +33,7 @@
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
- repository = REPO,
- sha1 = 'ec54f685eb312f5d70170d496e5b18587f3cc1b7',
+ sha1 = 'b335e60660653a6a421e76af5604d84ca526aa6a',
license = 'jgit',
deps = [':jgit',
'//lib/commons:compress',
@@ -53,8 +49,7 @@
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
- repository = REPO,
- sha1 = '539361def7007b26a3ca87b6179295fbf74e5a94',
+ sha1 = '9253ab01d92ccd657290b5996defa64177e738d0',
license = 'DO_NOT_DISTRIBUTE',
unsign = True,
deps = [':jgit'],
diff --git a/lib/maven.defs b/lib/maven.defs
index f11bd3c..4edba9c 100644
--- a/lib/maven.defs
+++ b/lib/maven.defs
@@ -14,7 +14,6 @@
include_defs('//lib/local.defs')
-ATLASSIAN = 'ATLASSIAN:'
GERRIT = 'GERRIT:'
GERRIT_API = 'GERRIT_API:'
MAVEN_CENTRAL = 'MAVEN_CENTRAL:'
diff --git a/lib/mina/BUCK b/lib/mina/BUCK
index fac2ba4..9cac959 100644
--- a/lib/mina/BUCK
+++ b/lib/mina/BUCK
@@ -8,12 +8,11 @@
maven_jar(
name = 'sshd',
- id = 'org.apache.sshd:sshd-core:0.11.1-atlassian-1',
- sha1 = '0de20bfa03ddeedc8eb54ab6e85e90e776ea18f8',
+ id = 'org.apache.sshd:sshd-core:0.12.0',
+ sha1 = 'b411b3b4ae1d3a8c132cd46cddf126d4dc3fcc71',
license = 'Apache2.0',
deps = [':core'],
exclude = EXCLUDE,
- repository = ATLASSIAN,
)
maven_jar(
diff --git a/tools/util.py b/tools/util.py
index f3cc8ce..ec895dd 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -15,7 +15,6 @@
from os import path
REPO_ROOTS = {
- 'ATLASSIAN': 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty',
'GERRIT': 'http://gerrit-maven.storage.googleapis.com',
'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release',
'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2',
