Merge pull request #2 from ControlSystemStudio/master

Create a new branch that is synced with community.

.github/workflows/build.yml

@@ -10,11 +10,6 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: '11'
     - name: Build
-      run: mvn --batch-mode install
-    - name: Publish
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: mvn --batch-mode -DskipTests deploy
-      if: ${{ github.repository == 'ControlSystemStudio/phoebus' && (github.ref == 'refs/heads/master' || github.ref == 'refs/tags/*') }}
+      run: mvn --batch-mode install

.gitignore

@@ -112,6 +112,8 @@ buildNumber.properties
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
 
+# Exclude complete settings template file if it is created
+phoebus-product/settings_template.ini
 
 # End of https://www.gitignore.io/api/maven,eclipse
 /.gitignore

README.md

@@ -118,7 +118,6 @@ Can now start product/src/main/java/org.phoebus.product/Launcher.java.
 
 To import the project:
 
-* Start IntelliJ. Make sure to install the Lombok plugin.
 * Import Project
 * Select the Phoebus directory
 * Import project from external model: Maven
@@ -130,8 +129,9 @@ To run the Phoebus application:
 
 * Run | Edit Configurations...
 * Select + | Application
-* Search for main class and type Launcher
-* Use classpath of module: select product
+* Module: Your JRE 11
+* Classpath `-cp`: select `product` from drop-down
+* Main class: `org.phoebus.product.Launcher`
 * Set the name to Phoebus
 * Click OK
 * In the top right of the IDE, click the green play button
@@ -229,21 +229,37 @@ The remaining build is the same, for example `ant clean dist` to build the distr
 
 ## Release
 
-There is a release profile which helps prepare and deploy a phoebus release.
+The Phoebus release process can be used to create tagged releases of Phoebus and publish the Pheobus jars to maven central
+using the sonatype repositories.
+
+**Setup**
+
+Create a sonatype account and update the maven settings.xml file with your sonatype credentials
 
 ```
-mvn -P release release:prepare
+  <servers>
+   <server>
+      <id>phoebus-releases</id>
+      <username>shroffk</username>
+      <password>*******</password>
+   </server>
+  </servers>
 ```
 
-- Check that there are no uncommitted changes in the sources
-- Check that there are no SNAPSHOT dependencies
-- Change the version in the POMs from x-SNAPSHOT to a new version (you will be prompted for the versions to use)
-- Transform the SCM information in the POM to include the final destination of the tag
-- Run the project tests against the modified POMs to confirm everything is in working order
-- Commit the modified POMs
-- Tag the code in the SCM with a version name (this will be prompted for)
-- Bump the version in the POMs to a new value y-SNAPSHOT (these values will also be prompted for)
-- Commit the modified POMs
-
-Additionally:
-- Before commiting the changes, there is a script in the target platform `release_classpath.py` which will be executed. This script can be modified to updated the .classpath and other files which need manual intervention during a release.
+**Prepare the release**  
+`mvn release:prepare`  
+In this step will ensure there are no uncommitted changes, ensure the versions number are correct, tag the scm, etc.
+A full list of checks is documented [here](https://maven.apache.org/maven-release/maven-release-plugin/examples/prepare-release.html).
+
+**Perform the release**  
+`mvn -Pdocs release:perform`  
+Checkout the release tag, build, sign and push the build binaries to sonatype. The `docs` profile is needed in order
+to create required javadocs jars.
+
+**Publish**  
+Open the staging repository in [sonatype](https://s01.oss.sonatype.org/#stagingRepositories) and hit the *publish* button
+
+**Note:**
+In order to keep the ant and maven builds in sync, before the prepare:release update the `version` in the 
+dependencies\ant_settings.xml to match the release version number. After the release is completed the `version` should 
+updated to match the next development snapshotData version.

app/3d-viewer/pom.xml

@@ -3,23 +3,23 @@
   <parent>
     <groupId>org.phoebus</groupId>
     <artifactId>app</artifactId>
-    <version>4.6.6-SNAPSHOT</version>
+    <version>4.7.2-SNAPSHOT</version>
   </parent>
   <artifactId>app-3d-viewer</artifactId>
   <dependencies>
     <dependency>
       <groupId>org.phoebus</groupId>
       <artifactId>core-ui</artifactId>
-      <version>4.6.6-SNAPSHOT</version>
+      <version>4.7.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.phoebus</groupId>
       <artifactId>core-framework</artifactId>
-      <version>4.6.6-SNAPSHOT</version>
+      <version>4.7.2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

app/3d-viewer/src/test/java/org/phoebus/app/viewer3d/Viewer3dParserDemo.java

@@ -7,19 +7,18 @@
  *******************************************************************************/
 package org.phoebus.app.viewer3d;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-
-import org.junit.Test;
-import org.phoebus.applications.viewer3d.Viewer3d;
-import org.phoebus.applications.viewer3d.Xform;
-
 import javafx.application.Platform;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Sphere;
+import org.junit.jupiter.api.Test;
+import org.phoebus.applications.viewer3d.Viewer3d;
+import org.phoebus.applications.viewer3d.Xform;
+
+import java.io.ByteArrayInputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /** Demo of 3D parser.
  *