Skip to content

Commit ae777dd

Browse files
authored
Merge pull request #3487 from ControlSystemStudio/target_dep
Add qserver dependencies to the phoebus target
2 parents 7176afa + 1814dc8 commit ae777dd

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

app/queue-server/pom.xml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,34 @@
3737
<dependency>
3838
<groupId>org.apache.poi</groupId>
3939
<artifactId>poi</artifactId>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>com.zaxxer</groupId>
43+
<artifactId>SparseBitSet</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.slf4j</groupId>
47+
<artifactId>slf4j-api</artifactId>
48+
</exclusion>
49+
<exclusion>
50+
<groupId>org.slf4j</groupId>
51+
<artifactId>jcl-over-slf4j</artifactId>
52+
</exclusion>
53+
<exclusion>
54+
<groupId>commons-codec</groupId>
55+
<artifactId>commons-codec</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>org.apache.commons</groupId>
59+
<artifactId>commons-collections4</artifactId>
60+
</exclusion>
61+
<exclusion>
62+
<groupId>org.apache.commons</groupId>
63+
<artifactId>commons-math3</artifactId>
64+
</exclusion>
65+
</exclusions>
4066
<version>5.0.0</version>
4167
<scope>compile</scope>
4268
</dependency>
4369
</dependencies>
44-
</project>
70+
</project>

dependencies/phoebus-target/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,13 @@
498498
<version>2.1</version>
499499
</dependency>
500500

501+
<!-- required but Qserver applications -->
502+
<dependency>
503+
<groupId>com.fasterxml.jackson.dataformat</groupId>
504+
<artifactId>jackson-dataformat-yaml</artifactId>
505+
<version>2.19.1</version>
506+
</dependency>
507+
501508
<!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
502509
<dependency>
503510
<groupId>org.apache.activemq</groupId>

0 commit comments

Comments
 (0)