Skip to content

Commit 0967c6c

Browse files
committed
Upgrade to Phoebus v5.0.0
Signed-off-by: Mariana González Velarde <[email protected]>
1 parent 56f8f45 commit 0967c6c

File tree

8 files changed

+26
-24
lines changed

8 files changed

+26
-24
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
PHOEBUS_RELEASE: v4.7.3
11+
PHOEBUS_RELEASE: v5.0.0
1212

1313
jobs:
1414
build:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ The proxychains command uses the above ssh tunnel to access github.com
4343
### Download the full base Phoebus and Select version
4444
```
4545
cd phoebus-fnal
46-
proxychains git clone -b v4.7.3 https://github.com/ControlSystemStudio/phoebus.git lib/phoebus
46+
proxychains git clone -b v5.0.0 https://github.com/ControlSystemStudio/phoebus.git lib/phoebus
4747
```
48-
Currently we are using Phoebus production version 4.7.3
48+
Currently we are using Phoebus production version v5.0.0
4949

5050
### Select JDK 21 [recommended]
5151
```

alarm-server-fnal/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<groupId>org.phoebus</groupId>
66
<artifactId>fnal</artifactId>
7-
<version>4.7.3-42</version>
7+
<version>5.0.0-57</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>fnal-alarm-server</artifactId>
12-
<version>4.7.3-42</version>
12+
<version>5.0.0-57</version>
1313
<packaging>jar</packaging>
1414

1515
<dependencies>
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>org.phoebus</groupId>
2323
<artifactId>fnal-product</artifactId>
24-
<version>4.7.3-42</version>
24+
<version>${fnal.phoebus.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.hamcrest</groupId>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>org.phoebus</groupId>
7070
<artifactId>core-pv-acsys</artifactId>
71-
<version>4.7.3-42</version>
71+
<version>${fnal.phoebus.version}</version>
7272
</dependency>
7373

7474
<dependency>

dependencies/install-jars/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>dependencies</artifactId>
6-
<version>4.7.3-42</version>
6+
<version>5.0.0-57</version>
77
</parent>
88
<artifactId>install-jars-fnal</artifactId>
99

dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.phoebus</groupId>
77
<artifactId>fnal</artifactId>
8-
<version>4.7.3-42</version>
8+
<version>5.0.0-57</version>
99
</parent>
1010
<modules>
1111
<module>install-jars</module>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.phoebus</groupId>
66
<artifactId>fnal</artifactId>
7-
<version>4.7.3-42</version>
7+
<version>5.0.0-57</version>
88
<name>FNAL Phoebus Product</name>
99
<packaging>pom</packaging>
1010

@@ -14,8 +14,8 @@
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515

1616
<!-- Update when phoebus version is changed -->
17-
<phoebus.version>4.7.3</phoebus.version>
18-
<fnal.phoebus.version>42</fnal.phoebus.version>
17+
<phoebus.version>5.0.0</phoebus.version>
18+
<fnal.phoebus.version>${phoebus.version}-57</fnal.phoebus.version>
1919
</properties>
2020

2121
<build>

product-fnal/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>org.phoebus</groupId>
6-
<version>4.7.3-42</version>
6+
<version>5.0.0-57</version>
77
<artifactId>fnal-product</artifactId>
88
<name>FNAL Phoebus Product</name>
9+
910

1011
<parent>
1112
<groupId>org.phoebus</groupId>
1213
<artifactId>fnal</artifactId>
13-
<version>4.7.3-42</version>
14+
<version>5.0.0-57</version>
1415
</parent>
1516

1617
<properties>
@@ -22,34 +23,34 @@
2223
<dependency>
2324
<groupId>org.phoebus</groupId>
2425
<artifactId>product</artifactId>
25-
<version>4.7.3</version>
26+
<version>${phoebus.version}</version>
2627
</dependency>
2728
<dependency>
2829
<groupId>org.phoebus</groupId>
2930
<artifactId>app-trends-rich-adapters</artifactId>
30-
<version>4.7.3</version>
31+
<version>${phoebus.version}</version>
3132
</dependency>
3233
<dependency>
3334
<groupId>org.phoebus</groupId>
3435
<artifactId>app-utility-preference-manager</artifactId>
35-
<version>4.7.3</version>
36+
<version>${phoebus.version}</version>
3637
</dependency>
3738

3839
<dependency>
3940
<groupId>org.phoebus</groupId>
4041
<artifactId>app-logbook-olog-client-es</artifactId>
41-
<version>4.7.3</version>
42+
<version>${phoebus.version}</version>
4243
</dependency>
4344
<dependency>
4445
<groupId>org.phoebus</groupId>
4546
<artifactId>app-logbook-olog-ui</artifactId>
46-
<version>4.7.3</version>
47+
<version>${phoebus.version}</version>
4748
</dependency>
4849

4950
<dependency>
5051
<groupId>org.phoebus</groupId>
5152
<artifactId>core-pv-acsys</artifactId>
52-
<version>4.7.3-42</version>
53+
<version>${phoebus.version}-57</version>
5354
</dependency>
5455

5556
<dependency>

pv-acsys/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>core-pv-acsys</artifactId>
4-
<version>4.7.3-42</version>
4+
<version>5.0.0-57</version>
5+
56
<parent>
67
<groupId>org.phoebus</groupId>
78
<artifactId>core</artifactId>
8-
<version>4.7.3</version>
9+
<version>5.0.0</version>
910
</parent>
1011
<dependencies>
1112

@@ -32,13 +33,13 @@
3233
<dependency>
3334
<groupId>org.phoebus</groupId>
3435
<artifactId>core-pv</artifactId>
35-
<version>4.7.3</version>
36+
<version>5.0.0</version>
3637
</dependency>
3738

3839
<dependency>
3940
<groupId>org.phoebus</groupId>
4041
<artifactId>core-framework</artifactId>
41-
<version>4.7.3</version>
42+
<version>5.0.0</version>
4243
</dependency>
4344

4445
<dependency>

0 commit comments

Comments
 (0)