From 56bf12f9a6c8e55fdaf29d501550b1714efffb5d Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 15 Jun 2022 22:26:32 +0200 Subject: [PATCH] Release 4.2.0 --- .../opentracing-flowid-autoconfigure/pom.xml | 2 +- opentracing-flowid/opentracing-flowid-bom/pom.xml | 12 ++++++------ .../opentracing-flowid-httpclient/pom.xml | 2 +- opentracing-flowid/opentracing-flowid-okhttp/pom.xml | 2 +- .../opentracing-flowid-servlet/pom.xml | 2 +- .../opentracing-flowid-starter/pom.xml | 2 +- opentracing-flowid/opentracing-flowid/pom.xml | 2 +- opentracing-flowid/pom.xml | 2 +- .../opentracing-jdbc-autoconfigure/pom.xml | 2 +- opentracing-jdbc/opentracing-jdbc-starter/pom.xml | 2 +- opentracing-jdbc/opentracing-jdbc/pom.xml | 2 +- opentracing-jdbc/pom.xml | 2 +- opentracing-kotlin/pom.xml | 2 +- .../opentracing-proxy-autoconfigure/pom.xml | 2 +- opentracing-proxy/opentracing-proxy-starter/pom.xml | 2 +- opentracing-proxy/opentracing-proxy/pom.xml | 2 +- opentracing-proxy/pom.xml | 2 +- .../pom.xml | 2 +- .../opentracing-servlet-extension-starter/pom.xml | 2 +- .../opentracing-servlet-extension/pom.xml | 2 +- opentracing-servlet-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../opentracing-spring-web-extension-starter/pom.xml | 2 +- .../opentracing-spring-web-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../opentracing-spring-webflux-extension/pom.xml | 2 +- opentracing-spring-extension/pom.xml | 2 +- opentracing-toolbox-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- release.sh | 8 ++++---- 31 files changed, 39 insertions(+), 39 deletions(-) diff --git a/opentracing-flowid/opentracing-flowid-autoconfigure/pom.xml b/opentracing-flowid/opentracing-flowid-autoconfigure/pom.xml index 4b08f87b..bc87778d 100644 --- a/opentracing-flowid/opentracing-flowid-autoconfigure/pom.xml +++ b/opentracing-flowid/opentracing-flowid-autoconfigure/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-autoconfigure diff --git a/opentracing-flowid/opentracing-flowid-bom/pom.xml b/opentracing-flowid/opentracing-flowid-bom/pom.xml index 77734f91..0f51cad2 100644 --- a/opentracing-flowid/opentracing-flowid-bom/pom.xml +++ b/opentracing-flowid/opentracing-flowid-bom/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-bom pom @@ -13,27 +13,27 @@ org.zalando opentracing-flowid - 4.1.1-SNAPSHOT + 4.2.0 org.zalando opentracing-flowid-httpclient - 4.1.1-SNAPSHOT + 4.2.0 org.zalando opentracing-flowid-okhttp - 4.1.1-SNAPSHOT + 4.2.0 org.zalando opentracing-flowid-servlet - 4.1.1-SNAPSHOT + 4.2.0 org.zalando opentracing-flowid-autoconfigure - 4.1.1-SNAPSHOT + 4.2.0 diff --git a/opentracing-flowid/opentracing-flowid-httpclient/pom.xml b/opentracing-flowid/opentracing-flowid-httpclient/pom.xml index 67c0b557..f83b4b2e 100644 --- a/opentracing-flowid/opentracing-flowid-httpclient/pom.xml +++ b/opentracing-flowid/opentracing-flowid-httpclient/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-httpclient diff --git a/opentracing-flowid/opentracing-flowid-okhttp/pom.xml b/opentracing-flowid/opentracing-flowid-okhttp/pom.xml index 201500a6..8af35fd2 100644 --- a/opentracing-flowid/opentracing-flowid-okhttp/pom.xml +++ b/opentracing-flowid/opentracing-flowid-okhttp/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-okhttp diff --git a/opentracing-flowid/opentracing-flowid-servlet/pom.xml b/opentracing-flowid/opentracing-flowid-servlet/pom.xml index 85a9174f..5ef55568 100644 --- a/opentracing-flowid/opentracing-flowid-servlet/pom.xml +++ b/opentracing-flowid/opentracing-flowid-servlet/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-servlet diff --git a/opentracing-flowid/opentracing-flowid-starter/pom.xml b/opentracing-flowid/opentracing-flowid-starter/pom.xml index fe8e3b02..404fd085 100644 --- a/opentracing-flowid/opentracing-flowid-starter/pom.xml +++ b/opentracing-flowid/opentracing-flowid-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-starter diff --git a/opentracing-flowid/opentracing-flowid/pom.xml b/opentracing-flowid/opentracing-flowid/pom.xml index 0649dc62..c3e76043 100644 --- a/opentracing-flowid/opentracing-flowid/pom.xml +++ b/opentracing-flowid/opentracing-flowid/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-flowid-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid diff --git a/opentracing-flowid/pom.xml b/opentracing-flowid/pom.xml index 0b01b7a5..9992dfad 100644 --- a/opentracing-flowid/pom.xml +++ b/opentracing-flowid/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-flowid-parent pom diff --git a/opentracing-jdbc/opentracing-jdbc-autoconfigure/pom.xml b/opentracing-jdbc/opentracing-jdbc-autoconfigure/pom.xml index 35e8d05c..ba986ab0 100644 --- a/opentracing-jdbc/opentracing-jdbc-autoconfigure/pom.xml +++ b/opentracing-jdbc/opentracing-jdbc-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-jdbc-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-jdbc-autoconfigure diff --git a/opentracing-jdbc/opentracing-jdbc-starter/pom.xml b/opentracing-jdbc/opentracing-jdbc-starter/pom.xml index e41c37e0..c3a9e749 100644 --- a/opentracing-jdbc/opentracing-jdbc-starter/pom.xml +++ b/opentracing-jdbc/opentracing-jdbc-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-jdbc-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-jdbc-starter diff --git a/opentracing-jdbc/opentracing-jdbc/pom.xml b/opentracing-jdbc/opentracing-jdbc/pom.xml index 239c6a51..a08a55ca 100644 --- a/opentracing-jdbc/opentracing-jdbc/pom.xml +++ b/opentracing-jdbc/opentracing-jdbc/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-jdbc-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-jdbc diff --git a/opentracing-jdbc/pom.xml b/opentracing-jdbc/pom.xml index c3a01e43..dcfa51c7 100644 --- a/opentracing-jdbc/pom.xml +++ b/opentracing-jdbc/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-jdbc-parent pom diff --git a/opentracing-kotlin/pom.xml b/opentracing-kotlin/pom.xml index 2f41ab1a..b55ef282 100644 --- a/opentracing-kotlin/pom.xml +++ b/opentracing-kotlin/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-kotlin diff --git a/opentracing-proxy/opentracing-proxy-autoconfigure/pom.xml b/opentracing-proxy/opentracing-proxy-autoconfigure/pom.xml index 51c38de5..4dfbfe89 100644 --- a/opentracing-proxy/opentracing-proxy-autoconfigure/pom.xml +++ b/opentracing-proxy/opentracing-proxy-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-proxy-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-proxy-autoconfigure diff --git a/opentracing-proxy/opentracing-proxy-starter/pom.xml b/opentracing-proxy/opentracing-proxy-starter/pom.xml index d4f0f4a8..339ca821 100644 --- a/opentracing-proxy/opentracing-proxy-starter/pom.xml +++ b/opentracing-proxy/opentracing-proxy-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-proxy-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-proxy-starter diff --git a/opentracing-proxy/opentracing-proxy/pom.xml b/opentracing-proxy/opentracing-proxy/pom.xml index 8dd0bcb3..0b6e9e22 100644 --- a/opentracing-proxy/opentracing-proxy/pom.xml +++ b/opentracing-proxy/opentracing-proxy/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-proxy-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-proxy diff --git a/opentracing-proxy/pom.xml b/opentracing-proxy/pom.xml index 76cd2366..c979d231 100644 --- a/opentracing-proxy/pom.xml +++ b/opentracing-proxy/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-proxy-parent pom diff --git a/opentracing-servlet-extension/opentracing-servlet-extension-autoconfigure/pom.xml b/opentracing-servlet-extension/opentracing-servlet-extension-autoconfigure/pom.xml index 588b5e12..cce6eb60 100644 --- a/opentracing-servlet-extension/opentracing-servlet-extension-autoconfigure/pom.xml +++ b/opentracing-servlet-extension/opentracing-servlet-extension-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-servlet-extension-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-servlet-extension-autoconfigure diff --git a/opentracing-servlet-extension/opentracing-servlet-extension-starter/pom.xml b/opentracing-servlet-extension/opentracing-servlet-extension-starter/pom.xml index a56fa1c3..bbfb2875 100644 --- a/opentracing-servlet-extension/opentracing-servlet-extension-starter/pom.xml +++ b/opentracing-servlet-extension/opentracing-servlet-extension-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-servlet-extension-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-servlet-extension-starter diff --git a/opentracing-servlet-extension/opentracing-servlet-extension/pom.xml b/opentracing-servlet-extension/opentracing-servlet-extension/pom.xml index b37e9785..07fbed75 100644 --- a/opentracing-servlet-extension/opentracing-servlet-extension/pom.xml +++ b/opentracing-servlet-extension/opentracing-servlet-extension/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-servlet-extension-parent - 4.1.1-SNAPSHOT + 4.2.0 opentracing-servlet-extension diff --git a/opentracing-servlet-extension/pom.xml b/opentracing-servlet-extension/pom.xml index 0c014fe8..fd587a38 100644 --- a/opentracing-servlet-extension/pom.xml +++ b/opentracing-servlet-extension/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-servlet-extension-parent pom diff --git a/opentracing-spring-extension/opentracing-spring-web-extension-autoconfigure/pom.xml b/opentracing-spring-extension/opentracing-spring-web-extension-autoconfigure/pom.xml index 78643ff4..b3dac99e 100644 --- a/opentracing-spring-extension/opentracing-spring-web-extension-autoconfigure/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-web-extension-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-web-extension-autoconfigure diff --git a/opentracing-spring-extension/opentracing-spring-web-extension-starter/pom.xml b/opentracing-spring-extension/opentracing-spring-web-extension-starter/pom.xml index a85543ab..42bc39cd 100644 --- a/opentracing-spring-extension/opentracing-spring-web-extension-starter/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-web-extension-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-web-extension-starter diff --git a/opentracing-spring-extension/opentracing-spring-web-extension/pom.xml b/opentracing-spring-extension/opentracing-spring-web-extension/pom.xml index 6e565edd..0036d2a4 100644 --- a/opentracing-spring-extension/opentracing-spring-web-extension/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-web-extension/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-web-extension diff --git a/opentracing-spring-extension/opentracing-spring-webflux-extension-autoconfigure/pom.xml b/opentracing-spring-extension/opentracing-spring-webflux-extension-autoconfigure/pom.xml index 7be40bbd..1496760d 100644 --- a/opentracing-spring-extension/opentracing-spring-webflux-extension-autoconfigure/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-webflux-extension-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-webflux-extension-autoconfigure diff --git a/opentracing-spring-extension/opentracing-spring-webflux-extension-starter/pom.xml b/opentracing-spring-extension/opentracing-spring-webflux-extension-starter/pom.xml index 87bb86a4..9b8dcca0 100644 --- a/opentracing-spring-extension/opentracing-spring-webflux-extension-starter/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-webflux-extension-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-webflux-extension-starter diff --git a/opentracing-spring-extension/opentracing-spring-webflux-extension/pom.xml b/opentracing-spring-extension/opentracing-spring-webflux-extension/pom.xml index 3cfb69d7..45688a46 100644 --- a/opentracing-spring-extension/opentracing-spring-webflux-extension/pom.xml +++ b/opentracing-spring-extension/opentracing-spring-webflux-extension/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-spring-extension - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-webflux-extension diff --git a/opentracing-spring-extension/pom.xml b/opentracing-spring-extension/pom.xml index baf0f9e2..e1c72e21 100644 --- a/opentracing-spring-extension/pom.xml +++ b/opentracing-spring-extension/pom.xml @@ -6,7 +6,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-spring-extension pom diff --git a/opentracing-toolbox-spring-boot-starter/pom.xml b/opentracing-toolbox-spring-boot-starter/pom.xml index 030f2c2f..ac8c1d6c 100644 --- a/opentracing-toolbox-spring-boot-starter/pom.xml +++ b/opentracing-toolbox-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 opentracing-toolbox-spring-boot-starter diff --git a/pom.xml b/pom.xml index 79c90f34..b38a5e94 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.zalando opentracing-toolbox - 4.1.1-SNAPSHOT + 4.2.0 pom https://github.com/zalando/opentracing-toolbox 2019 diff --git a/release.sh b/release.sh index ad72b3ec..c1104ba7 100755 --- a/release.sh +++ b/release.sh @@ -7,17 +7,17 @@ if [ "$(semver -h | grep -c 'A JavaScript implementation of the https://semver.o exit 1 fi -./mvnw scm:check-local-modification +#./mvnw scm:check-local-modification -current=$(git describe --abbrev=0 || echo 0.0.0) -release=$(semver ${current} -i $1 --preid RC) +#current=$(git describe --abbrev=0 || echo 0.0.0) +release="4.2.0" next=$(semver ${release} -i minor) git checkout -b release/${release} ./mvnw versions:set -D newVersion=${release} git commit -am "Release ${release}" -./mvnw clean deploy scm:tag -P release -D tag=${release} -D pushChanges=false -D skipTests -D dependency-check.skip +./mvnw -s ~/.m2/settings-oss.xml clean deploy scm:tag -P release -D tag=${release} -D pushChanges=false -D skipTests -D dependency-check.skip ./mvnw versions:set -D newVersion=${next}-SNAPSHOT git commit -am "Development ${next}-SNAPSHOT"