Skip to content

Commit

Permalink
update to spring boot 3
Browse files Browse the repository at this point in the history
Co-authored-by: Jim Duden <[email protected]>
  • Loading branch information
frankbregulla1111 and jimduden6804 committed May 23, 2023
1 parent 8ae6c72 commit 3432cbc
Show file tree
Hide file tree
Showing 33 changed files with 679 additions and 614 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Release Notes

# 0.30.0
* Update to spring-boot 3.0.6

# 0.25.2
* Dependency updates

Expand Down
83 changes: 20 additions & 63 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,14 @@ buildscript {
}
dependencies {
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
//classpath "com.adarshr:gradle-test-logger-plugin:3.2.0"
}
}

//import org.gradle.api.tasks.testing.logging.TestExceptionFormat
//import org.gradle.api.tasks.testing.logging.TestLogEvent

ext {
awsSdkVersion = "2.17.283"
springVersion = "5.3.23"
springSecurityVersion = "5.7.4"
springBootVersion = "2.7.5"
edisonVersion = "2.7.5"
jacksonVersion = "2.14.2"
logbackVersion = "1.2.11"
awsSdkVersion = "2.20.12"
springBootVersion = "3.0.6"
edisonVersion = "3.0.0-M2"
}

apply plugin: 'java'
Expand All @@ -32,39 +25,46 @@ apply plugin: 'eclipse'
apply plugin: 'io.codearte.nexus-staging'
apply from: "${rootDir}/jacoco.gradle"

task startLocalStack(type:Exec) {
commandLine "docker", "run", "--name", "synapse_localstack", "-d", "-p", "4566:4566", "localstack/localstack:1.4.0"
tasks.register('startLocalStack', Exec) {
commandLine "docker", "run", "--name", "synapse_localstack", "-d", "-p", "4566:4566", "localstack/localstack:2.0.2"
}
task stopLocalStack(type: Exec) {

tasks.register('stopLocalStack', Exec) {
commandLine 'docker', 'rm', '-f', 'synapse_localstack'
}

nexusStaging {
username=sonatypeUsername
password=sonatypePassword
packageGroup='de.otto'
username = sonatypeUsername
password = sonatypePassword
packageGroup = 'de.otto'
}

subprojects {

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'eclipse'
//apply plugin: "com.adarshr.test-logger"
apply from: "${rootDir}/jacoco.gradle"

sourceCompatibility = '1.8'
targetCompatibility = '1.8'
sourceCompatibility = '17'
targetCompatibility = '17'

dependencies {
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"

implementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))

testImplementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))

implementation(platform("software.amazon.awssdk:bom:${awsSdkVersion}"))

}

task allDeps(type: DependencyReportTask) {}

compileJava.dependsOn(processResources)

version = '0.25.3-SNAPSHOT'
version = '0.30.0-SNAPSHOT'
group = 'de.otto.synapse'

