Various fixes
* Upgrade dependencies * Fix typos in build files * Fix variable names for dependencies * Fix links to the project * Fix `Implementation-Vendor` for artifact manifest files
This commit is contained in:
@@ -16,7 +16,7 @@ This BOM is needed to be included into dependency management:
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud.fn</groupId>
|
||||
<artifactId>spring-functions-catalog-bom</artifactId>
|
||||
<version>5.0.0-SNAPSHOT</version>
|
||||
<version>5.1.0-SNAPSHOT</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
11
build.gradle
11
build.gradle
@@ -7,11 +7,11 @@ plugins {
|
||||
id 'base'
|
||||
id 'io.spring.dependency-management' version '1.1.7'
|
||||
id 'io.spring.javaformat' version "${javaFormatVersion}"
|
||||
id 'com.github.spotbugs' version '6.0.28'
|
||||
id 'org.ajoberstar.grgit' version '5.2.2'
|
||||
id 'com.github.spotbugs' version '6.1.2'
|
||||
id 'org.ajoberstar.grgit' version '5.3.0'
|
||||
}
|
||||
|
||||
description = 'Spring Functions Catlog'
|
||||
description = 'Spring Functions Catalog'
|
||||
|
||||
ext {
|
||||
javaProjects = subprojects - project(':spring-functions-catalog-bom')
|
||||
@@ -159,7 +159,6 @@ configure(javaProjects) { subproject ->
|
||||
tasks.register('updateCopyrights') {
|
||||
onlyIf { !isCI }
|
||||
inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
|
||||
outputs.dir('build/classes')
|
||||
|
||||
doLast {
|
||||
def now = Calendar.instance.get(Calendar.YEAR) as String
|
||||
@@ -194,8 +193,8 @@ configure(javaProjects) { subproject ->
|
||||
'Created-By': "JDK ${System.properties['java.version']} (${System.properties['java.specification.vendor']})",
|
||||
'Implementation-Title': subproject.name,
|
||||
'Implementation-Vendor-Id': subproject.group,
|
||||
'Implementation-Vendor': 'VMware, Inc.',
|
||||
'Implementation-URL': 'https://spring.io/projects/spring-functions-catalog',
|
||||
'Implementation-Vendor': 'Broadcom Inc.',
|
||||
'Implementation-URL': 'https://github.com/spring-cloud/spring-functions-catalog',
|
||||
'Automatic-Module-Name': subproject.name.replace('-', '.')
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ dependencies {
|
||||
api 'org.junit.jupiter:junit-jupiter-api'
|
||||
api 'org.testcontainers:junit-jupiter'
|
||||
|
||||
optionalApi ftpserverCore
|
||||
optionalApi ftpServerCore
|
||||
optionalApi 'org.springframework.integration:spring-integration-sftp'
|
||||
optionalApi 'org.springframework:spring-websocket'
|
||||
}
|
||||
|
||||
@@ -2,5 +2,5 @@ dependencies {
|
||||
api project(':spring-ftp-common')
|
||||
|
||||
testImplementation project(':spring-function-test-support')
|
||||
testImplementation ftpserverCore
|
||||
testImplementation ftpServerCore
|
||||
}
|
||||
|
||||
@@ -6,6 +6,6 @@ ext {
|
||||
djlVersion = '0.26.0'
|
||||
|
||||
springIntegrationAws = 'org.springframework.integration:spring-integration-aws:3.0.8'
|
||||
ftpserverCore = 'org.apache.ftpserver:ftpserver-core:1.2.0'
|
||||
mockserverNetty = 'org.mock-server:mockserver-netty:5.15.0'
|
||||
ftpServerCore = 'org.apache.ftpserver:ftpserver-core:1.2.0'
|
||||
mockServerNetty = 'org.mock-server:mockserver-netty:5.15.0'
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
dependencies {
|
||||
api project(':spring-twitter-common')
|
||||
|
||||
testImplementation mockserverNetty
|
||||
testImplementation mockServerNetty
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ publishing {
|
||||
url = 'https://github.com/spring-cloud/spring-functions-catalog'
|
||||
organization {
|
||||
name = 'Spring IO'
|
||||
url = 'https://spring.io/projects/spring-functions-catalog'
|
||||
url = 'https://github.com/spring-cloud/spring-functions-catalog'
|
||||
}
|
||||
licenses {
|
||||
license {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
description = 'Spring Functions Catlog (Bill of Materials)'
|
||||
description = 'Spring Functions Catalog (Bill of Materials)'
|
||||
|
||||
apply plugin: 'java-platform'
|
||||
apply from: "${rootDir}/publish-maven.gradle"
|
||||
|
||||
@@ -4,5 +4,5 @@ dependencies {
|
||||
api project(':spring-metadata-store-common')
|
||||
|
||||
testImplementation project(':spring-function-test-support')
|
||||
testImplementation ftpserverCore
|
||||
testImplementation ftpServerCore
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
dependencies {
|
||||
api project(':spring-twitter-common')
|
||||
|
||||
testImplementation mockserverNetty
|
||||
testImplementation mockServerNetty
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user