From 93f021a9d0499dce6021cbbb41fafaced306391c Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Fri, 12 Oct 2018 21:32:06 +0900
Subject: [PATCH 1/3] Add .apt_generated_tests to .gitignore

Change-Id: I1975da67be6268189c3875acfbb5dd6e33e6eee6
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4dfd6f268e..d1ddc33445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 .DS_Store
 .gwt_work_dir
 /.apt_generated
+/.apt_generated_tests
 /.bazel_path
 /.buckd
 /.classpath

From c8303767b19881714bd85ca3480a11c4c1577818 Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Mon, 15 Oct 2018 09:21:34 +0200
Subject: [PATCH 2/3] Remove unused method in ContributorAgreement

Change-Id: Ie0c19e3007ed87e41376260d815197e1a415564b
---
 .../gerrit/common/data/ContributorAgreement.java     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ContributorAgreement.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ContributorAgreement.java
index 2f8755e00e..b43dbfaed1 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ContributorAgreement.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ContributorAgreement.java
@@ -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;
-  }
 }

From e24963cffbcac4a881ed6c85f99d08b7aa859e0a Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Mon, 15 Oct 2018 10:26:52 +0900
Subject: [PATCH 3/3] Remove unused VERSION from lib/jackson/BUILD

Change-Id: Ic0286cad0e3c7bf483d37950f4cfc1fc4915b563
---
 lib/jackson/BUILD | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 9bf8f04d2f..3bc0a2be8f 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -1,7 +1,5 @@
 package(default_visibility = ["//visibility:public"])
 
-VERSION = "2.6.6"
-
 java_library(
     name = "jackson-core",
     data = ["//lib:LICENSE-Apache2.0"],