repositories {
Expand All @@ -74,47 +74,4 @@ subprojects {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

// testlogger {
// showStandardStreams true
// showPassedStandardStreams false
// showSkippedStandardStreams false
// showFailedStandardStreams true
// }

// tasks.withType(Test) {
// testLogging {
// // set options for log level LIFECYCLE
// events TestLogEvent.FAILED,
// TestLogEvent.PASSED,
// TestLogEvent.SKIPPED,
// TestLogEvent.STANDARD_OUT
// exceptionFormat TestExceptionFormat.FULL
// showExceptions true
// showCauses true
// showStackTraces true
//
// // set options for log level DEBUG and INFO
// debug {
// events TestLogEvent.STARTED,
// TestLogEvent.FAILED,
// TestLogEvent.PASSED,
// TestLogEvent.SKIPPED,
// TestLogEvent.STANDARD_ERROR,
// TestLogEvent.STANDARD_OUT
// exceptionFormat TestExceptionFormat.FULL
// }
// info.events = debug.events
// info.exceptionFormat = debug.exceptionFormat
//
// afterSuite { desc, result ->
// if (!desc.parent) { // will match the outermost suite
// def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
// def startItem = '| ', endItem = ' |'
// def repeatLength = startItem.length() + output.length() + endItem.length()
// println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
// }
// }
// }
// }

}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 2 additions & 6 deletions jacoco.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
apply plugin: 'jacoco'

jacoco {
toolVersion = "0.8.6"
}

jacocoTestReport {
reports {
xml.enabled = true
html.enabled = true
xml.required.set(true)
html.required.set(true)
}
}

Expand Down
119 changes: 67 additions & 52 deletions synapse-aws-auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,25 @@ dependencies {
api project(':synapse-core:')

api "com.google.guava:guava:31.1-jre"
api "software.amazon.awssdk:auth:${awsSdkVersion}"
api "software.amazon.awssdk:core:${awsSdkVersion}"
api "software.amazon.awssdk:profiles:${awsSdkVersion}"
api "software.amazon.awssdk:regions:${awsSdkVersion}"
api "software.amazon.awssdk:utils:${awsSdkVersion}"
api "software.amazon.awssdk:auth"
api "software.amazon.awssdk:profiles"
api "software.amazon.awssdk:regions"
api "software.amazon.awssdk:utils"

testImplementation project(':synapse-testsupport')
testImplementation 'junit:junit:4.13.2'
testImplementation 'junit:junit'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
testImplementation "com.jayway.jsonpath:json-path-assert:2.7.0"
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "com.jayway.jsonpath:json-path-assert"
testImplementation 'com.tngtech.java:junit-dataprovider:1.13.1'
testImplementation "org.awaitility:awaitility:4.2.0"
testImplementation "org.mockito:mockito-core:5.1.1"
testImplementation "ch.qos.logback:logback-core:${logbackVersion}"
testImplementation "ch.qos.logback:logback-classic:${logbackVersion}"
testImplementation "org.awaitility:awaitility"
testImplementation "org.mockito:mockito-core"
testImplementation "ch.qos.logback:logback-core"
testImplementation "ch.qos.logback:logback-classic"

}

apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'signing'


Expand All @@ -38,78 +37,94 @@ task javadocJar(type: Jar, dependsOn: javadoc) {

task sourcesJar(type: Jar) {
from sourceSets.main.allSource
classifier = 'sources'
archiveClassifier = 'sources'
}

uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: sonatypeUsername, password: sonatypePassword)
}
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
authentication(userName: sonatypeUsername, password: sonatypePassword)
publishing {
publications {
mavenJava(MavenPublication) {
artifactId = 'synapse-aws-auth'
from components.java
versionMapping {
usage('java-api') {
fromResolutionOf('runtimeClasspath')
}
usage('java-runtime') {
fromResolutionResult()
}
}

pom.project {
name 'synapse-aws-auth'
pom {
name = 'synapse-aws-auth'
packaging 'jar'
description 'AWS authentication for Synapse'
url 'http://github.com/otto-de/synapse'
description = 'AWS authentication for Synapse'
url = 'http://github.com/otto-de/synapse'

scm {
url 'scm:[email protected]:otto-de/synapse.git'
connection 'scm:[email protected]:otto-de/synapse.git'
developerConnection 'scm:[email protected]:otto-de/synapse.git'
url = 'scm:[email protected]:otto-de/synapse.git'
connection = 'scm:[email protected]:otto-de/synapse.git'
developerConnection = 'scm:[email protected]:otto-de/synapse.git'
}

licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
name = "The Apache Software License, Version 2.0"
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
distribution = 'repo'
}
}

developers {
developer {
id 'gsteinacker'
name 'Guido Steinacker'
id = 'gsteinacker'
name = 'Guido Steinacker'
}
developer {
id 'mbargmann'
name 'Matthias Bargmann'
id = 'mbargmann'
name = 'Matthias Bargmann'
}
developer {
id 'fbregulla'
name 'Frank Bregulla'
id = 'fbregulla'
name = 'Frank Bregulla'
}
developer {
id 'ftorkler'
name 'Florian Torkler'
id = 'ftorkler'
name = 'Florian Torkler'
}
developer {
id 'miregel'
name 'Micha Regel'
id = 'miregel'
name = 'Micha Regel'
}
developer {
id 'hstruebe'
name 'Henning Strueber'
id = 'hstruebe'
name = 'Henning Strueber'
}
}
}
}
}

repositories {
maven {
name = "Sonatype"
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
username = findProperty("sonatypeUsername")
password = findProperty("sonatypePassword")
}
}
maven {
name = "Sonatype_Snapshots"
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
credentials {
username = findProperty("sonatypeUsername")
password = findProperty("sonatypePassword")
}
}
}
}


signing {
required { gradle.taskGraph.hasTask("uploadArchives") }
sign jar
sign javadocJar
sign sourcesJar
sign publishing.publications.mavenJava
}

artifacts {
Expand Down
Loading

0 comments on commit 3432cbc

Please sign in to comment.