From 7cb8c3d9ae7092a7bad0b23770e73fcde23be9f5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 9 May 2022 18:12:54 +0100
Subject: [PATCH] Change from java plugin to java-library plugin

The java-library plugin is an extension of the older java plugin.
It introduces the api dependency configuration and helps us to get
the right scope in the generated POM.
---
 build.gradle                         | 2 +-
 publish-maven.gradle                 | 2 +-
 spring-webflow/spring-webflow.gradle | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index f8fdf226..57a3d5f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ ext {
 allprojects {
 	group = "org.springframework.webflow"
 
-	apply plugin: "java"
+	apply plugin: "java-library"
 	apply plugin: "io.spring.dependency-management"
 	apply plugin: "org.springframework.build.optional-dependencies"
 	apply from: "${rootProject.projectDir}/ide.gradle"
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 889ee721..727f0dac 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -10,7 +10,7 @@ publishing {
       }
       versionMapping {
         usage('java-api') {
-          fromResolutionOf('runtimeClasspath')
+          fromResolutionOf('compileClasspath')
         }
         usage('java-runtime') {
           fromResolutionResult()
diff --git a/spring-webflow/spring-webflow.gradle b/spring-webflow/spring-webflow.gradle
index 1ae32547..463c3152 100644
--- a/spring-webflow/spring-webflow.gradle
+++ b/spring-webflow/spring-webflow.gradle
@@ -1,7 +1,7 @@
 description = "Spring Web Flow"
 
 dependencies {
-	implementation(project(":spring-binding"))
+	api(project(":spring-binding"))
 	implementation("org.springframework:spring-web")
 	implementation("org.springframework:spring-webmvc")