File tree Expand file tree Collapse file tree 3 files changed +10
-5
lines changed
main/java/org/elasticsearch/hadoop/util
test/java/org/elasticsearch/hadoop/serialization Expand file tree Collapse file tree 3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 6
6
# build and test Elasticsearch for this branch. Valid Java versions
7
7
# are 'java' or 'openjdk' followed by the major release number.
8
8
9
- ESH_BUILD_JAVA =openjdk17
10
- ESH_RUNTIME_JAVA =openjdk17
9
+ ESH_BUILD_JAVA =openjdk21
10
+ ESH_RUNTIME_JAVA =openjdk21
Original file line number Diff line number Diff line change @@ -36,7 +36,8 @@ public class EsMajorVersion implements Serializable {
36
36
public static final EsMajorVersion V_6_X = new EsMajorVersion ((byte ) 6 , "6.x" );
37
37
public static final EsMajorVersion V_7_X = new EsMajorVersion ((byte ) 7 , "7.x" );
38
38
public static final EsMajorVersion V_8_X = new EsMajorVersion ((byte ) 8 , "8.x" );
39
- public static final EsMajorVersion LATEST = V_8_X ;
39
+ public static final EsMajorVersion V_9_X = new EsMajorVersion ((byte ) 9 , "9.x" );
40
+ public static final EsMajorVersion LATEST = V_9_X ;
40
41
41
42
public final byte major ;
42
43
private final String version ;
@@ -92,6 +93,9 @@ public static EsMajorVersion parse(String version) {
92
93
if (version .startsWith ("8." )) {
93
94
return new EsMajorVersion ((byte ) 8 , version );
94
95
}
96
+ if (version .startsWith ("9." )) {
97
+ return new EsMajorVersion ((byte ) 9 , version );
98
+ }
95
99
throw new EsHadoopIllegalArgumentException ("Unsupported/Unknown Elasticsearch version [" + version + "]." +
96
100
"Highest supported version is [" + LATEST .version + "]. You may need to upgrade ES-Hadoop." );
97
101
}
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ public class CommandTest {
59
59
public static Collection <Object []> data () {
60
60
61
61
// make sure all versions are tested. Throw if a new one is seen:
62
- if (EsMajorVersion .LATEST != EsMajorVersion .V_8_X ) {
62
+ if (EsMajorVersion .LATEST != EsMajorVersion .V_9_X ) {
63
63
throw new IllegalStateException ("CommandTest needs new version updates." );
64
64
}
65
65
@@ -76,7 +76,8 @@ public static Collection<Object[]> data() {
76
76
EsMajorVersion .V_5_X ,
77
77
EsMajorVersion .V_6_X ,
78
78
EsMajorVersion .V_7_X ,
79
- EsMajorVersion .V_8_X };
79
+ EsMajorVersion .V_8_X ,
80
+ EsMajorVersion .V_9_X };
80
81
81
82
for (EsMajorVersion version : versions ) {
82
83
for (boolean asJson : asJsons ) {
You can’t perform that action at this time.
0 commit comments