Issue 46321: Remove redundant lib directory containing jar files (#39)

Author: labkey-susanh

labkey-client-api/CHANGELOG.md

@@ -1,5 +1,10 @@
 # The LabKey Remote API Library for Java - Change Log
 
+## version TBD
+*Released*: TBD
+* Issue 46321: Remove `lib` directory from `fatJar` in favor of pulling dependencies via the published pom files when needed
+* Remove artifactory plugin since we use the maven `publish` command now
+
 ## version 3.1.0
 *Released*: 20 September 2022
 * Add support for creating Freezer Manager freezer hierarchies via StorageController APIs (earliest compatible LabKey Server version: 22.10.0)

labkey-client-api/build.gradle

@@ -18,14 +18,6 @@ buildscript {
     }
     dependencies {
         classpath "org.labkey.build:gradlePlugins:${gradlePluginsVersion}"
-        // N.B.  We use the "old-fashioned" way of applying the artifactory plugin because if we use
-        // the plugins block below and specify a version number, the following error happens if building
-        // in conjunction with LabKey server (i.e., when including this project in the server's build.gradle
-        //    Error resolving plugin [id: 'com.jfrog.artifactory', version: '4.13.0', apply: false]
-        //    > Plugin request for plugin already on the classpath must not include a version
-        // We could instead include the plugin without a version number, which would work until
-        // some change in the latest version of the plugin came along that we aren't compatible with.
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:${artifactoryPluginVersion}"
     }
 }
 
@@ -124,10 +116,6 @@ project.task("fatJar",
                 jar.setArchiveVersion(project.version)
                 jar.archiveClassifier.set(LabKey.FAT_JAR_CLASSIFIER)
                 jar.dependsOn project.tasks.jar
-                jar.into('lib') {
-                    from tasks.jar
-                    from configurations.runtimeClasspath
-                }
         }
 )
 
@@ -225,37 +213,6 @@ project.publishing {
             }
         }
     }
-    apply plugin: 'com.jfrog.artifactory'
-    artifactory {
-        contextUrl = "${artifactory_contextUrl}"
-        //The base Artifactory URL if not overridden by the publisher/resolver
-        publish {
-            repository {
-                repoKey = BuildUtils.getRepositoryKey(project)
-                if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
-                {
-                    username = artifactory_user
-                    password = artifactory_password
-                }
-                maven = true
-            }
-            defaults {
-                publishBuildInfo = false
-                publishPom = true
-                publishIvy = false
-            }
-        }
-    }
-
-    project.artifactoryPublish {
-        project.tasks.each {
-            if (it instanceof Jar)
-            {
-                dependsOn it
-            }
-        }
-        publications('libs')
-    }
 }
 
 project.model {

labkey-client-api/gradle.properties

@@ -7,7 +7,6 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory
 sourceCompatibility=17
 targetCompatibility=17
 
-artifactoryPluginVersion=4.21.0
 gradlePluginsVersion=1.35.0
 
 commonsCodecVersion=1.15