Merge pull request #715 from naphelps/dependency-update

Updated dependencies.
open-horizon · Apr 19, 2024 · fd721ff · fd721ff
2 parents cbf5cdf + 3499a17
commit fd721ff
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.123.0] - 2024-04-19
+- pekko-http-xml 1.0.0 -> 1.0.1
+- Reorganized class references in the Swagger documentation generator.
+
 ## [2.122.0] - 2024-01-23
 - Issue 646: Transitioned The Exchange to Apache Pekko from Lightbind's Akka.
 - akka-http                  10.2.7 -> pekko-http 1.0.0

diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ lazy val root = (project in file("."))
     description                   := "'Containerized exchange-api'",
     name                          := "amd64_exchange-api",
     organization                  := "org.openhorizon",
-    pekkoHttpVersion              := "[1.0.0]",
+    pekkoHttpVersion              := "[1.0.1]",
     pekkoVersion                  := "[1.0.2]",
     release                       := sys.env.getOrElse("GIT_SHORT_SHA", versionFunc()),
     resolvers                     += Classpaths.typesafeReleases,
@@ -49,13 +49,13 @@ lazy val root = (project in file("."))
       "org.apache.pekko" %% "pekko-http-xml"        % pekkoHttpVersion.value,
       // "org.apache.pekko" %% "pekko-stream"          % "[2.6.14,)",
       // "org.apache.pekko" %% "pekko-http-spray-json" % "[10.2.1,)",
-      "com.github.pjfanning" %% "pekko-http-jackson" % "[2.0.0,)",
-      "org.apache.pekko" %% "pekko-http-cors" % "[1.0.0,)",
+      "com.github.pjfanning" %% "pekko-http-jackson" % "[2.3.3,)",
+      "org.apache.pekko" %% "pekko-http-cors" % "[1.0.0]",
 
       "org.json4s" %% "json4s-native" % "4.0.6",
       "org.json4s" %% "json4s-jackson" % "4.0.6",
 
-      "jakarta.ws.rs" % "jakarta.ws.rs-api" % "[3.1.0,)",
+      "jakarta.ws.rs" % "jakarta.ws.rs-api" % "[3.1.0]",
       // "org.glassfish.jersey.core" % "jersey-common" % "1.2.1",             // Required at runtime by javax.ws.rs-api
       "com.github.swagger-akka-http" %% "swagger-pekko-http" % "[2.12.0]",      // Deprecated in v2.8.0 due to Akka license change to BSL v1.1
       "com.github.swagger-akka-http" %% "swagger-scala-module" % "[2.12.0,)",
@@ -72,7 +72,7 @@ lazy val root = (project in file("."))
       // "ch.qos.logback" % "logback-classic" % "1.3.0-alpha5",
       "com.mchange" % "c3p0" % "[0.9.5.5,)",
       "org.scalaj" %% "scalaj-http" % "[2.4.2]",                  // Deprecated as of April 2022, in v2.4.2
-      "com.typesafe" % "config" % "[1.4.0,)",
+      "com.typesafe" % "config" % "[1.4.3,)",
       "org.mindrot" % "jbcrypt" % "[0.4,)",                       // Last version (v0.4) release February 13, 2017
       "com.pauldijou" %% "jwt-core" % "[5.0.0,)",
       "com.github.cb372" %% "scalacache-guava" % "[0.28.0,)",

diff --git a/docs/openapi-3-developer.json b/docs/openapi-3-developer.json
@@ -8,7 +8,7 @@
       "name" : "Apache License Version 2.0",
       "url" : "https://www.apache.org/licenses/LICENSE-2.0"
     },
-    "version" : "2.122.0"
+    "version" : "2.123.0"
   },
   "externalDocs" : {
     "description" : "Open-horizon ExchangeAPI",

diff --git a/docs/openapi-3-user.json b/docs/openapi-3-user.json
@@ -8,7 +8,7 @@
       "name" : "Apache License Version 2.0",
       "url" : "https://www.apache.org/licenses/LICENSE-2.0"
     },
