remove resolved-dependencies from pom post-processing [openrewrite/rewrite#324] (#51)

aegershman · web-flow · commit 9f33e9b18925 · 2021-03-05T15:48:43.000-06:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,3 +1,4 @@
+# minified version of circleci; should be removed once fully switched over
 version: 2.1
 
 executors:
@@ -21,88 +22,18 @@ commands:
         default: 'check test'
     steps:
       - checkout
-      - restore_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
-      - run:
-          name: downloadDependencies
-          command: ./gradlew downloadDependencies
-      - save_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
-          paths:
-            - ~/.gradle
       - run:
           name: run gradle command
           command: ./gradlew << parameters.command >>
-      - run:
-          name: collect test reports
-          when: always
-          command: |
-            mkdir -p ~/rewrite-testing-frameworks/test-results/junit/
-            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/rewrite-testing-frameworks/test-results/junit/ \;
-      - store_test_results:
-          path: ~/rewrite-testing-frameworks/test-results/
-      - store_artifacts:
-          path: ~/rewrite-testing-frameworks/test-results/
 
 jobs:
   build:
     executor: circle-jdk-executor
     steps:
       - gradlew-build
 
-  deploy:
-    executor: circle-jdk-executor
-    steps:
-      - checkout
-      - restore_cache:
-          key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
-      - deploy:
-          name: Deployment
-          command: sh ./gradle/deploy.sh
-
-  maven-central-sync:
-    executor: circle-jdk-executor
-    steps:
-      - checkout
-      - run:
-          name: Decrypt properties
-          command: openssl aes-256-cbc -d -in gradle.properties.enc -out gradle.properties -k "$KEY" -md sha256
-      - deploy:
-          name: Maven Central sync
-          command: ./gradlew mavenCentralSync -Prelease.useLastTag=true -x bintrayPublish -x bintrayUpload -x bintrayCreateVersion -x bintrayCreatePackage
-          # Maven Central Sync might take more than 10 minutes
-          no_output_timeout: 30m
-
 workflows:
   version: 2
   build_prs_deploy_snapshots:
     jobs:
       - build
-      - deploy:
-          requires:
-            - build
-          filters:
-            branches:
-              only:
-                - master
-                - /\d+\.\d+\.x/
-  build_deploy_releases:
-    jobs:
-      - build:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v\d+\.\d+\.\d+(-rc\.\d+)?$/
-      - deploy:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-rc\.\d+)?$/
-      - maven-central-sync:
-          requires:
-            - deploy
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-rc\.\d+)?$/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,12 +40,12 @@ jobs:
       - name: build
         run: ./gradlew ${GRADLE_SWITCHES} build test
 
