Updating versions

Author: abrighton

.github/workflows/integration.yml

@@ -53,7 +53,7 @@ jobs:
         working-directory: integration
         run: |
           rm -rf $HOME/.cache/coursier/v1/https/raw.githubusercontent.com/tmtsoftware/osw-apps/
-          cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+          cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: Upload RTM
         uses: actions/upload-artifact@v4

.github/workflows/iris.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Generate RTM
         working-directory: iris
-        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: Generate Coverage
         working-directory: iris

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
 
       - name: Integration- Generate RTM 
         working-directory: integration
-        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: Integration - Upload RTM 
         uses: actions/upload-artifact@v4
@@ -76,7 +76,7 @@ jobs:
 
       - name: IRIS - Generate RTM 
         working-directory: iris
-        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: IRIS - Generate Coverage 
         working-directory: iris
@@ -102,7 +102,7 @@ jobs:
 
       - name: WFOS - Generate RTM 
         working-directory: wfos
-        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: WFOS - Generate Coverage 
         working-directory: wfos

.github/workflows/wfos.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Generate RTM
         working-directory: wfos
-        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
+        run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
 
       - name: Generate Coverage
         working-directory: wfos

integration/build.sbt

@@ -1,8 +1,8 @@
 name := "integration"
 
 libraryDependencies += ("com.github.tmtsoftware.esw"                      %% "esw-testkit"     % "f9cbac5")
-libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "iris-irisdeploy" % "5d9e186")
-libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "wfos-wfosdeploy" % "5d9e186")
+libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "iris-irisdeploy" % "4aaa48b")
+libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "wfos-wfosdeploy" % "4aaa48b")
 libraryDependencies += ("com.github.tmtsoftware.rtm"                          %% "rtm"             % "0.4.1")
 scalafmtConfig                                                            := file("../.scalafmt.conf")
 

integration/project/plugins.sbt

@@ -1,7 +1,7 @@
 //addSbtPlugin("org.scalastyle"                   %% "scalastyle-sbt-plugin"     % "1.0.0") // not scala 3 ready
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
 
 resolvers += "jitpack" at "https://jitpack.io"
-libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "2bf7f34"
+libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "0.7.1"

integration/src/test/resources/application.conf

@@ -1,7 +1,7 @@
 
 csw-networks.hostname.automatic = on
 
-agent.coursier.channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
+agent.coursier.channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"
 
 esw {
   heartbeat-interval = 400.millis

iris/project/plugins.sbt

@@ -1,11 +1,11 @@
 //addSbtPlugin("org.scalastyle"                   %% "scalastyle-sbt-plugin"     % "1.0.0") // not scala 3 ready
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
 
 resolvers += "jitpack" at "https://jitpack.io"
-libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "2bf7f34"
+libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "0.7.1"
 
 classpathTypes += "maven-plugin"
 

jenkins/stil-nightly

@@ -70,7 +70,7 @@ pipeline {
                 sh "mkdir -p target/RTM"
                 sh "cat iris/target/RTM/testStoryMapping.txt wfos/target/RTM/testStoryMapping.txt integration/target/RTM/testStoryMapping.txt > target/RTM/testStoryMappingAll.txt"
                 // Generate RTM
-                sh "cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:0.4.1 -- target/RTM/testStoryMappingAll.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt"
+                sh "cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:0.4.1 -- target/RTM/testStoryMappingAll.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt"
                 // Upload RTM
                 publishHTML(target: [
                     alwaysLinkToLastBuild: false,

sample-configs/HostConfig-Allan.conf

@@ -8,7 +8,7 @@ containers: [
     orgName: "com.github.tmtsoftware.esw-observing-simulation"
     deployModule: "iris-irisdeploy"
     appName: "iris.irisdeploy.IrisContainerCmdApp"
-    version: "5d9e186"
+    version: "4aaa48b"
     # mode can be one of Container or Standalone
     mode: "Container"
     # path of individual container configuration file
@@ -22,7 +22,7 @@ containers: [
     orgName: "com.github.tmtsoftware.esw-observing-simulation"
     deployModule: "wfos-wfosdeploy"
     appName: "wfos.wfosdeploy.WfosContainerCmdApp"
-    version: "5d9e186"
+    version: "4aaa48b"
     # mode can be one of Container or Standalone
     mode: "Container"
     # path of individual container configuration file