-    "version" : "2.122.0"
+    "version" : "2.123.0"
   },
   "externalDocs" : {
     "description" : "Open-horizon ExchangeAPI",

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-2.122.0
+2.123.0
diff --git a/src/main/scala/org/openhorizon/exchangeapi/SwaggerDocService.scala b/src/main/scala/org/openhorizon/exchangeapi/SwaggerDocService.scala
@@ -37,84 +37,85 @@ object SwaggerDocService extends SwaggerHttpService {
   //override implicit val actorSystem: ActorSystem = system
   //override implicit val materializer: ActorMaterializer = ActorMaterializer()
   override def apiClasses: Set[Class[_]] =
-    Set(classOf[AgentConfigurationManagement],
-        classOf[Cleanup],
-        classOf[AgbotsRoutes],
+    Set(classOf[org.openhorizon.exchangeapi.route.administration.ClearAuthCache],
+        classOf[org.openhorizon.exchangeapi.route.administration.Configuration],
+        classOf[org.openhorizon.exchangeapi.route.administration.DropDatabase],
+        classOf[org.openhorizon.exchangeapi.route.administration.dropdatabase.Token],
+        classOf[org.openhorizon.exchangeapi.route.administration.HashPassword],
+        classOf[org.openhorizon.exchangeapi.route.administration.InitializeDatabase],
+        classOf[org.openhorizon.exchangeapi.route.administration.OrganizationStatus],
+        classOf[org.openhorizon.exchangeapi.route.administration.Reload],
+        classOf[org.openhorizon.exchangeapi.route.administration.Status],
+        classOf[org.openhorizon.exchangeapi.route.administration.Version],
+        classOf[org.openhorizon.exchangeapi.route.agent.AgentConfigurationManagement],
+        classOf[org.openhorizon.exchangeapi.route.agreement.Confirm],
+        classOf[org.openhorizon.exchangeapi.route.agreementbot.AgbotsRoutes],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.Agreement],
-        classOf[org.openhorizon.exchangeapi.route.node.agreement.Agreement],
-        classOf[AgreementBot],
-        classOf[AgreementBots],
+        classOf[org.openhorizon.exchangeapi.route.agreementbot.AgreementBot],
+        classOf[org.openhorizon.exchangeapi.route.agreementbot.AgreementBots],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.Agreements],
-        classOf[org.openhorizon.exchangeapi.route.node.agreement.Agreements],
-        classOf[OrganizationDeploymentPatterns],
-        classOf[ChangePassword],
-        classOf[Changes],
-        classOf[ClearAuthCache],
-        classOf[org.openhorizon.exchangeapi.route.agreement.Confirm],
-        classOf[org.openhorizon.exchangeapi.route.user.Confirm],
-        classOf[Configuration],
-        classOf[ConfigurationState],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.DeploymentPattern],
-        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.DeploymentPattern],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.DeploymentPatterns],
-        classOf[org.openhorizon.exchangeapi.route.catalog.DeploymentPatterns],
-        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.DeploymentPatterns],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.DeploymentPolicies],
-        classOf[org.openhorizon.exchangeapi.route.deploymentpolicy.DeploymentPolicies],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.DeploymentPolicy],
-        classOf[org.openhorizon.exchangeapi.route.deploymentpolicy.DeploymentPolicy],
-        classOf[DeploymentPolicySearch],
-        classOf[Details],
-        classOf[DockerAuth],
-        classOf[DockerAuths],
-        classOf[DropDatabase],
-        classOf[Errors],
-        classOf[HashPassword],
         classOf[org.openhorizon.exchangeapi.route.agreementbot.Heartbeat],
-        classOf[org.openhorizon.exchangeapi.route.node.Heartbeat],
-        classOf[InitializeDatabase],
+        classOf[org.openhorizon.exchangeapi.route.agreementbot.Message],
+        classOf[org.openhorizon.exchangeapi.route.agreementbot.Messages],
+        classOf[org.openhorizon.exchangeapi.route.catalog.DeploymentPatterns],
+        classOf[org.openhorizon.exchangeapi.route.catalog.OrganizationDeploymentPatterns],
+        classOf[org.openhorizon.exchangeapi.route.catalog.OrganizationServices],
+        classOf[org.openhorizon.exchangeapi.route.catalog.Services],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.DeploymentPattern],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.DeploymentPatterns],
         classOf[org.openhorizon.exchangeapi.route.deploymentpattern.key.Key],
-        classOf[org.openhorizon.exchangeapi.route.service.key.Key],
         classOf[org.openhorizon.exchangeapi.route.deploymentpattern.key.Keys],
-        classOf[org.openhorizon.exchangeapi.route.service.key.Keys],
-        classOf[MaxChangeId],
-        classOf[org.openhorizon.exchangeapi.route.agreementbot.Message],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.NodeHealth],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.Search],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpolicy.DeploymentPolicies],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpolicy.DeploymentPolicy],
+        classOf[org.openhorizon.exchangeapi.route.deploymentpolicy.DeploymentPolicySearch],
+        classOf[org.openhorizon.exchangeapi.route.managementpolicy.ManagementPolicies],
+        classOf[org.openhorizon.exchangeapi.route.managementpolicy.ManagementPolicy],
+        classOf[org.openhorizon.exchangeapi.route.node.agreement.Agreement],
+        classOf[org.openhorizon.exchangeapi.route.node.agreement.Agreements],
+        classOf[org.openhorizon.exchangeapi.route.node.ConfigurationState],
+        classOf[org.openhorizon.exchangeapi.route.node.Details],
+        classOf[org.openhorizon.exchangeapi.route.node.Errors],
+        classOf[org.openhorizon.exchangeapi.route.node.Heartbeat],
+        classOf[org.openhorizon.exchangeapi.route.node.managementpolicy.Status],
+        classOf[org.openhorizon.exchangeapi.route.node.managementpolicy.Statuses],
         classOf[org.openhorizon.exchangeapi.route.node.message.Message],
