Extract spring-boot-testjars-maven jar

Rather than use feature variants, use a new jar for the maven support. This
makes it simple to ensure that the pom and jar are published properly.
Additionally, there currently isn't the need to restrict the permutations
of the feature (e.g. only one way of doing logging).

Closes gh-39

Author: rwinch

README.adoc

@@ -87,25 +87,20 @@ static CommonsExecWebServerFactoryBean authorizationServer() {
 
 You can also use the `MavenClasspathEntry` constructor directly or additional helper methods to add dependencies other than Spring Boot starters to the classpath.
 
-To use this feature, use the https://docs.gradle.org/current/userguide/feature_variants.html[feature variant] named `maven` by adding it to your Gradle or Maven build.
+To use this feature, add the following to your build:
 
 .build.gradle
 [source,groovy,subs=attributes+]
 ----
-testImplementation ('org.springframework.experimental.boot:spring-boot-testjars:{TESTJARS_VERSION}') {
-        capabilities {
-            requireCapability("org.springframework.experimental.boot:spring-boot-testjars-maven")
-        }
-    }
+testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:{TESTJARS_VERSION}'
 ----
 
 .pom.xml
 [source,xml,subs=attributes+]
 ----
 <dependency>
     <groupId>org.springframework.experimental.boot</groupId>
-    <artifactId>spring-boot-testjars</artifactId>
-    <classifier>maven</classifier>
+    <artifactId>spring-boot-testjars-maven</artifactId>
     <version>{TESTJARS_VERSION}</version>
 </dependency>
 ----

samples/oauth2-login-custom-config/build.gradle

@@ -18,12 +18,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation (project(':spring-boot-testjars'))
-    testImplementation (project(':spring-boot-testjars')) {
-        capabilities {
-            requireCapability("org.springframework.experimental.boot:spring-boot-testjars-maven")
-        }
-    }
+    testImplementation project(':spring-boot-testjars')
+    testImplementation project(':spring-boot-testjars-maven')
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-oauth2-authorization-server'
 }

samples/oauth2-login/build.gradle

@@ -18,12 +18,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation (project(':spring-boot-testjars'))
-    testImplementation (project(':spring-boot-testjars')) {
-        capabilities {
-            requireCapability("org.springframework.experimental.boot:spring-boot-testjars-maven")
-        }
-    }
+    testImplementation project(':spring-boot-testjars')
+    testImplementation project(':spring-boot-testjars-maven')
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 

samples/oauth2-login/src/test/java/example/oauth2/login/TestOauth2LoginMain.java

@@ -19,7 +19,6 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.experimental.boot.server.exec.CommonsExecWebServer;
 import org.springframework.experimental.boot.server.exec.CommonsExecWebServerFactoryBean;
 import org.springframework.experimental.boot.test.context.EnableDynamicProperty;
 import org.springframework.experimental.boot.test.context.OAuth2ClientProviderIssuerUri;

settings.gradle

@@ -11,5 +11,6 @@ pluginManagement {
 rootProject.name = 'spring-boot-testjars-build'
 
 include ':spring-boot-testjars'
+include ':spring-boot-testjars-maven'
 include ':samples:oauth2-login'
 include ':samples:oauth2-login-custom-config'

spring-boot-testjars-maven/build.gradle

@@ -0,0 +1,48 @@
+plugins {
+	id'java-library'
+	id'checkstyle'
+	id'io.spring.javaformat' version'0.0.27'
+	id "io.spring.security.maven" version "1.0.1"
+	id 'publish-conventions'
+}
+
+group = 'org.springframework.experimental.boot'
+
+ext {
+	mavenResolverVersion = '1.9.18'
+	mavenVersion = '3.9.4'
+}
+
+java {
+	sourceCompatibility = '17'
+}
+
+repositories {
+	mavenCentral()
+}
+
+checkstyle {
+	toolVersion = "9.3"
+}
+
+dependencies {
+	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.40")
+	api project(':spring-boot-testjars')
+	api platform('org.springframework.boot:spring-boot-dependencies:3.4.0')
+	api 'org.springframework.boot:spring-boot-starter'
+	api "org.apache.maven:maven-resolver-provider:${mavenVersion}"
+	api "org.apache.maven.resolver:maven-resolver-api:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-spi:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-util:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-impl:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-connector-basic:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-transport-file:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-transport-http:${mavenResolverVersion}"
+	api "org.apache.maven.resolver:maven-resolver-supplier:${mavenResolverVersion}"
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework:spring-web'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/LoggingMavenRepositoryListener.java renamed to spring-boot-testjars-maven/src/main/java/org/springframework/experimental/boot/server/exec/LoggingMavenRepositoryListener.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Provides {@link org.springframework.boot.web.server.WebServer} that is started via a
+ * command.
+ */
+package org.springframework.experimental.boot.server.exec;