updating common4j pipeline and nits

Author: jeffrymsft

LabApiUtilities/build.gradle

@@ -79,17 +79,6 @@ afterEvaluate {
     // above in the plugins block.
     compileJava.dependsOn generateBuildConfig, generateTestBuildConfig
 }
-//tasks.withType(JavaCompile) {
-//    options.compilerArgs += [
-//            '--add-opens', 'jdk.crypto.mscapi/sun.security.mscapi=ALL-UNNAMED'
-//    ]
-//}
-//
-//tasks.withType(Test) {
-//    jvmArgs += [
-//            '--add-opens', 'jdk.crypto.mscapi/sun.security.mscapi=ALL-UNNAMED'
-//    ]
-//}
 jar {
     manifest {
         attributes('Implementation-Title': project.name,

azure-pipelines/pull-request-validation/common4j.yml

@@ -31,6 +31,8 @@ jobs:
     inputs:
       cwd: $(Build.SourcesDirectory)/common-java-root
       tasks: clean common4j:assemble
+      javaHomeOption: JDKVersion
+      jdkVersionOption: 1.17
   - template: ../templates/steps/spotbugs.yml
     parameters:
       project: common4j
@@ -41,4 +43,6 @@ jobs:
     inputs:
       cwd: $(Build.SourcesDirectory)/common-java-root
       tasks: common4j:test -Psugar=true -PmockApiUrl=$(MOCK_API_URL)
+      javaHomeOption: JDKVersion
+      jdkVersionOption: 1.17
 ...

common/build.gradle

@@ -368,21 +368,21 @@ tasks.configureEach { task ->
     if (task.name == 'assembleDistRelease') {
         task.dependsOn 'sourcesJar'
     }
-    if (task.name == "publishDistDebugPublicationToVsts-maven-adal-androidRepository") {
-        task.dependsOn 'generatePomFileForDistReleasePublication'
-    }
-    if (task.name == "publishDistReleasePublicationToVsts-maven-adal-androidRepository") {
-        task.dependsOn 'bundleDistReleaseAar'
-    }
-    if (task.name == "publishDistDebugPublicationToVsts-maven-adal-androidRepository") {
-        task.dependsOn 'bundleDistReleaseAar'
-    }
-    if (task.name == "generateMetadataFileForDistDebugPublication") {
-        task.dependsOn 'bundleDistReleaseAar'
-    }
-    if (task.name == "generateMetadataFileForDistReleasePublication") {
-        task.dependsOn 'bundleDistDebugAar'
-    }
+//    if (task.name == "publishDistDebugPublicationToVsts-maven-adal-androidRepository") {
+//        task.dependsOn 'generatePomFileForDistReleasePublication'
+//    }
+//    if (task.name == "publishDistReleasePublicationToVsts-maven-adal-androidRepository") {
+//        task.dependsOn 'bundleDistReleaseAar'
+//    }
+//    if (task.name == "publishDistDebugPublicationToVsts-maven-adal-androidRepository") {
+//        task.dependsOn 'bundleDistReleaseAar'
+//    }
+//    if (task.name == "generateMetadataFileForDistDebugPublication") {
+//        task.dependsOn 'bundleDistReleaseAar'
+//    }
+//    if (task.name == "generateMetadataFileForDistReleasePublication") {
+//        task.dependsOn 'bundleDistDebugAar'
+//    }
 }
 
 // This is used to generate the pom file for publishing to external maven in maven-release-jobs.yml

common4j/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
-
-#distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle.properties

@@ -9,7 +9,6 @@ org.gradle.daemon=true
 
 # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted
 # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline.
-#org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError
 
 # This the TSL versionName...

gradle/versions.gradle

@@ -9,7 +9,7 @@ ext {
     compileSdkVersion = 34
     buildToolsVersion = "28.0.3"
 
-    // Pluginssssss
+    // Plugins
     gradleVersion = '8.1.1'
     kotlinVersion = '1.7.21'
     spotBugsGradlePluginVersion = '4.7.1'