Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Remove unused VERSION from lib/jackson/BUILD Remove unused method in ContributorAgreement Add .apt_generated_tests to .gitignore Change-Id: I00a383a0f29f5106b32f2bff9efe9b530cb9b239
This commit is contained in:
commit
e8bf569023
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,6 +9,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.gwt_work_dir
|
.gwt_work_dir
|
||||||
/.apt_generated
|
/.apt_generated
|
||||||
|
/.apt_generated_tests
|
||||||
/.bazel_path
|
/.bazel_path
|
||||||
/.buckd
|
/.buckd
|
||||||
/.classpath
|
/.classpath
|
||||||
|
@ -16,7 +16,6 @@ package com.google.gerrit.common.data;
|
|||||||
|
|
||||||
import com.google.gerrit.reviewdb.client.Project;
|
import com.google.gerrit.reviewdb.client.Project;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** Portion of a {@link Project} describing a single contributor agreement. */
|
/** Portion of a {@link Project} describing a single contributor agreement. */
|
||||||
@ -85,15 +84,4 @@ public class ContributorAgreement implements Comparable<ContributorAgreement> {
|
|||||||
public String toString() {
|
public String toString() {
|
||||||
return "ContributorAgreement[" + getName() + "]";
|
return "ContributorAgreement[" + getName() + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContributorAgreement forUi() {
|
|
||||||
ContributorAgreement ca = new ContributorAgreement(name);
|
|
||||||
ca.description = description;
|
|
||||||
ca.accepted = Collections.emptyList();
|
|
||||||
if (autoVerify != null) {
|
|
||||||
ca.autoVerify = new GroupReference();
|
|
||||||
}
|
|
||||||
ca.agreementUrl = agreementUrl;
|
|
||||||
return ca;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
VERSION = "2.6.6"
|
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "jackson-core",
|
name = "jackson-core",
|
||||||
data = ["//lib:LICENSE-Apache2.0"],
|
data = ["//lib:LICENSE-Apache2.0"],
|
||||||
|
Loading…
Reference in New Issue
Block a user