From 2bb5fe76210bd2837988f9703fc9ca47d51bbe26 Mon Sep 17 00:00:00 2001 From: Vladimir Kostyukov Date: Thu, 28 Jul 2022 16:34:57 +0000 Subject: [PATCH] Revert "Twitter-oss: update OSS libraries post-release to 22.10.0-SNAPSHOT" This reverts commit 7915f823ec292ddd448489b79935691dcad756bf. Differential Revision: https://phabricator.twitter.biz/D943947 --- README.md | 2 +- build.sbt | 2 +- demos/scrooge-maven-demo/pom.xml | 12 ++++++------ scrooge-maven-plugin/pom.xml | 4 ++-- .../src/test/resources/unit/project-idl-deps/pom.xml | 2 +- .../unit/scrooge-maven-plugin-test/plugin-config.xml | 2 +- .../src/test/resources/unit/unresolved-idl/pom.xml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2cbff24a..8baf4986 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Scrooge -[![Build Status](https://github.com/twitter/scrooge/workflows/continuous%20integration/badge.svg?branch=develop)](https://github.com/twitter/scrooge/actions?query=workflow%3A%22continuous+integration%22+branch%3Adevelop) +[![Build Status](https://github.com/twitter/scrooge/workflows/continuous%20integration/badge.svg?branch=release)](https://github.com/twitter/scrooge/actions?query=workflow%3A%22continuous+integration%22+branch%3Arelease) [![Codecov](https://codecov.io/gh/twitter/scrooge/branch/develop/graph/badge.svg)](https://codecov.io/gh/twitter/scrooge) [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status) [![Gitter](https://badges.gitter.im/twitter/finagle.svg)](https://gitter.im/twitter/finagle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) diff --git a/build.sbt b/build.sbt index ec9a8a20..73d27242 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ Global / excludeLintKeys += scalacOptions // 'git checkout develop; sbt publishLocal' to publish SNAPSHOT versions of these projects. // All Twitter library releases are date versioned as YY.MM.patch -val releaseVersion = "22.10.0-SNAPSHOT" +val releaseVersion = "22.7.0" lazy val versions = new { val slf4j = "1.7.30" diff --git a/demos/scrooge-maven-demo/pom.xml b/demos/scrooge-maven-demo/pom.xml index fb2d845f..f1998616 100644 --- a/demos/scrooge-maven-demo/pom.xml +++ b/demos/scrooge-maven-demo/pom.xml @@ -24,28 +24,28 @@ com.twitter scrooge-core_2.12 - 22.10.0-SNAPSHOT + 22.7.0 com.twitter finagle-thrift_2.12 - 22.10.0-SNAPSHOT + 22.7.0 com.twitter util-core_2.12 - 22.10.0-SNAPSHOT + 22.7.0 com.twitter util-codec_2.12 - 22.10.0-SNAPSHOT + 22.7.0 com.twitter finagle-core_2.12 - 22.10.0-SNAPSHOT + 22.7.0 junit @@ -129,7 +129,7 @@ com.twitter scrooge-maven-plugin - 22.10.0-SNAPSHOT + 22.7.0 diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml index b444c5aa..006bc9f4 100644 --- a/scrooge-maven-plugin/pom.xml +++ b/scrooge-maven-plugin/pom.xml @@ -5,7 +5,7 @@ scrooge-maven-plugin maven-plugin scrooge-maven-plugin - 22.10.0-SNAPSHOT + 22.7.0 3.0.4 @@ -316,7 +316,7 @@ com.twitter scrooge-generator_2.10 - 22.10.0-SNAPSHOT + 22.7.0 diff --git a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml index 1e21270f..73aa4da8 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/pom.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 22.10.0-SNAPSHOT + 22.7.0 idl diff --git a/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml b/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml index 2c18d802..00c8040e 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/scrooge-maven-plugin-test/plugin-config.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 22.10.0-SNAPSHOT + 22.7.0 ${localRepository} diff --git a/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml b/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml index 2a7d9dc9..8488e9e2 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/unresolved-idl/pom.xml @@ -10,7 +10,7 @@ com.twitter scrooge-maven-plugin - 22.10.0-SNAPSHOT + 22.7.0 idl