-      # - name: publish-snapshots
-      #   if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-      #   timeout-minutes: 30
-      #   run: ./gradlew ${GRADLE_SWITCHES} snapshot publish -PforceSigning
-      #   env:
-      #     OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-      #     OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-      #     SIGNING_KEY: ${{ secrets.OSSRH_SIGNING_KEY }}
-      #     SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }}
+      - name: publish-snapshots
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        timeout-minutes: 30
+        run: ./gradlew ${GRADLE_SWITCHES} snapshot publish -PforceSigning
+        env:
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          SIGNING_KEY: ${{ secrets.OSSRH_SIGNING_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.OSSRH_SIGNING_PASSWORD }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -32,13 +32,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: build
-        run: ./gradlew ${GRADLE_SWITCHES} build test
-
       - name: publish-candidate
         if: contains(github.ref, '-rc.')
         timeout-minutes: 30
-        run: ./gradlew ${GRADLE_SWITCHES} -Prelease.disableGitChecks=true -Prelease.useLastTag=true candidate publish closeSonatypeStagingRepository # closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew ${GRADLE_SWITCHES} -Prelease.disableGitChecks=true -Prelease.useLastTag=true candidate publish closeAndReleaseSonatypeStagingRepository
         env:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
@@ -48,7 +45,7 @@ jobs:
       - name: publish-release
         if: (!contains(github.ref, '-rc.'))
         timeout-minutes: 30
-        run: ./gradlew ${GRADLE_SWITCHES} -Prelease.disableGitChecks=true -Prelease.useLastTag=true final publish closeSonatypeStagingRepository # closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew ${GRADLE_SWITCHES} -Prelease.disableGitChecks=true -Prelease.useLastTag=true final publish closeAndReleaseSonatypeStagingRepository
         env:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 build/
 .gradle/
-gradle.properties
 out/
 .idea/
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![Logo](https://github.com/openrewrite/rewrite/raw/master/doc/logo-oss.png)
 ### Migrate testing frameworks. Automatically.
 
-[![Build Status](https://circleci.com/gh/openrewrite/rewrite-testing-frameworks.svg?style=shield)](https://circleci.com/gh/openrewrite/rewrite-testing-frameworks)
+![ci](https://github.com/openrewrite/rewrite-testing-frameworks/actions/workflows/ci.yml/badge.svg)
 [![Apache 2.0](https://img.shields.io/github/license/openrewrite/rewrite-testing-frameworks.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://img.shields.io/maven-central/v/org.openrewrite.recipe/rewrite-testing-frameworks.svg)](https://mvnrepository.com/artifact/org.openrewrite.recipe/rewrite-testing-frameworks)
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,49 +1,64 @@
-import io.spring.gradle.bintray.SpringBintrayExtension
 import nebula.plugin.contacts.Contact
 import nebula.plugin.contacts.ContactsExtension
-import nebula.plugin.info.InfoBrokerPlugin
 import nl.javadude.gradle.plugins.license.LicenseExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
-import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
 import java.util.*
 
 buildscript {
     repositories {
-        jcenter()
         gradlePluginPortal()
     }
-
-    dependencies {
-        classpath("io.spring.gradle:spring-release-plugin:0.20.1")
-
-        constraints {
-            classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4.13.0") {
-                because("Need recent version for Gradle 6+ compatibility")
-            }
-        }
-    }
 }
 
 plugins {
     `java-library`
-    id("org.jetbrains.kotlin.jvm") version "1.4.20"
-    id("io.spring.release") version "0.20.1"
-}
+    `maven-publish`
+    signing
+
+    id("nebula.maven-resolved-dependencies") version "17.3.2"
+    id("nebula.release") version "15.3.1"
+    id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
 
-apply(plugin = "license")
-apply(plugin = "nebula.maven-resolved-dependencies")
-apply(plugin = "io.spring.publishing")
+    id("com.github.hierynomus.license") version "0.15.0"
+    id("org.jetbrains.kotlin.jvm") version "1.4.21"
+    id("com.github.jk1.dependency-license-report") version "1.16"
+
+    id("nebula.maven-publish") version "17.3.2"
+    id("nebula.contacts") version "5.1.0"
+    id("nebula.info") version "9.3.0"
+
+    id("nebula.javadoc-jar") version "17.3.2"
+    id("nebula.source-jar") version "17.3.2"
+    id("nebula.maven-apache-license") version "17.3.2"
+}
 
 group = "org.openrewrite.recipe"
-description = "A rewrite module automating best practices and major version migrations for popular Java test frameworks like JUnit and Mockito "
+description = "A rewrite module automating best practices and major version migrations for popular Java test frameworks like JUnit and Mockito"
 
 repositories {
     mavenLocal()
-    maven { url = uri("https://dl.bintray.com/openrewrite/maven") }
     mavenCentral()
 }
 
+nexusPublishing {
+    repositories {
+        sonatype {
+            username.set(project.findProperty("ossrhUsername") as String? ?: System.getenv("OSSRH_USERNAME"))
+            password.set(project.findProperty("ossrhToken") as String? ?: System.getenv("OSSRH_TOKEN"))
+        }
+    }
+}
+
+signing {
+    setRequired({
+        !project.version.toString().endsWith("SNAPSHOT") || project.hasProperty("forceSigning")
+    })
+    val signingKey = project.findProperty("signingKey") as String? ?: System.getenv("SIGNING_KEY")
+    val signingPassword = project.findProperty("signingPassword") as String? ?: System.getenv("SIGNING_PASSWORD")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications["nebula"])
+}
+
 sourceSets {
     create("before")
     create("after")
@@ -140,7 +155,8 @@ configure<PublishingExtension> {
                         while (i < length) {
                             (dependencyList.item(i) as org.w3c.dom.Element).let { dependency ->
                                 if ((dependency.getElementsByTagName("scope")
-                                        .item(0) as org.w3c.dom.Element).textContent == "provided") {
+                                        .item(0) as org.w3c.dom.Element).textContent == "provided"
+                                ) {
                                     dependencies.removeChild(dependency)
                                     i--
                                     length--
@@ -155,67 +171,9 @@ configure<PublishingExtension> {
     }
 }
 
-configure<SpringBintrayExtension> {
-    org = "openrewrite"
-    repo = "maven"
-}
-
-project.withConvention(ArtifactoryPluginConvention::class) {
-    setContextUrl("https://oss.jfrog.org/artifactory")
-    publisherConfig.let {
-        val repository: PublisherConfig.Repository = it.javaClass
-            .getDeclaredField("repository")
-            .apply { isAccessible = true }
-            .get(it) as PublisherConfig.Repository
-
-        repository.setRepoKey("oss-snapshot-local")
-        repository.setUsername(project.findProperty("bintrayUser"))
-        repository.setPassword(project.findProperty("bintrayKey"))
-    }
-}
-
-tasks.withType<GenerateMavenPom> {
-    doLast {
-        // because pom.withXml adds blank lines
-        destination.writeText(
-            destination.readLines().filter { it.isNotBlank() }.joinToString("\n")
-        )
-    }
-
-    doFirst {
-        val runtimeClasspath = configurations.getByName("runtimeClasspath")
-
-        val gav = { dep: ResolvedDependency ->
-            "${dep.moduleGroup}:${dep.moduleName}:${dep.moduleVersion}"
-        }
-
-        val observedDependencies = TreeSet<ResolvedDependency> { d1, d2 ->
-            gav(d1).compareTo(gav(d2))
-        }
-
-        fun reduceDependenciesAtIndent(indent: Int):
-                    (List<String>, ResolvedDependency) -> List<String> =
-            { dependenciesAsList: List<String>, dep: ResolvedDependency ->
-                dependenciesAsList + listOf(" ".repeat(indent) + dep.module.id.toString()) + (
-                        if (observedDependencies.add(dep)) {
-                            dep.children
-                                .sortedBy(gav)
-                                .fold(emptyList(), reduceDependenciesAtIndent(indent + 2))
-                        } else {
-                            // this dependency subtree has already been printed, so skip it
-                            emptyList()
-                        }
-                        )
-            }
-
-        project.plugins.withType<InfoBrokerPlugin> {
-            add("Resolved-Dependencies", runtimeClasspath
-                .resolvedConfiguration
-                .lenientConfiguration
-                .firstLevelModuleDependencies
-                .sortedBy(gav)
-                .fold(emptyList(), reduceDependenciesAtIndent(6))
-                .joinToString("\n", "\n", "\n" + " ".repeat(4)))
-        }
-    }
+tasks.withType<Javadoc> {
+    // assertTrue(boolean condition) -> assertThat(condition).isTrue()
+    // warning - invalid usage of tag >
+    // see also: https://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
+    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+#
diff --git a/gradle.properties.enc b/gradle.properties.enc
diff --git a/gradle/deploy.sh b/gradle/deploy.sh

-Original file line number
+Diff line change
@@ @@ -1,5 +1,4 @@ @@
 build/
 .gradle/
 -gradle.properties
 out/
 .idea/