From 70d6a4ea5100a9bf22b7203cd9c4016ee388a53a Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Thu, 15 Nov 2018 16:05:11 -0800
Subject: [PATCH 01/13] added fossa build step

---
 .circleci/config.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d938b76e3..2a22d1061 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,3 +22,20 @@ jobs:
           path: ~/junit
       - store_artifacts:
           path: ~/junit
+  fossa:
+    branches:
+      ignore:
+        - gh-pages
+    docker:
+      - image: circleci/java
+      - image: fossa/fossa-cli
+    steps:
+      - checkout
+      - run: fossa -p $CIRCLE_PROJECT_REPONAME -r $CIRCLE_SHA1 -m gradle
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build
+      - fossa
\ No newline at end of file

From e52c72ff5116c28a82736ec226398fac3c6be25f Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Thu, 15 Nov 2018 16:16:48 -0800
Subject: [PATCH 02/13] empty commit


From e98f67364cdd68429bc64a85ab66194d32709700 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:10:58 -0800
Subject: [PATCH 03/13] moved workflow filter definition

---
 .circleci/config.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a22d1061..6c6eb9d22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,6 @@
 version: 2
 jobs:
   build:
-    branches:
-      ignore:
-        - gh-pages
     docker:
       - image: circleci/java
       - image: redis
@@ -23,9 +20,6 @@ jobs:
       - store_artifacts:
           path: ~/junit
   fossa:
-    branches:
-      ignore:
-        - gh-pages
     docker:
       - image: circleci/java
       - image: fossa/fossa-cli
@@ -37,5 +31,13 @@ workflows:
   version: 2
   test:
     jobs:
-      - build
-      - fossa
\ No newline at end of file
+      - build:
+          filters:
+            branches:
+              ignore:
+                - gh-pages
+      - fossa:
+          filters:
+            branches:
+              ignore:
+                - gh-pages
\ No newline at end of file

From e8c95aab1f92e665a89736410e6ad32fe1a5566f Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:19:17 -0800
Subject: [PATCH 04/13] fixed docker image reference for fossa

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c6eb9d22..cf19acbcd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,7 @@ jobs:
           path: ~/junit
   fossa:
     docker:
-      - image: circleci/java
-      - image: fossa/fossa-cli
+      - image: fossa/fossa-cli:base
     steps:
       - checkout
       - run: fossa -p $CIRCLE_PROJECT_REPONAME -r $CIRCLE_SHA1 -m gradle

From c481f30a6b1fa0f4b55bc1a8f28c695caddffb9a Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:36:12 -0800
Subject: [PATCH 05/13] give up on fossa-cli docker image

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf19acbcd..40d0fbb20 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,9 +21,10 @@ jobs:
           path: ~/junit
   fossa:
     docker:
-      - image: fossa/fossa-cli:base
+      - image: circleci/java
     steps:
       - checkout
+      - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
       - run: fossa -p $CIRCLE_PROJECT_REPONAME -r $CIRCLE_SHA1 -m gradle
 
 workflows:

From cffdea7195e10eb4c6420fdcfebad83f46d68794 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:39:52 -0800
Subject: [PATCH 06/13] added fossa.yml config

---
 .circleci/config.yml | 2 +-
 .fossa.yaml          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .fossa.yaml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 40d0fbb20..f434e341c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - checkout
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: fossa -p $CIRCLE_PROJECT_REPONAME -r $CIRCLE_SHA1 -m gradle
+      - run: fossa -p $CIRCLE_REPOSITORY_URL -r $CIRCLE_SHA1
 
 workflows:
   version: 2
diff --git a/.fossa.yaml b/.fossa.yaml
new file mode 100644
index 000000000..e69de29bb

From 6df4a6c3e08a71a669ea12a44ce50552b78908e6 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:45:21 -0800
Subject: [PATCH 07/13] use v1 of fossa config?

---
 .fossa.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.fossa.yaml b/.fossa.yaml
index e69de29bb..a0093cba6 100644
--- a/.fossa.yaml
+++ b/.fossa.yaml
@@ -0,0 +1,5 @@
+version: 1
+
+analyze:
+  modules:
+    - name: gradle
\ No newline at end of file

From a2d8e0b25655fc8aa04e79374e8c8ae844a8042e Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:48:23 -0800
Subject: [PATCH 08/13] iterate on fossa config

---
 .fossa.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.fossa.yaml b/.fossa.yaml
index a0093cba6..16b10e467 100644
--- a/.fossa.yaml
+++ b/.fossa.yaml
@@ -2,4 +2,6 @@ version: 1
 
 analyze:
   modules:
