Updated dependencies, keycloak versions

tmtsoftware · Oct 24, 2023 · 4c53f71 · 4c53f71
1 parent 0c1837b
commit 4c53f71
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/branchLinkCheck.yml b/.github/workflows/branchLinkCheck.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: branch-0.3.x
-      - uses: coursier/setup-action@v1.2.0-M2
+      - uses: coursier/setup-action@v1
         with:
           jvm: temurin:1.17
       - uses: coursier/cache-action@v6

diff --git a/.github/workflows/masterLinkCheck.yml b/.github/workflows/masterLinkCheck.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: coursier/setup-action@v1.2.0-M2
+      - uses: actions/checkout@v3
+      - uses: coursier/setup-action@v1
         with:
           jvm: temurin:1.17
       - uses: coursier/cache-action@v6

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,19 +9,19 @@ jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      CSW_VERSION: "5.0.1"
-      ESW_OCS_ENG_UI_VERSION: "0.3.1"
+      CSW_VERSION: "5726045"
+      ESW_OCS_ENG_UI_VERSION: "0.3.1.TODO"
     steps:
-      - uses: actions/checkout@v2
-      - uses: coursier/setup-action@v1.2.0-M2
+      - uses: actions/checkout@v3
+      - uses: coursier/setup-action@v1
         with:
           jvm: temurin:1.17
           apps: sbt sbtn
       - uses: coursier/cache-action@v6
 
       - uses: actions/setup-node@v1
         with:
-          node-version: "16.x"
+          node-version: "20.6.1"
           registry-url: "https://registry.npmjs.org"
 
       - name: Install Redis

diff --git a/esw-agent-pekko/esw-agent-pekko-app/src/main/resources/application.conf b/esw-agent-pekko/esw-agent-pekko-app/src/main/resources/application.conf
@@ -3,7 +3,8 @@ include required("logging.conf")
 agent {
   osw.version.confPath = "/tmt/osw/version.conf"
 
-  coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.prod.json"
+//  coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.prod.json"
+  coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.prod.json"
 }
 
 csw-logging {

diff --git a/esw-agent-pekko/esw-agent-pekko-app/src/test/scala/esw/agent/pekko/app/Cs.scala b/esw-agent-pekko/esw-agent-pekko-app/src/test/scala/esw/agent/pekko/app/Cs.scala
@@ -1,5 +1,6 @@
 package esw.agent.pekko.app
 
 object Cs {
-  val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+//  val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+  val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
 }
diff --git a/esw-integration-test/src/test/scala/esw/shell/MainTest.scala b/esw-integration-test/src/test/scala/esw/shell/MainTest.scala
@@ -8,7 +8,8 @@ class MainTest extends BaseTestSuite {
 
   // XXX Ignoring for now, since apps.json has not been updated to use this branch
   "verify esw-shell compiles and starts successfully" ignore {
-    val channel        = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+//    val channel        = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+    val channel        = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
     val version        = "0.1.0-SNAPSHOT"
     val commands       = List("cs", "launch", "--channel", channel, s"esw-shell:$version")
     val processBuilder = new ProcessBuilder(commands: _*)

diff --git a/esw-services/src/main/resources/application.conf b/esw-services/src/main/resources/application.conf
@@ -6,4 +6,5 @@ esw.sm.obsModeConfigPath = "/smObsModeConfig.conf"
 
 csw-networks.hostname.automatic = on
 
-agent.coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+//agent.coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+agent.coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -14,9 +14,9 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
 
 resolvers += "jitpack" at "https://jitpack.io"
 
-libraryDependencies += "com.github.tmtsoftware" % "kotlin-plugin" % "793d9f9"
+libraryDependencies += "com.github.tmtsoftware" % "kotlin-plugin" % "7d3eb82"
 
-libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "ac4d094"
+libraryDependencies += "com.github.tmtsoftware" % "sbt-docs" % "58a91e5"
 
 resolvers += Resolver.jcenterRepo
 addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.1")

diff --git a/scripts/ocs_app.sh b/scripts/ocs_app.sh
@@ -6,7 +6,8 @@ SCRIPT_PATH="$(
 )"
 SCRIPTS_VERSION=""
 COURSIER="$(command -v cs)" || COURSIER="$SCRIPT_PATH/coursier"
-APPS_PATH="https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+#APPS_PATH="https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+APPS_PATH="https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
 APP_NAME="esw-ocs-app"
 
 # capture version number and store rest of the arguments to arr variable which then passed to cs launch

diff --git a/scripts/script-launcher/launchSequencer.sh b/scripts/script-launcher/launchSequencer.sh
@@ -69,7 +69,8 @@ if [[ ${OBS_MODE} == "" ]]; then
 fi
 # check if channel is available in env (used in test)
 if [[ ${CS_CHANNEL} == "" ]]; then
-  CS_CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+#  CS_CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
+  CS_CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
 fi
 
 # ---------------- Compiling ------------------