Skip to content

Commit 2a3ae67

Browse files
daykindaykin
authored
Merge branch 'ControlSystemStudio:master' into ux-analytics-plugin
2 parents 22ded17 + 20dd0cc commit 2a3ae67

File tree

153 files changed

+2326
-892
lines changed

Some content is hidden

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

153 files changed

+2326
-892
lines changed

‎.github/workflows/alarm-logger-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
context: services/alarm-logger
5858
push: true
59-
platforms: linux/amd64
59+
platforms: linux/amd64,linux/arm64
6060
tags: ${{ steps.meta.outputs.tags }}
6161
labels: ${{ steps.meta.outputs.labels }}
6262
cache-from: type=gha

‎.github/workflows/alarm-server-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
context: services/alarm-server
5858
push: true
59-
platforms: linux/amd64
59+
platforms: linux/amd64,linux/arm64
6060
tags: ${{ steps.meta.outputs.tags }}
6161
labels: ${{ steps.meta.outputs.labels }}
6262
cache-from: type=gha

‎.github/workflows/save-and-restore-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
context: services/save-and-restore
4747
push: true
48-
platforms: linux/amd64
48+
platforms: linux/amd64,linux/arm64
4949
tags: ${{ steps.meta.outputs.tags }}
5050
labels: ${{ steps.meta.outputs.labels }}
5151
cache-from: type=gha

‎app/3d-viewer/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app</artifactId>
6-
<version>4.7.4-SNAPSHOT</version>
6+
<version>5.0.1-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-3d-viewer</artifactId>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.phoebus</groupId>
1212
<artifactId>core-ui</artifactId>
13-
<version>4.7.4-SNAPSHOT</version>
13+
<version>5.0.1-SNAPSHOT</version>
1414
</dependency>
1515
<dependency>
1616
<groupId>org.phoebus</groupId>
1717
<artifactId>core-framework</artifactId>
18-
<version>4.7.4-SNAPSHOT</version>
18+
<version>5.0.1-SNAPSHOT</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.junit.jupiter</groupId>

‎app/alarm/audio-annunciator/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
53
<modelVersion>4.0.0</modelVersion>
64
<parent>
75
<groupId>org.phoebus</groupId>
86
<artifactId>app-alarm</artifactId>
9-
<version>4.7.4-SNAPSHOT</version>
7+
<version>5.0.1-SNAPSHOT</version>
108
</parent>
119
<artifactId>app-alarm-audio-annunciator</artifactId>
1210

@@ -19,7 +17,7 @@
1917
<dependency>
2018
<groupId>org.phoebus</groupId>
2119
<artifactId>app-alarm-ui</artifactId>
22-
<version>4.7.4-SNAPSHOT</version>
20+
<version>5.0.1-SNAPSHOT</version>
2321
</dependency>
2422
<dependency>
2523
<groupId>org.openjfx</groupId>

‎app/alarm/datasource/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>4.7.4-SNAPSHOT</version>
6+
<version>5.0.1-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-datasouce</artifactId>
99
<dependencies>
@@ -22,32 +22,32 @@
2222
<dependency>
2323
<groupId>org.phoebus</groupId>
2424
<artifactId>core-framework</artifactId>
25-
<version>4.7.4-SNAPSHOT</version>
25+
<version>5.0.1-SNAPSHOT</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.phoebus</groupId>
2929
<artifactId>core-types</artifactId>
30-
<version>4.7.4-SNAPSHOT</version>
30+
<version>5.0.1-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.phoebus</groupId>
3434
<artifactId>core-pv</artifactId>
35-
<version>4.7.4-SNAPSHOT</version>
35+
<version>5.0.1-SNAPSHOT</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.phoebus</groupId>
3939
<artifactId>core-util</artifactId>
40-
<version>4.7.4-SNAPSHOT</version>
40+
<version>5.0.1-SNAPSHOT</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.phoebus</groupId>
4444
<artifactId>core-ui</artifactId>
45-
<version>4.7.4-SNAPSHOT</version>
45+
<version>5.0.1-SNAPSHOT</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.phoebus</groupId>
4949
<artifactId>app-alarm-model</artifactId>
50-
<version>4.7.4-SNAPSHOT</version>
50+
<version>5.0.1-SNAPSHOT</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>net.sf.sociaal</groupId>

‎app/alarm/freetts-annunciator/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
53
<modelVersion>4.0.0</modelVersion>
64
<parent>
75
<groupId>org.phoebus</groupId>
86
<artifactId>app-alarm</artifactId>
9-
<version>4.7.4-SNAPSHOT</version>
7+
<version>5.0.1-SNAPSHOT</version>
108
</parent>
119
<artifactId>app-alarm-freetts-annunciator</artifactId>
1210

@@ -24,7 +22,7 @@
2422
<dependency>
2523
<groupId>org.phoebus</groupId>
2624
<artifactId>app-alarm-ui</artifactId>
27-
<version>4.7.4-SNAPSHOT</version>
25+
<version>5.0.1-SNAPSHOT</version>
2826
<scope>compile</scope>
2927
</dependency>
3028
</dependencies>

‎app/alarm/logging-ui/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>4.7.4-SNAPSHOT</version>
6+
<version>5.0.1-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-logging-ui</artifactId>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.phoebus</groupId>
1212
<artifactId>core-framework</artifactId>
13-
<version>4.7.4-SNAPSHOT</version>
13+
<version>5.0.1-SNAPSHOT</version>
1414
</dependency>
1515
<dependency>
1616
<groupId>org.phoebus</groupId>
1717
<artifactId>core-ui</artifactId>
18-
<version>4.7.4-SNAPSHOT</version>
18+
<version>5.0.1-SNAPSHOT</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.phoebus</groupId>
2222
<artifactId>core-types</artifactId>
23-
<version>4.7.4-SNAPSHOT</version>
23+
<version>5.0.1-SNAPSHOT</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.phoebus</groupId>
2727
<artifactId>core-util</artifactId>
28-
<version>4.7.4-SNAPSHOT</version>
28+
<version>5.0.1-SNAPSHOT</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.phoebus</groupId>
3232
<artifactId>app-alarm-model</artifactId>
33-
<version>4.7.4-SNAPSHOT</version>
33+
<version>5.0.1-SNAPSHOT</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.phoebus</groupId>
3737
<artifactId>app-alarm-ui</artifactId>
38-
<version>4.7.4-SNAPSHOT</version>
38+
<version>5.0.1-SNAPSHOT</version>
3939
<scope>compile</scope>
4040
</dependency>
4141
<dependency>

‎app/alarm/model/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>4.7.4-SNAPSHOT</version>
6+
<version>5.0.1-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-model</artifactId>
99
<dependencies>
@@ -47,12 +47,12 @@
4747
<dependency>
4848
<groupId>org.phoebus</groupId>
4949
<artifactId>core-framework</artifactId>
50-
<version>4.7.4-SNAPSHOT</version>
50+
<version>5.0.1-SNAPSHOT</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.phoebus</groupId>
5454
<artifactId>core-util</artifactId>
55-
<version>4.7.4-SNAPSHOT</version>
55+
<version>5.0.1-SNAPSHOT</version>
5656
</dependency>
5757
</dependencies>
5858
</project>

‎app/alarm/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>app</artifactId>
8-
<version>4.7.4-SNAPSHOT</version>
8+
<version>5.0.1-SNAPSHOT</version>
99
</parent>
1010
<modules>
1111
<module>model</module>

0 commit comments

Comments
 (0)