Skip to content

Commit e1f8c59

Browse files
jacomagojacomago
authored
Merge branch 'master' into spring-boot-2.7.18
2 parents b28a618 + 1299671 commit e1f8c59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1218
-921
lines changed

‎.github/workflows/codecov.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,25 @@ jobs:
2121
pull-requests: write
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3
25-
- name: Set up JDK 11
26-
uses: actions/setup-java@v3
24+
- uses: actions/checkout@v4
25+
- name: Set up JDK 17
26+
uses: actions/setup-java@v4
2727
with:
28-
java-version: '11'
28+
java-version: '17'
2929
distribution: 'temurin'
3030
cache: maven
31-
- uses: ankane/setup-elasticsearch@v1
31+
- name: Runs Elasticsearch
32+
uses: elastic/elastic-github-actions/elasticsearch@master
3233
with:
33-
elasticsearch-version: 8
34-
config: |
35-
http.port: 9200
34+
stack-version: 8.11.2
35+
security-enabled: false
3636
- name: Clear existing docker image cache
3737
shell: bash
3838
run: docker image prune -af
3939
- name: Integration Test with Maven
4040
run: mvn clean install test-compile failsafe:integration-test failsafe:verify verify --batch-mode --fail-at-end -Djacoco.skip=false -DskipITs=false -DskipITCoverage=false
41+
env:
42+
EPICS_PVA_ENABLE_IP6: "false"
4143
- name: Publish Test Report
4244
uses: mikepenz/action-junit-report@v3
4345
if: success() || failure() # always run even if the previous step fails

‎.github/workflows/docker-release.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
name: Release docker image
3+
4+
on:
5+
push:
6+
branches: [ "master" ]
7+
tags:
8+
- '**'
9+
10+
env:
11+
REGISTRY: ghcr.io
12+
IMAGE_NAME: ${{ github.repository }}
13+
14+
jobs:
15+
build-and-push-image:
16+
permissions:
17+
contents: read
18+
packages: write
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
24+
with:
25+
java-version: '17'
26+
distribution: 'temurin'
27+
cache: maven
28+
- name: Build with Maven
29+
run: mvn --batch-mode --update-snapshots package
30+
- name: Log in to the Container registry
31+
uses: docker/login-action@v3
32+
with:
33+
registry: ${{ env.REGISTRY }}
34+
username: ${{ github.actor }}
35+
password: ${{ secrets.GITHUB_TOKEN }}
36+
- name: Extract metadata (tags, labels) for Docker
37+
id: meta
38+
uses: docker/metadata-action@v5
39+
with:
40+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
41+
- name: Set up Docker Buildx
42+
uses: docker/setup-buildx-action@v3
43+
- name: Build and push Docker image
44+
uses: docker/build-push-action@v5
45+
with:
46+
context: .
47+
push: true
48+
platforms: linux/amd64,linux/arm64
49+
tags: ${{ steps.meta.outputs.tags }}
50+
labels: ${{ steps.meta.outputs.labels }}
51+
cache-from: type=gha
52+
cache-to: type=gha,mode=max

‎.github/workflows/maven.yml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
22-
- name: Set up JDK 11
23-
uses: actions/setup-java@v3
21+
- uses: actions/checkout@v4
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
2424
with:
25-
java-version: '11'
25+
java-version: '17'
2626
distribution: 'temurin'
2727
cache: maven
2828
- name: Build with Maven
@@ -38,11 +38,11 @@ jobs:
3838
contents: read
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v3
42-
- name: Set up JDK 11
43-
uses: actions/setup-java@v3
41+
- uses: actions/checkout@v4
42+
- name: Set up JDK 17
43+
uses: actions/setup-java@v4
4444
with:
45-
java-version: '11'
45+
java-version: '17'
4646
distribution: 'temurin'
4747
cache: maven
4848
- name: Test with Maven
@@ -58,23 +58,25 @@ jobs:
5858
contents: read
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v3
62-
- name: Set up JDK 11
63-
uses: actions/setup-java@v3
61+
- uses: actions/checkout@v4
62+
- name: Set up JDK 17
63+
uses: actions/setup-java@v4
6464
with:
65-
java-version: '11'
65+
java-version: '17'
6666
distribution: 'temurin'
6767
cache: maven
68-
- uses: ankane/setup-elasticsearch@v1
68+
- name: Runs Elasticsearch
69+
uses: elastic/elastic-github-actions/elasticsearch@master
6970
with:
70-
elasticsearch-version: 8
71-
config: |
72-
http.port: 9200
71+
stack-version: 8.11.2
72+
security-enabled: false
7373
- name: Clear existing docker image cache
7474
shell: bash
7575
run: docker image prune -af
7676
- name: Integration Test with Maven
7777
run: mvn clean install test-compile failsafe:integration-test failsafe:verify --batch-mode --fail-at-end -Djacoco.skip=true -DskipITs=false -DskipITCoverage=true
78+
env:
79+
EPICS_PVA_ENABLE_IP6: "false"
7880
- name: Publish Test Report
7981
uses: mikepenz/action-junit-report@v4
8082
if: success() || failure() # always run even if the previous step fails

