Skip to content

Commit 0b2c469

Browse files
georgweissgeorgweiss
committed
Resolve merge conflict
2 parents 15b652a + 14cf185 commit 0b2c469

File tree

305 files changed

+12795
-1067
lines changed

Some content is hidden

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

305 files changed

+12795
-1067
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1+
12
<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">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.phoebus</groupId>
56
<artifactId>app</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
7+
<version>5.0.3-SNAPSHOT</version>
78
</parent>
89
<artifactId>app-3d-viewer</artifactId>
10+
<name>${project.groupId}:${project.artifactId}</name>
911
<dependencies>
1012
<dependency>
1113
<groupId>org.phoebus</groupId>
1214
<artifactId>core-ui</artifactId>
13-
<version>5.0.1-SNAPSHOT</version>
15+
<version>5.0.3-SNAPSHOT</version>
1416
</dependency>
1517
<dependency>
1618
<groupId>org.phoebus</groupId>
1719
<artifactId>core-framework</artifactId>
18-
<version>5.0.1-SNAPSHOT</version>
20+
<version>5.0.3-SNAPSHOT</version>
1921
</dependency>
2022
<dependency>
2123
<groupId>org.junit.jupiter</groupId>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<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">
32
<modelVersion>4.0.0</modelVersion>
43
<parent>
54
<groupId>org.phoebus</groupId>
65
<artifactId>app-alarm</artifactId>
7-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
87
</parent>
98
<artifactId>app-alarm-audio-annunciator</artifactId>
10-
9+
<name>${project.groupId}:${project.artifactId}</name>
1110
<properties>
1211
<maven.compiler.source>17</maven.compiler.source>
1312
<maven.compiler.target>17</maven.compiler.target>
@@ -17,7 +16,7 @@
1716
<dependency>
1817
<groupId>org.phoebus</groupId>
1918
<artifactId>app-alarm-ui</artifactId>
20-
<version>5.0.1-SNAPSHOT</version>
19+
<version>5.0.3-SNAPSHOT</version>
2120
</dependency>
2221
<dependency>
2322
<groupId>org.openjfx</groupId>
@@ -26,4 +25,4 @@
2625
</dependency>
2726
</dependencies>
2827

29-
</project>
28+
</project>

‎app/alarm/datasource/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-datasouce</artifactId>
9+
<name>${project.groupId}:${project.artifactId}</name>
910
<dependencies>
1011
<dependency>
1112
<groupId>org.junit.jupiter</groupId>
@@ -22,32 +23,32 @@
2223
<dependency>
2324
<groupId>org.phoebus</groupId>
2425
<artifactId>core-framework</artifactId>
25-
<version>5.0.1-SNAPSHOT</version>
26+
<version>5.0.3-SNAPSHOT</version>
2627
</dependency>
2728
<dependency>
2829
<groupId>org.phoebus</groupId>
2930
<artifactId>core-types</artifactId>
30-
<version>5.0.1-SNAPSHOT</version>
31+
<version>5.0.3-SNAPSHOT</version>
3132
</dependency>
3233
<dependency>
3334
<groupId>org.phoebus</groupId>
3435
<artifactId>core-pv</artifactId>
35-
<version>5.0.1-SNAPSHOT</version>
36+
<version>5.0.3-SNAPSHOT</version>
3637
</dependency>
3738
<dependency>
3839
<groupId>org.phoebus</groupId>
3940
<artifactId>core-util</artifactId>
40-
<version>5.0.1-SNAPSHOT</version>
41+
<version>5.0.3-SNAPSHOT</version>
4142
</dependency>
4243
<dependency>
4344
<groupId>org.phoebus</groupId>
4445
<artifactId>core-ui</artifactId>
45-
<version>5.0.1-SNAPSHOT</version>
46+
<version>5.0.3-SNAPSHOT</version>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.phoebus</groupId>
4950
<artifactId>app-alarm-model</artifactId>
50-
<version>5.0.1-SNAPSHOT</version>
51+
<version>5.0.3-SNAPSHOT</version>
5152
</dependency>
5253
<dependency>
5354
<groupId>net.sf.sociaal</groupId>

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<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">
32
<modelVersion>4.0.0</modelVersion>
43
<parent>
54
<groupId>org.phoebus</groupId>
65
<artifactId>app-alarm</artifactId>
7-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
87
</parent>
98
<artifactId>app-alarm-freetts-annunciator</artifactId>
10-
11-
<properties>
9+
<name>${project.groupId}:${project.artifactId}</name>
10+
<properties>
1211
<maven.compiler.source>17</maven.compiler.source>
1312
<maven.compiler.target>17</maven.compiler.target>
1413
</properties>
@@ -22,9 +21,9 @@
2221
<dependency>
2322
<groupId>org.phoebus</groupId>
2423
<artifactId>app-alarm-ui</artifactId>
25-
<version>5.0.1-SNAPSHOT</version>
24+
<version>5.0.3-SNAPSHOT</version>
2625
<scope>compile</scope>
2726
</dependency>
2827
</dependencies>
2928

