Merge remote-tracking branch 'upstream/develop' into develop

Author: constantine2nd

.gitignore

@@ -40,4 +40,5 @@ marketing_diagram_generation/outputs/*
 .specstory
 project/project
 coursier
-metals.sbt
+metals.sbt
+obp-http4s-runner/src/main/resources/git.properties

README.md

@@ -67,6 +67,17 @@ To compile and run Jetty, install Maven 3, create your configuration in `obp-api
 mvn install -pl .,obp-commons && mvn jetty:run -pl obp-api
 ```
 
+### Running http4s server (obp-http4s-runner)
+
+To run the API using the http4s server (without Jetty), use the `obp-http4s-runner` module from the project root:
+
+```sh
+MAVEN_OPTS="-Xms3G -Xmx6G -XX:MaxMetaspaceSize=2G" mvn -pl obp-http4s-runner -am clean package -DskipTests=true -Dmaven.test.skip=true && \
+java -jar obp-http4s-runner/target/obp-http4s-runner.jar
+```
+
+The http4s server binds to `http4s.host` / `http4s.port` as configured in your props file (defaults are `127.0.0.1` and `8181`).
+
 ### ZED IDE Setup
 
 For ZED IDE users, we provide a complete development environment with Scala language server support:

obp-api/pom.xml

@@ -23,52 +23,6 @@
         <webXmlPath>src/main/resources/web.xml</webXmlPath>
       </properties>
     </profile>
-    <profile>
-      <id>http4s-jar</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.6.0</version>
-            <configuration>
-              <appendAssemblyId>false</appendAssemblyId>
-              <finalName>${project.artifactId}-http4s</finalName>
-              <archive>
-                <manifest>
-                  <mainClass>bootstrap.http4s.Http4sServer</mainClass>
-                </manifest>
-              </archive>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
-              <dependencySets>
-                <dependencySet>
-                  <outputDirectory>/</outputDirectory>
-                  <unpack>true</unpack>
-                  <scope>runtime</scope>
-                </dependencySet>
-              </dependencySets>
-              <fileSets>
-                <fileSet>
-                  <directory>${project.build.outputDirectory}</directory>
-                  <outputDirectory>/</outputDirectory>
-                </fileSet>
-              </fileSets>
-            </configuration>
-            <executions>
-              <execution>
-                <id>http4s-fat-jar</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <pluginRepositories>
     <pluginRepository>
@@ -83,7 +37,8 @@
       <groupId>com.tesobe</groupId>
       <artifactId>obp-commons</artifactId>
     </dependency>
-    <!--embed akka adapter start-->
+    <!--embed akka adapter start - COMMENTED OUT FOR PEKKO MIGRATION-->
+    <!-- TODO: Find or create Pekko equivalent for adapter-akka-commons
     <dependency>
       <groupId>com.github.OpenBankProject.OBP-Adapter-Akka-SpringBoot</groupId>
       <artifactId>adapter-akka-commons</artifactId>
@@ -95,6 +50,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+    -->
     <!--embed akka adapter end-->
     <dependency>
       <groupId>com.github.everit-org.json-schema</groupId>
@@ -288,21 +244,21 @@
       <artifactId>signpost-commonshttp4</artifactId>
       <version>1.2.1.2</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.typesafe.akka/akka-http-core -->
+    <!-- https://mvnrepository.com/artifact/org.apache.pekko/pekko-http-core -->
     <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-http-core_${scala.version}</artifactId>
-      <version>10.1.6</version>
+      <groupId>org.apache.pekko</groupId>
+      <artifactId>pekko-http-core_${scala.version}</artifactId>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
-      <version>${akka.version}</version>
+      <groupId>org.apache.pekko</groupId>
+      <artifactId>pekko-actor_${scala.version}</artifactId>
+      <version>${pekko.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-remote_${scala.version}</artifactId>
-      <version>${akka.version}</version>
+      <groupId>org.apache.pekko</groupId>
+      <artifactId>pekko-remote_${scala.version}</artifactId>
+      <version>${pekko.version}</version>
     </dependency>
     <dependency>
       <groupId>com.sksamuel.avro4s</groupId>
@@ -316,8 +272,8 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>chill-akka_${scala.version}</artifactId>
-      <version>0.9.1</version>
+      <artifactId>chill_${scala.version}</artifactId>
+      <version>0.9.3</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
@@ -337,9 +293,9 @@
       <version>0.9.3</version>
     </dependency>
     <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_${scala.version}</artifactId>
-      <version>${akka.version}</version>
+      <groupId>org.apache.pekko</groupId>
+      <artifactId>pekko-slf4j_${scala.version}</artifactId>
+      <version>${pekko.version}</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/com.github.dwickern/scala-nameof_2.11 -->
     <dependency>