From 843eef01d518cb2f5ea1e486c7f231eebc1b010e Mon Sep 17 00:00:00 2001
From: Shelby Holden <sholden@broadinstitute.org>
Date: Thu, 22 Jun 2023 14:20:01 -0400
Subject: [PATCH] rename service to lib directory

leftover changes
---
 .github/workflows/build-and-test.yml                           | 2 +-
 client/build.gradle                                            | 1 +
 {service => lib}/build.gradle                                  | 0
 {service => lib}/generators.gradle                             | 0
 {service => lib}/publishing.gradle                             | 0
 {service => lib}/src/main/java/bio/terra/javapfb/Library.java  | 0
 .../src/main/java/bio/terra/javapfb/model/Example.java         | 0
 .../src/test/java/bio/terra/javapfb/LibraryTest.java           | 0
 settings.gradle                                                | 3 +--
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename {service => lib}/build.gradle (100%)
 rename {service => lib}/generators.gradle (100%)
 rename {service => lib}/publishing.gradle (100%)
 rename {service => lib}/src/main/java/bio/terra/javapfb/Library.java (100%)
 rename {service => lib}/src/main/java/bio/terra/javapfb/model/Example.java (100%)
 rename {service => lib}/src/test/java/bio/terra/javapfb/LibraryTest.java (100%)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e51204df..0a52496d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Upload spotbugs results
         uses: github/codeql-action/upload-sarif@main
         with:
-          sarif_file: service/build/reports/spotbugs/main.sarif
+          sarif_file: lib/build/reports/spotbugs/main.sarif
 
   jib:
     needs: [ build ]
diff --git a/client/build.gradle b/client/build.gradle
index 1f3ea4b9..48cc2db5 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id 'maven-publish'
     id 'io.spring.dependency-management'
     id 'com.jfrog.artifactory' version '4.18.2'
+    // required by java-library-conventions
     id 'org.hidetake.swagger.generator'
 }
 
diff --git a/service/build.gradle b/lib/build.gradle
similarity index 100%
rename from service/build.gradle
rename to lib/build.gradle
diff --git a/service/generators.gradle b/lib/generators.gradle
similarity index 100%
rename from service/generators.gradle
rename to lib/generators.gradle
diff --git a/service/publishing.gradle b/lib/publishing.gradle
similarity index 100%
rename from service/publishing.gradle
rename to lib/publishing.gradle
diff --git a/service/src/main/java/bio/terra/javapfb/Library.java b/lib/src/main/java/bio/terra/javapfb/Library.java
similarity index 100%
rename from service/src/main/java/bio/terra/javapfb/Library.java
rename to lib/src/main/java/bio/terra/javapfb/Library.java
diff --git a/service/src/main/java/bio/terra/javapfb/model/Example.java b/lib/src/main/java/bio/terra/javapfb/model/Example.java
similarity index 100%
rename from service/src/main/java/bio/terra/javapfb/model/Example.java
rename to lib/src/main/java/bio/terra/javapfb/model/Example.java
diff --git a/service/src/test/java/bio/terra/javapfb/LibraryTest.java b/lib/src/test/java/bio/terra/javapfb/LibraryTest.java
similarity index 100%
rename from service/src/test/java/bio/terra/javapfb/LibraryTest.java
rename to lib/src/test/java/bio/terra/javapfb/LibraryTest.java
diff --git a/settings.gradle b/settings.gradle
index 5451eb0e..28854e07 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 rootProject.name = 'javapfb'
-include('service', 'client', 'integration')
+include('lib', 'client', 'java-pfb-cli')
 
 gradle.ext.releaseVersion = '0.11.0'
-include 'java-pfb-cli'