Remove Maven support

Closes gh-25

Author: wilkinsona

README.md

@@ -1,6 +1,6 @@
 # Gradle Enterprise Conventions
 
-Conventions for Maven and Gradle projects that use the Gradle Enterprise instance hosted at [ge.spring.io](https://ge.spring.io).
+Conventions for Gradle projects that use the Gradle Enterprise instance hosted at [ge.spring.io](https://ge.spring.io).
 
 ## Build cache conventions
 
@@ -96,8 +96,6 @@ Jenkins is detected by looking for an environment variable named `JENKINS_URL`.
 The conventions are published to https://repo.spring.io.
 Depending on the version you wish to use, they will be availble from the `snapshot` or `release` repository.
 
-### Gradle
-
 The first step in using the conventions is to make the necessary repository available for plugin resolution.
 This is done by configuring a plugin management repository in `settings.gradle`, as shown in the following example:
 
@@ -137,23 +135,4 @@ plugins {
 	id "io.spring.ge.conventions" version "<<version>>"
 	// …
 }
-```
-
-### Maven
-
-To use the conventions, configure both the Gradle Enterprise and the Conventions Maven extensions in `.mvn/extensions.xml`, as showing in the following example:
-
-```xml
-<extensions>
-    <extension>
-        <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version><<version>></version>
-    </extension>
-    <extension>
-        <groupId>io.spring.ge.conventions</groupId>
-        <artifactId>gradle-enterprise-conventions-maven-extension</artifactId>
-        <version><<version>></version>
-    </extension>
-</extensions>
 ```

build.gradle

@@ -1,77 +1,124 @@
-allprojects {
-	group = 'io.spring.ge.conventions'
+plugins {
+	id "checkstyle"
+	id "io.spring.javaformat" version "$javaFormatVersion"
+	id "java-gradle-plugin"
+	id "maven-publish"
+	id "io.spring.compatibility-test"
 }
 
-subprojects {
-	plugins.withType(JavaPlugin) {
-		sourceCompatibility = 1.8
-		targetCompatibility = 1.8
-		dependencies {
-			testImplementation("org.assertj:assertj-core:3.11.1")
-			testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
-			testImplementation("org.mockito:mockito-core:3.2.4")
-		}
-		tasks.withType(Test).all {
-			useJUnitPlatform()
-		}
-		java {
-			withJavadocJar()
-			withSourcesJar()
+description = "Gradle Enterprise Conventions Gradle plugin"
+group = 'io.spring.ge.conventions'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+	mavenCentral()
+	gradlePluginPortal()
+}
+
+configurations {
+	compatibilityTestImplementation
+}
+
+dependencies {
+	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
+
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:${gradleEnterprisePluginVersion}")
+
+	testImplementation("com.gradle:gradle-enterprise-gradle-plugin:${gradleEnterprisePluginVersion}")
+	testImplementation("org.assertj:assertj-core:3.11.1")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+	testImplementation("org.mockito:mockito-core:3.2.4")
+}
+
+gradlePlugin {
+	plugins {
+		gradleEnterprisePlugin {
+			displayName = project.description
+			description = project.description
+			id = 'io.spring.ge.conventions'
+			implementationClass = 'io.spring.ge.conventions.gradle.GradleEnterpriseConventionsPlugin'
 		}
 	}
-	plugins.withType(CheckstylePlugin) {
-		dependencies {
-			checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")	
-		}
-		checkstyle {
-			def archive = configurations.checkstyle.filter { it.name.startsWith("spring-javaformat-checkstyle")}
-			config = resources.text.fromArchiveEntry(archive, "io/spring/javaformat/checkstyle/checkstyle.xml")
-			toolVersion = 8.28
+}
+
+compatibilityTest {
+	useJUnitPlatform()
+	dependency('Gradle Enterprise Plugin') { gePlugin ->
+		gePlugin.groupId = 'com.gradle'
+		gePlugin.artifactId = 'gradle-enterprise-gradle-plugin'
+		gePlugin.versions = [
+			'3.1.1', '3.2.1', '3.3.4', '3.4.1', '3.5.2'
+		]
+	}
+}
+
+tasks.withType(Test) { testTask ->
+	if (testTask.name.startsWith("compatibilityTest_")) {
+		testTask.filter {
+			includeTestsMatching "*IntegrationTests"
 		}
 	}
-	plugins.withType(MavenPublishPlugin) {
-		tasks.withType(GenerateModuleMetadata).all {
-			enabled = false
+}
+
+test {
+	useJUnitPlatform()
+}
+
+java {
+	withJavadocJar()
+	withSourcesJar()
+}
+
+checkstyle {
+	def archive = configurations.checkstyle.filter { it.name.startsWith("spring-javaformat-checkstyle")}
+	config = resources.text.fromArchiveEntry(archive, "io/spring/javaformat/checkstyle/checkstyle.xml")
+	toolVersion = 8.28
+}
+
+tasks.withType(GenerateModuleMetadata).all {
+	enabled = false
+}
+
+if (project.hasProperty("distributionRepository")) {
+	publishing {
+		repositories {
+			maven {
+				url = "${distributionRepository}"
+				name = "deployment"
+			}
 		}
-		if (project.hasProperty("distributionRepository")) {
-			publishing {
-				repositories {
-					maven {
-						url = "${distributionRepository}"
-						name = "deployment"
+	}
+}
+
+publishing {
+	publications {
+		withType(MavenPublication) { mavenPublication -> 
+			pom {
+				name = project.description
+				description = project.description
+				url = 'https://github.com/spring-io/gradle-enterprise-conventions'
+				organization {
+					name = 'Pivotal Software, Inc.'
+					url = 'https://spring.io'
+				}
+				licenses {
+					license {
+						name = 'The Apache Software License, Version 2.0'
+						url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
 					}
 				}
-			}
-		}
-		publishing {
-			publications {
-				withType(MavenPublication) { mavenPublication -> 
-					pom {
-						name = project.description
-						description = project.description
-						url = 'https://github.com/spring-io/gradle-enterprise-conventions'
-						organization {
-							name = 'Pivotal Software, Inc.'
-							url = 'https://spring.io'
-						}
-						licenses {
-							license {
-								name = 'The Apache Software License, Version 2.0'
-								url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
-							}
-						}
-						scm {
-							url = 'https://github.com/spring-io/gradle-enterprise-conventions'
-							connection = 'scm:git:https://github.com/spring-io/gradle-enterprise-conventions'
-						}
-						developers {
-							developer {
-								id = 'wilkinsona'
-								name = 'Andy Wilkinson'
-								email = 'awilkinson@pivotal.io'
-								roles = ["Project lead"]
-							}
-						}
+				scm {
+					url = 'https://github.com/spring-io/gradle-enterprise-conventions'
+					connection = 'scm:git:https://github.com/spring-io/gradle-enterprise-conventions'
+				}
+				developers {
+					developer {
+						id = 'wilkinsona'
+						name = 'Andy Wilkinson'
+						email = 'awilkinson@pivotal.io'
+						roles = ["Project lead"]
 					}
 				}
 			}

ci/parameters.yml

@@ -3,6 +3,4 @@ github-repo-name: "spring-io/gradle-enterprise-conventions"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
 branch: "main"
-build-name: "gradle-enterprise-conventions"
-bintray-subject: "spring"
-bintray-repo: "jars"
+build-name: "gradle-enterprise-conventions"

ci/pipeline.yml

@@ -106,31 +106,6 @@ jobs:
       ARTIFACTORY_SERVER: ((artifactory-server))
       ARTIFACTORY_USERNAME: ((artifactory-username))
       ARTIFACTORY_PASSWORD: ((artifactory-password))
-      BINTRAY_SUBJECT: ((bintray-subject))
-      BINTRAY_REPO: ((bintray-repo))
-      BINTRAY_USERNAME: ((bintray-username))
-      BINTRAY_API_KEY: ((bintray-api-key))
-- name: sync-to-maven-central
-  serial: true
-  plan:
-  - get: ci-image
-  - get: git-repo
-  - get: artifactory-repo
-    trigger: true
-    passed: [promote-release]
-    params:
-      download_artifacts: false
-      save_build_info: true
-  - task: sync-to-maven-central
-    image: ci-image
-    file: git-repo/ci/tasks/sync-to-maven-central.yml
-    params:
-      BINTRAY_SUBJECT: ((bintray-subject))
-      BINTRAY_REPO: ((bintray-repo))
-      BINTRAY_USERNAME: ((bintray-username))
-      BINTRAY_API_KEY: ((bintray-api-key))
-      SONATYPE_USER_TOKEN: ((sonatype-user-token))
-      SONATYPE_PASSWORD_TOKEN: ((sonatype-user-token-password))
   - task: generate-release-notes
     file: git-repo/ci/tasks/generate-release-notes.yml
     params:
@@ -146,6 +121,6 @@ groups:
 - name: "build"
   jobs: ["build"]
 - name: "release"
-  jobs: ["stage-release", "promote-release", "sync-to-maven-central"]
+  jobs: ["stage-release", "promote-release"]
 - name: "ci-image"
   jobs: ["build-ci-image"]

ci/scripts/promote.sh

@@ -35,42 +35,5 @@ curl \
 		fi
 	}
 
-if [[ $RELEASE_TYPE = "RELEASE" ]]; then
-	curl \
-		-s \
-		--connect-timeout 240 \
-		--max-time 2700 \
-		-u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD} \
-		-H "Content-type:application/json" \
-		-d "{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}" \
-		-f \
-		-X \
-		POST "${ARTIFACTORY_SERVER}/api/build/distribute/${buildName}/${buildNumber}" > /dev/null || { echo "Failed to distribute" >&2; exit 1; }
-
-	echo "Waiting for artifacts to be published"
-
-	WAIT_TIME=20
-	WAIT_ATTEMPTS=120
-
-	artifacts_published=false
-	retry_counter=0
-	while [ $artifacts_published == "false" ] && [ $retry_counter -lt $WAIT_ATTEMPTS ]; do
-		result=$( curl -s -f -u ${BINTRAY_USERNAME}:${BINTRAY_API_KEY} https://api.bintray.com/packages/"${BINTRAY_SUBJECT}"/"${BINTRAY_REPO}"/"${groupId}" )
-		if [ $? -eq 0 ]; then
-			versions=$( echo "$result" | jq -r '.versions' )
-			exists=$( echo "$versions" | grep "$version" -o || true )
-			if [ "$exists" = "$version" ]; then
-				artifacts_published=true
-			fi
-		fi
-		retry_counter=$(( retry_counter + 1 ))
-		sleep $WAIT_TIME
-	done
-	if [[ $artifacts_published = "false" ]]; then
-		echo "Failed to publish"
-		exit 1
-	fi
-fi
-
 echo "Promotion complete"
 echo $version > version/version