30-
</project>
29+
</project>

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,40 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-logging-ui</artifactId>
9+
<name>${project.groupId}:${project.artifactId}</name>
910
<dependencies>
1011
<dependency>
1112
<groupId>org.phoebus</groupId>
1213
<artifactId>core-framework</artifactId>
13-
<version>5.0.1-SNAPSHOT</version>
14+
<version>5.0.3-SNAPSHOT</version>
1415
</dependency>
1516
<dependency>
1617
<groupId>org.phoebus</groupId>
1718
<artifactId>core-ui</artifactId>
18-
<version>5.0.1-SNAPSHOT</version>
19+
<version>5.0.3-SNAPSHOT</version>
1920
</dependency>
2021
<dependency>
2122
<groupId>org.phoebus</groupId>
2223
<artifactId>core-types</artifactId>
23-
<version>5.0.1-SNAPSHOT</version>
24+
<version>5.0.3-SNAPSHOT</version>
2425
</dependency>
2526
<dependency>
2627
<groupId>org.phoebus</groupId>
2728
<artifactId>core-util</artifactId>
28-
<version>5.0.1-SNAPSHOT</version>
29+
<version>5.0.3-SNAPSHOT</version>
2930
</dependency>
3031
<dependency>
3132
<groupId>org.phoebus</groupId>
3233
<artifactId>app-alarm-model</artifactId>
33-
<version>5.0.1-SNAPSHOT</version>
34+
<version>5.0.3-SNAPSHOT</version>
3435
</dependency>
3536
<dependency>
3637
<groupId>org.phoebus</groupId>
3738
<artifactId>app-alarm-ui</artifactId>
38-
<version>5.0.1-SNAPSHOT</version>
39+
<version>5.0.3-SNAPSHOT</version>
3940
<scope>compile</scope>
4041
</dependency>
4142
<dependency>

‎app/alarm/model/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-model</artifactId>
9-
<dependencies>
9+
<name>${project.groupId}:${project.artifactId}</name>
10+
<dependencies>
1011
<dependency>
1112
<groupId>org.junit.jupiter</groupId>
1213
<artifactId>junit-jupiter</artifactId>
@@ -47,12 +48,12 @@
4748
<dependency>
4849
<groupId>org.phoebus</groupId>
4950
<artifactId>core-framework</artifactId>
50-
<version>5.0.1-SNAPSHOT</version>
51+
<version>5.0.3-SNAPSHOT</version>
5152
</dependency>
5253
<dependency>
5354
<groupId>org.phoebus</groupId>
5455
<artifactId>core-util</artifactId>
55-
<version>5.0.1-SNAPSHOT</version>
56+
<version>5.0.3-SNAPSHOT</version>
5657
</dependency>
5758
</dependencies>
5859
</project>

