Skip to content

Commit faa7789

Browse files
authored
Dropping support for ES 9.0.0-beta1 and 9.0.0-rc1 (#1110)
1 parent 641dd6c commit faa7789

File tree

6 files changed

+1
-189
lines changed

6 files changed

+1
-189
lines changed

ci/supported-es-versions/es9x.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
9.0.1
22
9.0.0
3-
9.0.0-rc1
4-
9.0.0-beta1

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/Es900rc1Patch.scala

Lines changed: 0 additions & 49 deletions
This file was deleted.

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/base/EsPatch.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ object EsPatch {
3838
val rorPluginDirectory = new RorPluginDirectory(esDirectory)
3939
esDirectory.readEsVersion() match {
4040
case esVersion if esVersion >= es900 => new Es90xPatch(rorPluginDirectory, esVersion)
41-
case esVersion if esVersion == es900rc1 => new Es900rc1Patch(rorPluginDirectory, esVersion)
4241
case esVersion if esVersion >= es8180 => new Es90xPatch(rorPluginDirectory, esVersion)
4342
case esVersion if esVersion >= es8150 => new Es815xPatch(rorPluginDirectory, esVersion)
4443
case esVersion if esVersion >= es8140 => new Es814xPatch(rorPluginDirectory, esVersion)

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/internal/modifiers/bytecodeJars/ModifyEntitlementInitializationClass.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package tech.beshu.ror.tools.core.patches.internal.modifiers.bytecodeJars
1919
import just.semver.SemVer
2020
import org.objectweb.asm.*
2121
import tech.beshu.ror.tools.core.patches.internal.modifiers.BytecodeJarModifier
22-
import tech.beshu.ror.tools.core.utils.EsUtil.{es8181, es901, es900rc1, es900beta1}
22+
import tech.beshu.ror.tools.core.utils.EsUtil.{es8181, es901}
2323

2424
import java.io.{File, InputStream}
2525

@@ -62,8 +62,6 @@ private[patches] class ModifyEntitlementInitializationClass(esVersion: SemVer)
6262
new DontValidateForbiddenPathsInCaseOfRorPlugin(
6363
super.visitMethod(access, name, descriptor, signature, exceptions)
6464
)
65-
case v if Set(es900beta1, es900rc1).contains(esVersion) =>
66-
super.visitMethod(access, name, descriptor, signature, exceptions)
6765
case v if v >= es8181 =>
6866
new DontValidateForbiddenPathsInCaseOfRorPlugin(
6967
super.visitMethod(access, name, descriptor, signature, exceptions)

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/patches/internal/modifiers/bytecodeJars/ModifyEntitlementRuntimePolicyUtilsClass.scala

Lines changed: 0 additions & 132 deletions
This file was deleted.

ror-tools-core/src/main/scala/tech/beshu/ror/tools/core/utils/EsUtil.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ object EsUtil {
2525

2626
val es901: SemVer = SemVer.unsafeParse("9.0.1")
2727
val es900: SemVer = SemVer.unsafeParse("9.0.0")
28-
val es900rc1: SemVer = SemVer.unsafeParse("9.0.0-rc1")
29-
val es900beta1: SemVer = SemVer.unsafeParse("9.0.0-beta1")
3028
val es8181: SemVer = SemVer.unsafeParse("8.18.1")
3129
val es8180: SemVer = SemVer.unsafeParse("8.18.0")
3230
val es8150: SemVer = SemVer.unsafeParse("8.15.0")

0 commit comments

Comments
 (0)