Merge pull request #3012 from ControlSystemStudio/eclipse__settings

Eclipse: Update dependencies
ControlSystemStudio · May 6, 2024 · 3a9dee2 · 3a9dee2
2 parents 48e22b3 + b2b109c
commit 3a9dee2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/app/alarm/freetts-annunciator/.project b/app/alarm/freetts-annunciator/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app-alarm-freetts-annunciator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/alarm/freetts-annunciator/build.xml b/app/alarm/freetts-annunciator/build.xml
@@ -1,4 +1,4 @@
-<project default="app-alarm-ui">
+<project default="app-alarm-freetts-annunciator">
   <import file="../../../dependencies/ant_settings.xml"/>
 
   <target name="app-alarm-freetts-annunciator">
@@ -7,7 +7,8 @@
       <src path="${src}"/>
       <classpath>
         <path refid="app-classpath"/>
-        <pathelement path="../model/${build}/app-alarm-ui-${version}.jar"/>
+        <pathelement path="../model/${build}/app-alarm-model-${version}.jar"/>
+        <pathelement path="../ui/${build}/app-alarm-ui-${version}.jar"/>
       </classpath>
     </javac>
 

diff --git a/build.xml b/build.xml
@@ -55,6 +55,7 @@
     <ant target="clean" dir="app/scan/ui"/>
     <ant target="clean" dir="app/alarm/model"/>
     <ant target="clean" dir="app/alarm/ui"/>
+    <ant target="clean" dir="app/alarm/freetts-annunciator"/>
     <ant target="clean" dir="app/alarm/logging-ui"/>
     <ant target="clean" dir="app/alarm/datasource"/>
     <ant target="clean" dir="app/update"/>
@@ -138,6 +139,7 @@
     <ant dir="app/scan/ui"/>
     <ant dir="app/alarm/model"/>
     <ant dir="app/alarm/ui"/>
+    <ant dir="app/alarm/freetts-annunciator"/>
     <ant dir="app/alarm/logging-ui"/>
     <ant dir="app/alarm/datasource"/>
     <ant dir="app/update"/>

diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath
@@ -21,9 +21,9 @@
     <classpathentry exported="true" kind="lib" path="target/lib/commonmark-0.15.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-gfm-tables-0.15.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-image-attributes-0.15.2.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.14.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.16.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.26.1.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/commons-io-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/commons-io-2.15.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-lang3-3.14.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-logging-1.1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-math3-3.6.1.jar"/>
@@ -42,8 +42,8 @@
     <classpathentry exported="true" kind="lib" path="target/lib/epics-pvaccess-5.1.9.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/epics-pvdata-6.1.9.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/epics-util-1.0.7.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/error_prone_annotations-2.18.0.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/error_prone_annotations-2.26.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/freetts-1.2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/geronimo-spec-ejb-2.1-rc2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/guava-33.2.0-jre.jar"/>
@@ -56,7 +56,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/httpcore-nio-4.4.12.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/install-jars-4.7.4-SNAPSHOT.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/istack-commons-runtime-3.0.5.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/j2objc-annotations-2.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/j2objc-annotations-3.0.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-annotations-2.12.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-core-2.12.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-databind-2.12.3.jar"/>