diff --git a/.gitignore b/.gitignore
index 3d835da330..e93472377b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,10 +23,6 @@ nohup.out
# Generated help files, html/generated
generated/
-# Cannot distribute Oracle jar.
-# Sites that use it need to place here:
-dependencies/install-jars/lib/ojdbc/ojdbc8-12.2.0.1.jar
-
# Created by https://www.gitignore.io/api/maven,eclipse
### Eclipse ###
@@ -121,7 +117,7 @@ phoebus-product/settings_template.ini
# hs_err* files
**/hs_err*
-# doc files generated by docs/source/conf.py
+# doc files generated by docs/source/conf.py
docs/source/applications.rst
docs/source/services.rst
diff --git a/app/trends/archive-reader/pom.xml b/app/trends/archive-reader/pom.xml
index bde87c21df..b920031802 100644
--- a/app/trends/archive-reader/pom.xml
+++ b/app/trends/archive-reader/pom.xml
@@ -37,7 +37,7 @@
org.epics
pbrawclient
- 0.2.2
+ 0.2.3
org.phoebus
diff --git a/dependencies/README.md b/dependencies/README.md
index 34fac39df1..331093b3f6 100644
--- a/dependencies/README.md
+++ b/dependencies/README.md
@@ -32,7 +32,7 @@ including for example a JSON and a MySQL client library.
external dependencies are available.
* The target platform is in a format that allows using
different build tools
-
+
Our current way of defining and creating the target platform
is Maven-centric, but with slight adjustments and
conventions over a Maven-only approach to meet all goals.
@@ -76,7 +76,6 @@ especially when combined with limited network access:
To overcome these issues, we list all external dependencies
that can be obtailed from Maven-Central in the file `dependencies/phoebus-target/pom.xml`.
-The `dependencies/install-jars` subtree allows adding dependencies that cannot be downloaded.
One initial maven build of the dependencies collects the target platform into
`dependencies/phoebus-target/target/lib`:
diff --git a/dependencies/install-jars/.classpath b/dependencies/install-jars/.classpath
deleted file mode 100644
index 4a878a4bdd..0000000000
--- a/dependencies/install-jars/.classpath
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/dependencies/install-jars/.project b/dependencies/install-jars/.project
deleted file mode 100644
index ad1d1600a2..0000000000
--- a/dependencies/install-jars/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- install-jars
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/dependencies/install-jars/lib/pbraw/pbrawclient-0.2.2.jar b/dependencies/install-jars/lib/pbraw/pbrawclient-0.2.2.jar
deleted file mode 100644
index a36346bfa9..0000000000
Binary files a/dependencies/install-jars/lib/pbraw/pbrawclient-0.2.2.jar and /dev/null differ
diff --git a/dependencies/install-jars/lib/pbraw/pom.xml b/dependencies/install-jars/lib/pbraw/pom.xml
deleted file mode 100644
index 699424194a..0000000000
--- a/dependencies/install-jars/lib/pbraw/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- 4.0.0
- org.epics
- pbrawclient
- ${project.groupId}:${project.artifactId}
- 0.2.2
-
-
- com.google.protobuf
- protobuf-java
- 4.33.0
-
-
-
diff --git a/dependencies/install-jars/pom.xml b/dependencies/install-jars/pom.xml
deleted file mode 100644
index 747c20a23e..0000000000
--- a/dependencies/install-jars/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
- 4.0.0
-
- org.phoebus
- dependencies
- 6.0.0-SNAPSHOT
-
- install-jars
- ${project.groupId}:${project.artifactId}
-
-
-
-
-
- org.apache.maven.plugins
- maven-install-plugin
- 2.5.2
-
-
- install-pbraw
-
- org.epics
- pbrawclient
- 0.2.2
- jar
- ${basedir}/lib/pbraw/pbrawclient-0.2.2.jar
-
-
- install-file
-
- validate
-
-
-
-
-
-
diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath
index 0472160ad9..f4a495a205 100644
--- a/dependencies/phoebus-target/.classpath
+++ b/dependencies/phoebus-target/.classpath
@@ -56,7 +56,6 @@
-
@@ -135,7 +134,7 @@
-
+
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 659d0ee354..fe2b7ba830 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -12,8 +12,8 @@
-
release
@@ -60,13 +60,8 @@
-
-
- org.phoebus
- install-jars
- 6.0.0-SNAPSHOT
-
org.junit.jupiter
junit-jupiter
@@ -433,7 +428,7 @@
org.epics
pbrawclient
- 0.2.2
+ 0.2.3
org.eclipse.jgit
@@ -506,7 +501,7 @@
-
+
org.slf4j
slf4j-jdk14
1.7.28
@@ -557,7 +552,7 @@
epics-jackie-client
3.1.0
-
+
@@ -576,7 +571,7 @@
bcprov-jdk18on
1.84
-
+
org.apache.poi
@@ -616,7 +611,7 @@
tika-core
3.2.0
-
+
io.fair-acc
@@ -634,6 +629,11 @@
+
+ org.epics
+ pbrawclient
+ 0.2.3
+
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index eb0b9ce4c3..e7b5a10746 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -9,13 +9,12 @@
6.0.0-SNAPSHOT
- install-jars
phoebus-target
packageTarget
-
diff --git a/phoebus-product/pom.xml b/phoebus-product/pom.xml
index 9b826bb70c..b3bff3b263 100644
--- a/phoebus-product/pom.xml
+++ b/phoebus-product/pom.xml
@@ -166,7 +166,7 @@
org.phoebus
app-display-waterfallplot
6.0.0-SNAPSHOT
-
+
org.phoebus
app-display-editor
@@ -297,6 +297,11 @@
core-pv-jackie
6.0.0-SNAPSHOT
+
+ org.epics
+ pbrawclient
+ 0.2.3
+
diff --git a/run_maven.sh b/run_maven.sh
index eff72dfe1e..662cfb0b17 100755
--- a/run_maven.sh
+++ b/run_maven.sh
@@ -1,7 +1,4 @@
#!/bin/bash
-# To include Oracle:
-# mkdir -p dependencies/install-jars/lib/ojdbc
-# cp /path/to/ojdbc8-12.2.0.1.jar dependencies/install-jars/lib/ojdbc
mvn clean verify -f dependencies/pom.xml
# All but first run can use -o for offline
#