Merge branch 'master' into rel_7_1_tracking

This commit is contained in:
dotasek.dev
2024-04-29 09:23:49 -04:00
11 changed files with 132 additions and 31 deletions

30
pom.xml
View File

@@ -596,9 +596,20 @@
</dependency>
</dependencies>
</profile>
<!-- examples of how to start the server using the default profile-->
<!-- mvn clean package jetty:run -->
<!-- java -jar jetty-runner.jar target/hapi-fhir-jpaserver.war -->
<!-- -->
<!-- Examples of how to run the server: -->
<!-- -->
<!-- For Spring Boot use: -->
<!-- mvn spring-boot:run -->
<!-- -->
<!-- For JETTY use: -->
<!-- mvn -Pjetty spring-boot:run -->
<!-- -->
<!-- For the Tomcat WAR approach use: -->
<!-- mvn clean package -DskipTests && java -jar ./target/ROOT.war -->
<!-- -->
<!-- NEXT: Browse to http://localhost:8080/fhir -->
<!-- -->
<profile>
<id>jetty</id>
<dependencies>
@@ -676,5 +687,18 @@
</plugins>
</build>
</profile>
<!-- For connecting to GCP CloudSQL Postgres instances:
https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/blob/main/docs/jdbc.md#postgres-1
Needs 'boot' profile as well. -->
<profile>
<id>cloudsql-postgres</id>
<dependencies>
<dependency>
<groupId>com.google.cloud.sql</groupId>
<artifactId>postgres-socket-factory</artifactId>
<version>1.17.0</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>