Remove install-jars as pbrawclient is available from Maven

.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
 

app/trends/archive-reader/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.epics</groupId>
             <artifactId>pbrawclient</artifactId>
-            <version>0.2.2</version>
+            <version>0.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>

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`:

dependencies/phoebus-target/.classpath

@@ -56,7 +56,6 @@
     <classpathentry exported="true" kind="lib" path="target/lib/httpclient-4.5.10.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/httpcore-4.4.12.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/httpcore-nio-4.4.12.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/install-jars-5.0.3-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-1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/jackson-annotations-2.12.3.jar"/>
@@ -135,7 +134,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.jgit-6.9.0.202403050737-r.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/parsson-1.0.0.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/pbrawclient-0.2.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/pbrawclient-0.2.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/picocontainer-1.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/poi-5.0.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/postgresql-42.6.2.jar"/>

dependencies/phoebus-target/pom.xml

@@ -12,8 +12,8 @@
   </properties>
 
   <profiles>
-    <!-- Overriding the default release profile to run the pre release script 
-      with makes the required modification to .classpath and other manually maintained 
+    <!-- Overriding the default release profile to run the pre release script
+      with makes the required modification to .classpath and other manually maintained
       files -->
     <profile>
       <id>release</id>
@@ -60,13 +60,8 @@
   </profiles>
 
   <dependencies>
-    <!-- For testing. mockito-all contains hamcrest packages, resulting in 
+    <!-- For testing. mockito-all contains hamcrest packages, resulting in
       conflicts. This combination of junit, mockito, hamcrest seems to work -->
-    <dependency>
-      <groupId>org.phoebus</groupId>
-      <artifactId>install-jars</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -433,7 +428,7 @@
     <dependency>
       <groupId>org.epics</groupId>
       <artifactId>pbrawclient</artifactId>
-      <version>0.2.2</version>
+      <version>0.2.3</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
@@ -506,7 +501,7 @@
     </dependency>
 
     <!--JUL bindings for sfl4j-->
-    <dependency> 
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
       <version>1.7.28</version>
@@ -557,7 +552,7 @@
       <artifactId>epics-jackie-client</artifactId>
       <version>3.1.0</version>
     </dependency>
-    
+
     <!-- bouncycastle library used in PVA to decode and check OCSP confirmation of certificates
          bcpkix depends on bcutil, which depends on bcprov
      -->
@@ -576,7 +571,7 @@
       <artifactId>bcprov-jdk18on</artifactId>
       <version>1.84</version>
     </dependency>
-    
+
     <!-- Lib to read/write MS Office (Excel, ..) files, fetching only POI itself -->
     <dependency>
       <groupId>org.apache.poi</groupId>
@@ -616,7 +611,7 @@
       <artifactId>tika-core</artifactId>
       <version>3.2.0</version>
     </dependency>
-    
+
     <!-- ChartFX library for the Waterfall Plot widget -->
     <dependency>
       <groupId>io.fair-acc</groupId>
@@ -634,6 +629,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.epics</groupId>
+      <artifactId>pbrawclient</artifactId>
+      <version>0.2.3</version>
+    </dependency>
   </dependencies>
 
   <build>

dependencies/pom.xml

@@ -9,13 +9,12 @@
     <version>6.0.0-SNAPSHOT</version>
   </parent>
   <modules>
-    <module>install-jars</module>
     <module>phoebus-target</module>
   </modules>
   <profiles>
     <profile>
       <id>packageTarget</id>
-      <!-- Package the phoebus product with dependencies, run scripts, and 
+      <!-- Package the phoebus product with dependencies, run scripts, and
         sources -->
       <build>
         <plugins>

phoebus-product/pom.xml

@@ -166,7 +166,7 @@
             <groupId>org.phoebus</groupId>
             <artifactId>app-display-waterfallplot</artifactId>
             <version>6.0.0-SNAPSHOT</version>
-        </dependency>	
+        </dependency>
         <dependency>
             <groupId>org.phoebus</groupId>
             <artifactId>app-display-editor</artifactId>
@@ -297,6 +297,11 @@
             <artifactId>core-pv-jackie</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.epics</groupId>
+            <artifactId>pbrawclient</artifactId>
+            <version>0.2.3</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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
 #