-        classOf[org.openhorizon.exchangeapi.route.agreementbot.Messages],
         classOf[org.openhorizon.exchangeapi.route.node.message.Messages],
-        classOf[ManagementPolicies],
-        classOf[ManagementPolicy],
-        classOf[MyOrganizations],
-        classOf[Node],
+        classOf[org.openhorizon.exchangeapi.route.node.Node],
+        classOf[org.openhorizon.exchangeapi.route.node.Nodes],
+        classOf[org.openhorizon.exchangeapi.route.node.Policy],
+        classOf[org.openhorizon.exchangeapi.route.node.Status],
         classOf[org.openhorizon.exchangeapi.route.nodegroup.node.Node],
-        classOf[NodeError],
-        classOf[NodeErrors],
-        classOf[org.openhorizon.exchangeapi.route.deploymentpattern.NodeHealth],
+        classOf[org.openhorizon.exchangeapi.route.nodegroup.NodeGroup],
+        classOf[org.openhorizon.exchangeapi.route.nodegroup.NodeGroups],
+        classOf[org.openhorizon.exchangeapi.route.organization.Cleanup],
+        classOf[org.openhorizon.exchangeapi.route.organization.Changes],
+        classOf[org.openhorizon.exchangeapi.route.organization.Cleanup],
+        classOf[org.openhorizon.exchangeapi.route.organization.MaxChangeId],
+        classOf[org.openhorizon.exchangeapi.route.organization.MyOrganizations],
+        classOf[org.openhorizon.exchangeapi.route.organization.Organization],
+        classOf[org.openhorizon.exchangeapi.route.organization.Organizations],
+        classOf[org.openhorizon.exchangeapi.route.organization.Status],
+        classOf[org.openhorizon.exchangeapi.route.search.NodeError],
+        classOf[org.openhorizon.exchangeapi.route.search.NodeErrors],
         classOf[org.openhorizon.exchangeapi.route.search.NodeHealth],
-        classOf[Nodes],
-        classOf[NodeService],
-        classOf[NodeGroup],
-        classOf[NodeGroups],
-        classOf[Organization],
-        classOf[OrganizationDeploymentPatterns],
-        classOf[Organizations],
-        classOf[OrganizationServices],
-        classOf[OrganizationStatus],
-        classOf[org.openhorizon.exchangeapi.route.node.Policy],
+        classOf[org.openhorizon.exchangeapi.route.search.NodeService],
+        classOf[org.openhorizon.exchangeapi.route.service.dockerauth.DockerAuth],
+        classOf[org.openhorizon.exchangeapi.route.service.dockerauth.DockerAuths],
+        classOf[org.openhorizon.exchangeapi.route.service.key.Key],
+        classOf[org.openhorizon.exchangeapi.route.service.key.Keys],
         classOf[org.openhorizon.exchangeapi.route.service.Policy],
-        classOf[Reload],
-        classOf[Search],
-        classOf[Service],
-        classOf[org.openhorizon.exchangeapi.route.catalog.Services],
+        classOf[org.openhorizon.exchangeapi.route.service.Service],
         classOf[org.openhorizon.exchangeapi.route.service.Services],
-        classOf[org.openhorizon.exchangeapi.route.administration.Status],
-        classOf[org.openhorizon.exchangeapi.route.node.Status],
-        classOf[org.openhorizon.exchangeapi.route.organization.Status],
-        classOf[Statuses],
-        classOf[Token],
-        classOf[User],
-        classOf[Users],
-        classOf[Version])
+        classOf[org.openhorizon.exchangeapi.route.user.ChangePassword],
+        classOf[org.openhorizon.exchangeapi.route.user.Confirm],
+        classOf[org.openhorizon.exchangeapi.route.user.User],
+        classOf[org.openhorizon.exchangeapi.route.user.Users])
   override def apiDocsPath: String = "api-docs" //where you want the swagger-json endpoint exposed
   // override def basePath: String = ""
   override def host: String = (if(ExchangeApi.serviceHost.equals("0.0.0.0")) "localhost" else ExchangeApi.serviceHost) + ":" + ExchangeApi.servicePortEncrypted.getOrElse(ExchangeApi.servicePortUnencrypted) //the url of your api, not swagger's json endpoint