Revert "Twitter-oss: Prepare OSS libraries for release 24.2.0"

This reverts commit 996858fd593b43d101d3c546d5a9968dc5408855. There were issues with the release. Will be retrying it Differential Revision: https://phabricator.twitter.biz/D1141484
twitter · May 6, 2024 · 3eaf9c5 · 3eaf9c5
1 parent b9ecf0c
commit 3eaf9c5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 25 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,11 +7,6 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com
 Unreleased
 ----------
 
-24.2.0
-------
-
-No Changes
-
 23.11.0
 -------
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Scrooge
 
-[![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)
+[![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)
 [![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)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.twitter/scrooge-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.twitter/scrooge-core_2.12)

diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,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 = "24.2.0"
+val releaseVersion = "24.2.0-SNAPSHOT"
 
 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
@@ -24,28 +24,28 @@
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>scrooge-core_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-thrift_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <!--#dependencies-->
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-core_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-codec_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-core_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -129,7 +129,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>scrooge-maven-plugin</artifactId>
-        <version>24.2.0</version>
+        <version>24.2.0-SNAPSHOT</version>
         <configuration>
           <thriftNamespaceMappings>
             <thriftNamespaceMapping>

diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst
@@ -13,7 +13,7 @@ To use the scrooge-sbt-plugin, add the following lines to your
 
 ::
 
-    addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "24.2.0")
+    addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "23.11.0")
 
 Incorporating this line makes the Scrooge plugin available for use by SBT.
 Thrift files added to your project can now have code generated for them. By
@@ -41,8 +41,8 @@ An example using a `build.sbt` file.
         name := "Scrooge Demo",
         libraryDependencies ++= Seq(
           "org.apache.thrift" % "libthrift" % "0.10.0",
-          "com.twitter" %% "scrooge-core" % "24.2.0",
-          "com.twitter" %% "finagle-thrift" % "24.2.0",
+          "com.twitter" %% "scrooge-core" % "23.11.0",
+          "com.twitter" %% "finagle-thrift" % "23.11.0",
           scalaTest % Test
         )
       )
@@ -101,7 +101,7 @@ have Scrooge generate Java code.
         scroogeLanguages in Compile := Seq("java"),
         libraryDependencies ++= Seq(
           "org.apache.thrift" % "libthrift" % "0.10.0",
-          "com.twitter" %% "scrooge-core" % "24.2.0",
-          "com.twitter" %% "finagle-thrift" % "24.2.0",
+          "com.twitter" %% "scrooge-core" % "23.11.0",
+          "com.twitter" %% "finagle-thrift" % "23.11.0",
           scalaTest % Test
         )
diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst
@@ -45,14 +45,14 @@ Maven users need to add the following to the pom.xml file:
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>scrooge-core_2.12</artifactId>
-      <version>24.2.0</version>
+      <version>23.11.0</version>
     </dependency>
 
 SBT users need this:
 
 ::
 
-    val scroogeCore = "com.twitter" %% "scrooge-core" % "24.2.0"
+    val scroogeCore = "com.twitter" %% "scrooge-core" % "23.11.0"
 
 Building Scrooge
 ----------------

diff --git a/scrooge-maven-plugin/pom.xml b/scrooge-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>scrooge-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>scrooge-maven-plugin</name>
-  <version>24.2.0</version>
+  <version>24.2.0-SNAPSHOT</version>
   <prerequisites>
     <maven>3.0.4</maven>
   </prerequisites>
@@ -316,7 +316,7 @@
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>scrooge-generator_2.10</artifactId>
-      <version>24.2.0</version>
+      <version>24.2.0-SNAPSHOT</version>
     </dependency>
     <!-- Test Dependencies-->
     <dependency>

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
@@ -10,7 +10,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>scrooge-maven-plugin</artifactId>
-        <version>24.2.0</version>
+        <version>24.2.0-SNAPSHOT</version>
         <configuration>
           <classifier>idl</classifier>
           <project implementation="com.twitter.stubs.ProjectIdlDependenciesStub">

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
@@ -10,7 +10,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>scrooge-maven-plugin</artifactId>
-        <version>24.2.0</version>
+        <version>24.2.0-SNAPSHOT</version>
         <configuration>
           <localRepository>${localRepository}</localRepository>
           <thriftOpts>

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
@@ -10,7 +10,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>scrooge-maven-plugin</artifactId>
-        <version>24.2.0</version>
+        <version>24.2.0-SNAPSHOT</version>
         <configuration>
           <classifier>idl</classifier>
           <project implementation="com.twitter.stubs.ProjectIdlDependenciesStub">