‎.readthedocs.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
3+
build:
4+
os: "ubuntu-22.04"
5+
tools:
6+
python: "3.12"
7+
8+
# Build from the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: src/site/sphinx/conf.py
11+
12+
# Explicitly set the version of Python and its requirements
13+
python:
14+
install:
15+
- requirements: src/site/sphinx/requirements.txt

‎Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
FROM openjdk:11-jre
2-
WORKDIR /channelfinder
3-
ADD https://repo1.maven.org/maven2/org/phoebus/app-channel-channelfinder/4.7.2/app-channel-channelfinder-4.7.2.jar .
1+
FROM eclipse-temurin:17-jre
2+
3+
# deployment unit
4+
COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar
5+
6+
CMD ["java", "-jar", "/channelfinder/ChannelFinder-*.jar", "--spring.config.name=application"]

‎Dockerfile.integrationtest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1717
# ------------------------------------------------------------------------------
1818

19-
FROM openjdk:11
19+
FROM eclipse-temurin:17-jre
2020

2121
# deployment unit
2222
COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
3232

3333
* Prerequisites
3434

35-
* JDK 11
35+
* JDK 17
3636
* Elastic version 8.2.x
3737
* <For authN/authZ using LDAP:> LDAP server, e.g. OpenLDAP
3838