-    - name: gradle
\ No newline at end of file
+    - name: fossa-cli
+      path: ./cmd/fossa
+      type: gradle
\ No newline at end of file

From 03ffa5dbaea320ab2492677296599ead076f1f22 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 13:54:28 -0800
Subject: [PATCH 09/13] run fossa init

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f434e341c..507174d56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,9 @@ jobs:
     steps:
       - checkout
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: fossa -p $CIRCLE_REPOSITORY_URL -r $CIRCLE_SHA1
+      - run: fossa init -p $CIRCLE_REPOSITORY_URL -r $CIRCLE_SHA1
+      - run: cat .fossa.yaml
+      - run: fossa
 
 workflows:
   version: 2

From 4c17f0444bae8e36b7da095df497ef5e84ba66fb Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 16:47:12 -0800
Subject: [PATCH 10/13] adapted fossa setup after seeing pr from fossa engineer

---
 .circleci/config.yml |  6 ++++--
 .fossa.yaml          | 12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 507174d56..7c3ca8f79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,10 +24,12 @@ jobs:
       - image: circleci/java
     steps:
       - checkout
+      - run: cp gradle.properties.example gradle.properties
+      - run: ./gradlew dependencies
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: fossa init -p $CIRCLE_REPOSITORY_URL -r $CIRCLE_SHA1
+      - run: sed -i.bak "s/REPO_NAME/$CIRCLE_PROJECT_REPONAME" .fossa.yaml
       - run: cat .fossa.yaml
-      - run: fossa
+      - run: fossa -r $CIRCLE_SHA1
 
 workflows:
   version: 2
diff --git a/.fossa.yaml b/.fossa.yaml
index 16b10e467..f400553f2 100644
--- a/.fossa.yaml
+++ b/.fossa.yaml
@@ -1,7 +1,13 @@
 version: 1
 
+cli:
+  server: https://app.fossa.io
+  fetcher: git
+  project: github.com/launchdarkly/REPO_NAME
 analyze:
   modules:
-    - name: fossa-cli
-      path: ./cmd/fossa
-      type: gradle
\ No newline at end of file
+    - name: REPO_NAME
+      path: .
+      type: gradle
+      options:
+        task: dependencies
\ No newline at end of file

From fcbf66b20a6993f36219e1f7efd4e32eb663d7e1 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 16:49:14 -0800
Subject: [PATCH 11/13] fixed sed command for fossa config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c3ca8f79..345e66388 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ jobs:
       - run: cp gradle.properties.example gradle.properties
       - run: ./gradlew dependencies
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: sed -i.bak "s/REPO_NAME/$CIRCLE_PROJECT_REPONAME" .fossa.yaml
+      - run: sed -i.bak "s/REPO_NAME/$CIRCLE_PROJECT_REPONAME/g" .fossa.yaml
       - run: cat .fossa.yaml
       - run: fossa -r $CIRCLE_SHA1
 

From 5059856c941403ef68a816e0e0442d3575521cdd Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 16:51:38 -0800
Subject: [PATCH 12/13] removed sed nonsense since it isn't necessary

---
 .circleci/config.yml | 2 --
 .fossa.yaml          | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 345e66388..36c9536e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,8 +27,6 @@ jobs:
       - run: cp gradle.properties.example gradle.properties
       - run: ./gradlew dependencies
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: sed -i.bak "s/REPO_NAME/$CIRCLE_PROJECT_REPONAME/g" .fossa.yaml
-      - run: cat .fossa.yaml
       - run: fossa -r $CIRCLE_SHA1
 
 workflows:
diff --git a/.fossa.yaml b/.fossa.yaml
index f400553f2..c2ebbaf7a 100644
--- a/.fossa.yaml
+++ b/.fossa.yaml
@@ -2,11 +2,9 @@ version: 1
 
 cli:
   server: https://app.fossa.io
-  fetcher: git
-  project: github.com/launchdarkly/REPO_NAME
 analyze:
   modules:
-    - name: REPO_NAME
+    - name: java-client
       path: .
       type: gradle
       options:

From fc24db50386695c819b20ce1ede4ee32b555bdf8 Mon Sep 17 00:00:00 2001
From: Patrick Kaeding <pkaeding@launchdarkly.com>
Date: Fri, 16 Nov 2018 17:06:39 -0800
Subject: [PATCH 13/13] let fossa figure out the sha, rather than passing it in
 from a circle environment variable

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 36c9536e3..20020fefa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ jobs:
       - run: cp gradle.properties.example gradle.properties
       - run: ./gradlew dependencies
       - run: curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
-      - run: fossa -r $CIRCLE_SHA1
+      - run: fossa analyze
 
 workflows:
   version: 2