Move http postgis to local module

internetofwater · Jan 29, 2025 · bb58b99 · bb58b99
1 parent 974aacb
commit bb58b99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/FROST-Server.HTTP/pom.xml b/FROST-Server.HTTP/pom.xml
@@ -55,10 +55,18 @@
             <artifactId>jakarta.jakartaee-web-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.postgis</groupId>
+            <artifactId>postgis-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
@@ -112,16 +120,6 @@
                             <outputDirectory>${docker.dependencies.dir}</outputDirectory>
                             <silent>true</silent>
                             <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.postgresql</groupId>
-                                    <artifactId>postgresql</artifactId>
-                                    <version>${version.postgres}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>net.postgis</groupId>
-                                    <artifactId>postgis-jdbc</artifactId>
-                                    <version>${version.postgis}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.mariadb.jdbc</groupId>
                                     <artifactId>mariadb-java-client</artifactId>

diff --git a/FROST-Server.SQLjooq/pom.xml b/FROST-Server.SQLjooq/pom.xml
@@ -43,10 +43,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.cloud.sql</groupId>
-            <artifactId>cloud-sql-connector-jdbc-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.cloud.sql</groupId>
             <artifactId>postgres-socket-factory</artifactId>