Skip to content

Commit e64924f

Browse files
committed
JDK 25 & OpenSearch 3
1 parent 497b362 commit e64924f

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/it.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
psql -c 'create extension hstore;' -U postgres lor
3939
psql -c 'create extension fuzzystrmatch;' -U postgres lor
4040
PGPASSWORD=maxcom psql -f sql/demo.db -U maxcom lor
41-
- name: Set up JDK 21
41+
- name: Set up JDK 25
4242
uses: actions/setup-java@v3
4343
with:
44-
java-version: '21'
44+
java-version: '25'
4545
distribution: 'adopt'
4646
cache: maven
4747
- name: Build

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<slf4j.version>1.7.22</slf4j.version>
2525
<jquery.validation.version>1.19.5</jquery.validation.version>
2626
<jquery.form.version>4.3.0</jquery.form.version>
27-
<jetty.version>12.0.13</jetty.version>
27+
<jetty.version>12.0.33</jetty.version>
2828
<pekko.version>1.4.0</pekko.version>
2929
<log4j.version>2.25.3</log4j.version>
3030
<d3js.version>5.9.7</d3js.version>
@@ -499,7 +499,7 @@
499499
<arg>-Xfatal-warnings</arg>
500500
-->
501501
<arg>-language:postfixOps</arg>
502-
<arg>-release:21</arg>
502+
<arg>-release:25</arg>
503503
<!--
504504
<arg>-rewrite</arg>
505505
<arg>-source</arg>
@@ -554,8 +554,8 @@
554554
<artifactId>maven-compiler-plugin</artifactId>
555555
<version>3.10.1</version>
556556
<configuration>
557-
<source>21</source>
558-
<target>21</target>
557+
<source>25</source>
558+
<target>25</target>
559559
<compilerArgument>-Xlint:deprecation</compilerArgument>
560560
<compilerArgument>-Xlint:unchecked</compilerArgument>
561561
<parameters>true</parameters>

src/main/webapp/WEB-INF/jsp/server.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
<ul>
7474
<li>AlmaLinux OS 9.x;</li>
7575
<li>СУБД PostgreSQL 16;</li>
76-
<li>OpenJDK 21;</li>
76+
<li>OpenJDK 25;</li>
7777
<li>Scala 3;</li>
7878
<li>Apache Tomcat 10.1;</li>
7979
<li>ActiveMQ 6.x;</li>
8080
<li>Spring 6.x;</li>
81-
<li>OpenSearch 2.x;</li>
81+
<li>OpenSearch 3.x;</li>
8282
<li>Nginx 1.x.</li>
8383
</ul>
8484

src/test/scala/ru/org/linux/search/OpenSearchIndexServiceIntegrationSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class OpenSearchIndexServiceIntegrationSpec extends SpecificationWithJUnit {
6969
class SearchIntegrationTestConfiguration {
7070
@Bean
7171
def openSearchContainer: OpenSearchContainer[Nothing] = {
72-
val container = new OpenSearchContainer("opensearchproject/opensearch:2.19.5")
72+
val container = new OpenSearchContainer("opensearchproject/opensearch:3.5.0")
7373
container.start()
7474
container
7575
}

0 commit comments

Comments
 (0)