‎app/alarm/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<modelVersion>4.0.0</modelVersion>
33
<packaging>pom</packaging>
44
<artifactId>app-alarm</artifactId>
5+
<name>${project.groupId}:${project.artifactId}</name>
56
<parent>
67
<groupId>org.phoebus</groupId>
78
<artifactId>app</artifactId>
8-
<version>5.0.1-SNAPSHOT</version>
9+
<version>5.0.3-SNAPSHOT</version>
910
</parent>
1011
<modules>
1112
<module>model</module>

‎app/alarm/ui/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-alarm</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-alarm-ui</artifactId>
9-
<dependencies>
9+
<name>${project.groupId}:${project.artifactId}</name>
10+
<dependencies>
1011
<dependency>
1112
<groupId>org.junit.jupiter</groupId>
1213
<artifactId>junit-jupiter</artifactId>
@@ -22,27 +23,27 @@
2223
<dependency>
2324
<groupId>org.phoebus</groupId>
2425
<artifactId>core-framework</artifactId>
25-
<version>5.0.1-SNAPSHOT</version>
26+
<version>5.0.3-SNAPSHOT</version>
2627
</dependency>
2728
<dependency>
2829
<groupId>org.phoebus</groupId>
2930
<artifactId>core-types</artifactId>
30-
<version>5.0.1-SNAPSHOT</version>
31+
<version>5.0.3-SNAPSHOT</version>
3132
</dependency>
3233
<dependency>
3334
<groupId>org.phoebus</groupId>
3435
<artifactId>core-util</artifactId>
35-
<version>5.0.1-SNAPSHOT</version>
36+
<version>5.0.3-SNAPSHOT</version>
3637
</dependency>
3738
<dependency>
3839
<groupId>org.phoebus</groupId>
3940
<artifactId>core-ui</artifactId>
40-
<version>5.0.1-SNAPSHOT</version>
41+
<version>5.0.3-SNAPSHOT</version>
4142
</dependency>
4243
<dependency>
4344
<groupId>org.phoebus</groupId>
4445
<artifactId>app-alarm-model</artifactId>
45-
<version>5.0.1-SNAPSHOT</version>
46+
<version>5.0.3-SNAPSHOT</version>
4647
</dependency>
4748

4849
</dependencies>

‎app/channel/channelfinder/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app-channel</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-channel-channelfinder</artifactId>
9+
<name>${project.groupId}:${project.artifactId}</name>
910
<dependencies>
1011
<dependency>
1112
<groupId>org.phoebus</groupId>
1213
<artifactId>core-framework</artifactId>
13-
<version>5.0.1-SNAPSHOT</version>
14+
<version>5.0.3-SNAPSHOT</version>
1415
</dependency>
1516
<dependency>
1617
<groupId>org.phoebus</groupId>
1718
<artifactId>core-security</artifactId>
18-
<version>5.0.1-SNAPSHOT</version>
19+
<version>5.0.3-SNAPSHOT</version>
1920
</dependency>
2021
<dependency>
2122
<groupId>org.phoebus</groupId>
2223
<artifactId>core-util</artifactId>
23-
<version>5.0.1-SNAPSHOT</version>
24+
<version>5.0.3-SNAPSHOT</version>
2425
</dependency>
2526
<dependency>
2627
<groupId>com.fasterxml.jackson.core</groupId>

‎app/channel/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<parent>
44
<groupId>org.phoebus</groupId>
55
<artifactId>app</artifactId>
6-
<version>5.0.1-SNAPSHOT</version>
6+
<version>5.0.3-SNAPSHOT</version>
77
</parent>
88
<artifactId>app-channel</artifactId>
9+
<name>${project.groupId}:${project.artifactId}</name>
910
<packaging>pom</packaging>
1011
<description>Support for pvs with properties and tags as used by directory services</description>
1112
<modules>

0 commit comments

Comments
 (0)