Configure remoteapi/java to be able to build and publish on its own

SVN r65357 |2020-04-14 20:18:55 +0000

Author: labkey-susanh

.gitattributes

@@ -2,6 +2,11 @@
 java/README.md -text
 java/build.gradle -text
 java/gradle.properties -text
+java/gradle/wrapper/gradle-wrapper.jar -text
+java/gradle/wrapper/gradle-wrapper.properties -text
+java/gradlew -text
+java/gradlew.bat -text
+java/settings.gradle -text
 java/src/META-INF/services/java.sql.Driver -text
 java/src/log4j.xml -text
 java/src/org/labkey/remoteapi/ApiKeyCredentialsProvider.java -text

java/build.gradle

@@ -2,10 +2,56 @@ import org.labkey.gradle.plugin.LabKey
 import org.labkey.gradle.util.BuildUtils
 import org.labkey.gradle.util.GroupNames
 
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            url "${artifactory_contextUrl}/plugins-release"
+        }
+        if (gradlePluginsVersion.contains("SNAPSHOT"))
+        {
+            maven {
+                url "${artifactory_contextUrl}/plugins-snapshot-local"
+            }
+        }
+    }
+    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}"
+    }
+}
+
 plugins {
     id 'java-library'
     id 'java'
     id 'maven-publish'
+    id "com.jfrog.bintray" version "${bintrayPluginVersion}" apply false
+}
+
+repositories {
+    jcenter()
+    maven {
+        url "${artifactory_contextUrl}/libs-release"
+
+        if (hasProperty('artifactory_user') && hasProperty('artifactory_password'))
+        {
+            credentials {
+                username = artifactory_user
+                password = artifactory_password
+            }
+            authentication {
+                basic(BasicAuthentication)
+                // enable preemptive authentication to get around https://www.jfrog.com/jira/browse/RTFACT-4434
+            }
+        }
+    }
 }
 
 buildDir = new File(project.rootProject.buildDir, "/remoteapi/java")
@@ -14,7 +60,7 @@ def artifactPrefix = 'labkey-client-api'
 
 group "org.labkey.api"
 //Issue #39336 (comment 4): Updating to use SNAPSHOT until migration to git
-version "1.1.1-SNAPSHOT"
+version "1.2.0-SNAPSHOT"
 
 dependencies {
     api "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
@@ -165,24 +211,39 @@ project.afterEvaluate {
             }
         }
 
-        // Comment this out for now as we don't need to publish snapshot versions of the remoteapi jar file all the time since
-        // we are referencing the release version in our builds and this code changes infrequently.  Without a modification
-        // to this file. this publishing fails when the LabKey version is a release version because the repository set for
-        // publishing is a release repository, but the version set in this file will be a SNAPSHOT version.  Could probalby be fixed
-        // with some configuration work, but it will be easier once this is moved to its own git repository.
-//        if (BuildUtils.shouldPublish(project))
-//        {
-//            project.artifactoryPublish {
-//                project.tasks.each {
-//                    if (it instanceof Jar)
-//                    {
-//                        dependsOn it
-//                    }
-//                }
-////                dependsOn pomFileTask
-//                publications('libs')
-//            }
-//        }
+        if (project.hasProperty('doClientApiPublishing'))
+        {
+            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
+                            {
+                                publishPom = true
+                                publishIvy = false
+                            }
+                }
+            }
+
+            project.artifactoryPublish {
+                project.tasks.each {
+                    if (it instanceof Jar)
+                    {
+                        dependsOn it
+                    }
+                }
+                publications('libs')
+            }
+        }
 
     }
     project.model {

java/gradle.properties

@@ -1,12 +1,28 @@
+# the URL for the artifact repository where our build plugins are housed
+# as well as the build artifacts. (Be careful not to include a trailing slash
+# in the context URL or you will get a 500 error from artifactory.)
+artifactory_contextUrl=https://artifactory.labkey.com/artifactory
+
 # The source and target versions of Java for compilation tasks
 # We target a very old version to stay compatible with SAS. Our SAS macros wrap the Java remoteapi and run in the
 # SAS-bundled private JRE. Starting with SAS 9.4M6 (released in late 2018), the SAS Private JRE is based on Java 8.
 # https://support.sas.com/en/documentation/third-party-software-reference/9-4/support-for-java.html
 sourceCompatibility=1.8
 targetCompatibility=1.8
 
+artifactoryPluginVersion=4.13.0
+bintrayPluginVersion=1.8.4
+gradlePluginsVersion=1.10.3
+
 fluentHcVersion=4.3.5
 
+httpmimeVersion=4.5.3
+
+jsonSimpleVersion=1.1
+
+opencsvVersion=2.3
+
 #If iterating on the java client api and deploying it to a non-LabKey directory, uncomment and set this property (or set at command line),
 # and run the 'deployFatJar' task to create the jar with all dependencies and deploy it to the specified target. e.g., c:/somewhere/lib
-#javaClientDir=
+#javaClientDir=
+#buildFromSource=false

java/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists