Merge changes I62de7806,I893bca76
* changes:
ChangeIndexer: Remove unused OrmException from index methods
ChangeIndexer: Remove unused injection of NotesMigration
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
index 1791c73..61b828e 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
@@ -28,11 +28,11 @@
/**
* Starts the fluent chain for a querying or modifying an account. Please see the methods of
- * {@link MoreAccountOperations} for details on possible operations.
+ * {@link PerAccountOperations} for details on possible operations.
*
* @return an aggregation of operations on a specific account
*/
- MoreAccountOperations account(Account.Id accountId);
+ PerAccountOperations account(Account.Id accountId);
/**
* Starts the fluent chain to create an account. The returned builder can be used to specify the
@@ -58,7 +58,7 @@
TestAccountCreation.Builder newAccount();
/** An aggregation of methods on a specific account. */
- interface MoreAccountOperations {
+ interface PerAccountOperations {
/**
* Checks whether the account exists.
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
index f35404f..7f55c97 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
@@ -50,8 +50,8 @@
}
@Override
- public MoreAccountOperations account(Account.Id accountId) {
- return new MoreAccountOperationsImpl(accountId);
+ public PerAccountOperations account(Account.Id accountId) {
+ return new PerAccountOperationsImpl(accountId);
}
@Override
@@ -100,10 +100,10 @@
return builder.addExternalId(ExternalId.createUsername(username, accountId, httpPassword));
}
- private class MoreAccountOperationsImpl implements MoreAccountOperations {
+ private class PerAccountOperationsImpl implements PerAccountOperations {
private final Account.Id accountId;
- MoreAccountOperationsImpl(Account.Id accountId) {
+ PerAccountOperationsImpl(Account.Id accountId) {
this.accountId = accountId;
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
index bf305ff..533d06b 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
@@ -27,11 +27,11 @@
public interface GroupOperations {
/**
* Starts the fluent chain for querying or modifying a group. Please see the methods of {@link
- * MoreGroupOperations} for details on possible operations.
+ * PerGroupOperations} for details on possible operations.
*
* @return an aggregation of operations on a specific group
*/
- MoreGroupOperations group(AccountGroup.UUID groupUuid);
+ PerGroupOperations group(AccountGroup.UUID groupUuid);
/**
* Starts the fluent chain to create a group. The returned builder can be used to specify the
@@ -56,7 +56,7 @@
TestGroupCreation.Builder newGroup();
/** An aggregation of methods on a specific group. */
- interface MoreGroupOperations {
+ interface PerGroupOperations {
/**
* Checks whether the group exists.
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
index 9d87895..7ce5afa 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
@@ -60,8 +60,8 @@
}
@Override
- public MoreGroupOperations group(AccountGroup.UUID groupUuid) {
- return new MoreGroupOperationsImpl(groupUuid);
+ public PerGroupOperations group(AccountGroup.UUID groupUuid) {
+ return new PerGroupOperationsImpl(groupUuid);
}
@Override
@@ -101,10 +101,10 @@
return builder.build();
}
- private class MoreGroupOperationsImpl implements MoreGroupOperations {
+ private class PerGroupOperationsImpl implements PerGroupOperations {
private final AccountGroup.UUID groupUuid;
- MoreGroupOperationsImpl(AccountGroup.UUID groupUuid) {
+ PerGroupOperationsImpl(AccountGroup.UUID groupUuid) {
this.groupUuid = groupUuid;
}
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index de254be..4c576586 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -1,6 +1,6 @@
load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar")
-_JGIT_VERS = "5.1.3.201810200350-r"
+_JGIT_VERS = "5.2.0.201812061821-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
@@ -40,28 +40,28 @@
name = "jgit-lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "f270dbd1d792d5ad06074abe018a18644c90b60e",
- src_sha1 = "00e24ee2b721040edbb8520d705607a7f7bafd64",
+ sha1 = "250269f30458084777a480895e390d2a42143da3",
+ src_sha1 = "eb28d59b3ed0c68a8ba54a38dfb7aa8af6ce624b",
unsign = True,
)
maven_jar(
name = "jgit-servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "360405244c28b537f0eafdc0b9d9f3753503d981",
+ sha1 = "5d7fbe1c8528d881e2987c75e512df2cfa408d73",
unsign = True,
)
maven_jar(
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "08e10921fcc75ead2736dd5bf099ba8e2ed8a3fb",
+ sha1 = "6e49b0516b46ca90d394256d40c6069cdd8f2957",
)
maven_jar(
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "1dc8f86bba3c461cb90c9dc3e91bf343889ca684",
+ sha1 = "723b9e6c54f8b3012dd7d4fe42b616b8d10ee230",
unsign = True,
)