@@ -45,7 +45,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
4545
* Build
4646
```
4747
# Debian 10
48-
sudo apt-get install openjdk-11-jdk maven git curl wget
48+
sudo apt-get install openjdk-17-jdk maven git curl wget
4949
wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.2.0-amd64.deb
5050
sudo dpkg -i elasticsearch-8.2.0-amd64.deb
5151
sudo systemctl start elasticsearch

‎docker-compose-integrationtest.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ services:
4040
embedded_ldap.enabled: "false"
4141
demo_auth.enabled: "true"
4242
skipITCoverage: "true"
43+
EPICS_PVAS_INTF_ADDR_LIST: "0.0.0.0"
4344
command: >
4445
/bin/bash -c "
4546
if [ ${skipITCoverage} == false ]; then
@@ -54,7 +55,7 @@ services:
5455
retries: 5
5556

5657
elasticsearch:
57-
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0
58+
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.2
5859
hostname: elasticsearch-cf
5960
networks:
6061
- channelfinder-net
@@ -80,7 +81,3 @@ volumes:
8081
networks:
8182
channelfinder-net:
8283
driver: bridge
83-
enable_ipv6: true
84-
ipam:
85-
config:
86-
- subnet: 2001:0DB8::/112

‎docker-compose.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ services:
1818
echo 'Waiting for Elasticsearch'
1919
sleep 1
2020
done
21-
java -jar /channelfinder/ChannelFinder-4.7.2.jar"
21+
java -jar /channelfinder/ChannelFinder-*.jar"
2222
2323
elasticsearch:
24-
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0
24+
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.2
2525
hostname: elasticsearch-cf
2626
networks:
2727
- channelfinder-net
@@ -32,6 +32,7 @@ services:
3232
discovery.type: single-node
3333
bootstrap.memory_lock: "true"
3434
xpack.security.enabled: "false"
35+
EPICS_PVAS_INTF_ADDR_LIST: "0.0.0.0"
3536
volumes:
3637
- channelfinder-es-data:/usr/share/elasticsearch/data
3738
volumes:
@@ -41,7 +42,3 @@ volumes:
4142
networks:
4243
channelfinder-net:
4344
driver: bridge
44-
enable_ipv6: true
45-
ipam:
46-
config:
47-
- subnet: 2001:0DB8::/112

‎pom.xml‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<spring.boot-version>2.7.18</spring.boot-version>
39-
<elasticsearch.version>8.2.0</elasticsearch.version>
39+
<elasticsearch.version>8.11.2</elasticsearch.version>
4040
<junit-jupiter.version>5.10.0</junit-jupiter.version>
4141
<skipITs>true</skipITs>
4242
<skipITCoverage>true</skipITCoverage>
@@ -55,24 +55,6 @@
5555
</dependencies>
5656
</dependencyManagement>
5757
<dependencies>
58-
<!-- The following 3 dependencies are temporarily added for java 11 compatibility
59-
TODO They should be removed as soon as possible. -->
60-
<dependency>
61-
<groupId>javax.xml.bind</groupId>
62-
<artifactId>jaxb-api</artifactId>
63-
<version>2.3.0</version>
64-
</dependency>
65-
<dependency>
66-
<groupId>com.sun.xml.bind</groupId>
67-
<artifactId>jaxb-core</artifactId>
68-
<version>2.3.0</version>
69-
</dependency>
70-
<dependency>
71-
<groupId>com.sun.xml.bind</groupId>
72-
<artifactId>jaxb-impl</artifactId>
73-
<version>2.3.0</version>
74-
</dependency>
75-
<!-- The above 3 dependencies are temporarily added for java 11 compatibility -->
7658
<dependency>
7759
<groupId>org.springframework.boot</groupId>
7860
<artifactId>spring-boot-starter</artifactId>
@@ -85,11 +67,6 @@
8567
<groupId>org.springframework.data</groupId>
8668
<artifactId>spring-data-commons</artifactId>
8769
</dependency>
88-
<dependency>
89-
<groupId>javax.servlet</groupId>
90-
<artifactId>javax.servlet-api</artifactId>
91-
<scope>provided</scope>
92-
</dependency>
9370
<!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
9471
<dependency>
9572
<groupId>org.junit.jupiter</groupId>
@@ -100,7 +77,7 @@
10077
<dependency>
10178
<groupId>co.elastic.clients</groupId>
10279
<artifactId>elasticsearch-java</artifactId>
103-
<version>8.2.0</version>
80+
<version>${elasticsearch.version}</version>
10481
</dependency>
10582
<dependency>
10683
<groupId>com.fasterxml.jackson.core</groupId>
@@ -110,7 +87,7 @@
11087
<dependency>
11188
<groupId>com.fasterxml.jackson.core</groupId>
11289
<artifactId>jackson-core</artifactId>
113-
<version>2.14.2</version>
90+
<version>2.16.0</version>
11491
</dependency>
11592
<dependency>
11693
<groupId>jakarta.json</groupId>
@@ -155,7 +132,7 @@
155132
<dependency>
156133
<groupId>org.phoebus</groupId>
157134
<artifactId>core-pva</artifactId>
158-
<version>4.7.2</version>
135+
<version>4.7.3</version>
159136
</dependency>
160137

161138
<dependency>
@@ -255,6 +232,9 @@
255232
<includes>
256233
<include>**/*IT.java</include>
257234
</includes>
235+
<excludes>
236+
<exclude>**/EpicsRPCRequestIT.java</exclude>
237+
</excludes>
258238
</configuration>
259239
</plugin>
260240
<plugin>
@@ -343,8 +323,8 @@
343323
<artifactId>maven-compiler-plugin</artifactId>
344324
<version>3.11.0</version>
345325
<configuration>
346-
<source>11</source>
347-
<target>11</target>
326+
<source>17</source>
327+
<target>17</target>
348328
<encoding>${project.build.sourceEncoding}</encoding>
349329
</configuration>
350330
</plugin>
@@ -420,7 +400,7 @@
420400
<additionalOptions>
421401
<additionalOption>-Xdoclint:none</additionalOption>
422402
</additionalOptions>
423-
<source>11</source>
403+
<source>17</source>
424404
</configuration>
425405
</execution>
426406
</executions>

0 commit comments

Comments
 (0)