opendev
/
gerrit
Code Issues Proposed changes

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:
David Pursehouse 2018-10-15 21:27:21 +09:00
parent e4d7bdf4a7 e24963cffb
commit e8bf569023
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
.DS_Store
.gwt_work_dir
/.apt_generated
/.apt_generated_tests
/.bazel_path
/.buckd
/.classpath

12
gerrit-common/src/main/java/com/google/gerrit/common/data/ContributorAgreement.java
View File

@ -16,7 +16,6 @@ package com.google.gerrit.common.data;
import com.google.gerrit.reviewdb.client.Project;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/** Portion of a {@link Project} describing a single contributor agreement. */
@ -85,15 +84,4 @@ public class ContributorAgreement implements Comparable<ContributorAgreement> {
public String toString() {
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;
}
}

2
lib/jackson/BUILD
View File

@ -1,7 +1,5 @@
package(default_visibility = ["//visibility:public"])
VERSION = "2.6.6"
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],