From 36c624539cfc70dcaa622357a1b4f9a99d358a00 Mon Sep 17 00:00:00 2001 From: nandeeshsb9 Date: Tue, 3 Jun 2025 11:54:26 +1000 Subject: [PATCH 1/5] Updated the pom file to give permission to maven --- pom.xml | 352 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 198 insertions(+), 154 deletions(-) diff --git a/pom.xml b/pom.xml index 1719cb72..b279c7e6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,160 +1,179 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.4.5 - - - au.org.aodn.ogcapi - ogcapi-java - 0.0.0 - ogcapi-java - pom + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.2 + + - REST API that implements OGC API - - 17 - 3.0.0 - 1.5.5.Final - 1.18.30 - 0.2.0 - 3.0.61 - 29.2 - true - true - 2.29.52 - - - - mvnrepository.com - https://repo1.maven.org/maven2/ - - - repo.osgeo.org - https://repo.osgeo.org/repository/release/ - - - - common - coverages - features - maps - processes - tile - records - server + au.org.aodn.ogcapi + ogcapi-java + 0.0.0 + ogcapi-java + pom + + REST API that implements OGC API + + + 17 + 1.7.0 + 3.0.0 + 1.5.5.Final + 1.18.30 + 0.2.0 + 3.0.50 + 29.2 + true + true + 2.29.52 + + + + + mvnrepository.com + https://repo1.maven.org/maven2/ + + + repo.osgeo.org + https://repo.osgeo.org/repository/release/ + + + codeartifact + https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/ + + + + + + aws-codeartifact-plugin + https://aws.oss.sonatype.org/content/repositories/snapshots + + + + + common + coverages + features + maps + processes + tile + records + server - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.8.8 - - - com.github.joschi.jackson - jackson-datatype-threetenbp - 2.6.4 - - - - co.elastic.clients - elasticsearch-java - 8.13.3 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - org.projectlombok - lombok-mapstruct-binding - ${org.projectlombok.binding} - - - - org.geotools - gt-cql - ${org.geotools.version} - - - org.geotools - gt-geojson - ${org.geotools.version} - - - org.geotools - gt-referencing - ${org.geotools.version} - - - - org.geotools - gt-epsg-hsql - 22.2 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - org.testcontainers - elasticsearch - 1.20.1 - pom - import - - - org.mock-server - mockserver-netty - 5.15.0 - - - org.mock-server - mockserver-client-java - 5.15.0 - - - org.locationtech.spatial4j - spatial4j - 0.8 - - - software.amazon.awssdk - batch - ${aws.sdk.version} - - - software.amazon.awssdk - auth - ${aws.sdk.version} - - - software.amazon.awssdk - ses - ${aws.sdk.version} - - - - + + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + com.github.joschi.jackson + jackson-datatype-threetenbp + 2.6.4 + + + co.elastic.clients + elasticsearch-java + 8.13.3 + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + org.projectlombok + lombok-mapstruct-binding + ${org.projectlombok.binding} + + + org.geotools + gt-cql + ${org.geotools.version} + + + org.geotools + gt-geojson + ${org.geotools.version} + + + org.geotools + gt-referencing + ${org.geotools.version} + + + org.geotools + gt-epsg-hsql + 22.2 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + org.testcontainers + elasticsearch + 1.20.1 + pom + import + + + org.mock-server + mockserver-netty + 5.15.0 + + + org.mock-server + mockserver-client-java + 5.15.0 + + + org.locationtech.spatial4j + spatial4j + 0.8 + + + software.amazon.awssdk + batch + ${aws.sdk.version} + + + software.amazon.awssdk + auth + ${aws.sdk.version} + + + software.amazon.awssdk + ses + ${aws.sdk.version} + + + au.org.aodn + es-indexer + 0.0.37 + + + + + codeartifact codeartifact @@ -166,4 +185,29 @@ ${env.CODEARTIFACT_REPO_URL} + + + + + software.amazon.codeartifact + codeartifact-login-maven-plugin + 1.1.0-SNAPSHOT + + + + login + + initialize + + + + central-aodn-org-au + 851725428481 + ap-southeast-2 + maven-aodn-store + 900 + + + + From bafbd984714544ccf9de2da791301db5aedafce2 Mon Sep 17 00:00:00 2001 From: nandeeshsb9 Date: Tue, 3 Jun 2025 12:01:40 +1000 Subject: [PATCH 2/5] Fixed the Spaceing issue --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b279c7e6..68b11ec4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,6 @@ - 4.0.0 org.springframework.boot From eaa36b2708e7d5c27efe7ee263ac9705d984a3b7 Mon Sep 17 00:00:00 2001 From: nandeeshsb9 Date: Tue, 3 Jun 2025 12:04:57 +1000 Subject: [PATCH 3/5] Line issue --- pom.xml | 370 ++++++++++++++++++++++++++------------------------------ 1 file changed, 169 insertions(+), 201 deletions(-) diff --git a/pom.xml b/pom.xml index 68b11ec4..c020f61f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,212 +1,180 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.4.2 - - + 4.0.0 - au.org.aodn.ogcapi - ogcapi-java - 0.0.0 - ogcapi-java - pom + + org.springframework.boot + spring-boot-starter-parent + 3.4.2 + + - REST API that implements OGC API + au.org.aodn.ogcapi + ogcapi-java + 0.0.0 + ogcapi-java + pom + REST API that implements OGC API - - 17 - 1.7.0 - 3.0.0 - 1.5.5.Final - 1.18.30 - 0.2.0 - 3.0.50 - 29.2 - true - true - 2.29.52 - + + 17 + 1.7.0 + 3.0.0 + 1.5.5.Final + 1.18.30 + 0.2.0 + 3.0.50 + 29.2 + true + true + 2.29.52 + - - - mvnrepository.com - https://repo1.maven.org/maven2/ - - - repo.osgeo.org - https://repo.osgeo.org/repository/release/ - - - codeartifact - https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/ - - + + + mvnrepository.com + https://repo1.maven.org/maven2/ + + + repo.osgeo.org + https://repo.osgeo.org/repository/release/ + + + codeartifact + https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/ + + - - - aws-codeartifact-plugin - https://aws.oss.sonatype.org/content/repositories/snapshots - - + + common + coverages + features + maps + processes + tile + records + server + - - common - coverages - features - maps - processes - tile - records - server - + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + com.github.joschi.jackson + jackson-datatype-threetenbp + 2.6.4 + + + co.elastic.clients + elasticsearch-java + 8.13.3 + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + org.projectlombok + lombok-mapstruct-binding + ${org.projectlombok.binding} + + + org.geotools + gt-cql + ${org.geotools.version} + + + org.geotools + gt-geojson + ${org.geotools.version} + + + org.geotools + gt-referencing + ${org.geotools.version} + + + org.geotools + gt-epsg-hsql + 22.2 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + org.testcontainers + elasticsearch + 1.20.1 + pom + import + + + org.mock-server + mockserver-netty + 5.15.0 + + + org.mock-server + mockserver-client-java + 5.15.0 + + + org.locationtech.spatial4j + spatial4j + 0.8 + + + software.amazon.awssdk + batch + ${aws.sdk.version} + + + software.amazon.awssdk + auth + ${aws.sdk.version} + + + software.amazon.awssdk + ses + ${aws.sdk.version} + + + au.org.aodn + es-indexer + 0.0.37 + + + - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.2.0 - - - com.github.joschi.jackson - jackson-datatype-threetenbp - 2.6.4 - - - co.elastic.clients - elasticsearch-java - 8.13.3 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - org.projectlombok - lombok-mapstruct-binding - ${org.projectlombok.binding} - - - org.geotools - gt-cql - ${org.geotools.version} - - - org.geotools - gt-geojson - ${org.geotools.version} - - - org.geotools - gt-referencing - ${org.geotools.version} - - - org.geotools - gt-epsg-hsql - 22.2 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - org.testcontainers - elasticsearch - 1.20.1 - pom - import - - - org.mock-server - mockserver-netty - 5.15.0 - - - org.mock-server - mockserver-client-java - 5.15.0 - - - org.locationtech.spatial4j - spatial4j - 0.8 - - - software.amazon.awssdk - batch - ${aws.sdk.version} - - - software.amazon.awssdk - auth - ${aws.sdk.version} - - - software.amazon.awssdk - ses - ${aws.sdk.version} - - - au.org.aodn - es-indexer - 0.0.37 - - - - - - - codeartifact - codeartifact - ${env.CODEARTIFACT_REPO_URL} - - - codeartifact - codeartifact - ${env.CODEARTIFACT_REPO_URL} - - - - - - - software.amazon.codeartifact - codeartifact-login-maven-plugin - 1.1.0-SNAPSHOT - - - - login - - initialize - - - - central-aodn-org-au - 851725428481 - ap-southeast-2 - maven-aodn-store - 900 - - - - + + + codeartifact + codeartifact + ${env.CODEARTIFACT_REPO_URL} + + + codeartifact + codeartifact + ${env.CODEARTIFACT_REPO_URL} + + From b85806b9bd1ac4b36cb8ec7f8ef47ee60386df66 Mon Sep 17 00:00:00 2001 From: nandeeshsb9 Date: Thu, 5 Jun 2025 16:03:32 +1000 Subject: [PATCH 4/5] Added new dependency --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index c020f61f..92efb3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,10 @@ software.amazon.awssdk auth ${aws.sdk.version} + + + au.org.aodn + es-indexer software.amazon.awssdk From e586ef1f1a785605e9a4d8ba96978ab20b776f91 Mon Sep 17 00:00:00 2001 From: nandeeshsb9 Date: Thu, 12 Jun 2025 15:33:20 +1000 Subject: [PATCH 5/5] made changes to pom file --- pom.xml | 2 +- server/pom.xml | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 92efb3bb..44e0a049 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ au.org.aodn es-indexer - 0.0.37 + 0.0.40 diff --git a/server/pom.xml b/server/pom.xml index 18fe69b4..b4377b50 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -2,12 +2,14 @@ + ogcapi-java au.org.aodn.ogcapi 0.0.0 ../pom.xml + 4.0.0 ogcapi-server-java ogcapi-java-server @@ -19,6 +21,20 @@ false + + + + codeartifact + https://central-aodn-org-au-851725428481.d.codeartifact.ap-southeast-2.amazonaws.com/maven/maven-aodn-store/ + + true + + + true + + + + software.amazon.awssdk @@ -36,7 +52,6 @@ org.springframework.boot spring-boot-starter - org.springframework.boot spring-boot-starter-logging @@ -100,7 +115,6 @@ com.fasterxml.jackson.core jackson-databind - org.geotools gt-cql @@ -113,11 +127,14 @@ org.geotools gt-referencing - org.geotools gt-epsg-hsql + + au.org.aodn + es-indexer + org.locationtech.spatial4j spatial4j @@ -131,7 +148,6 @@ org.springframework.boot spring-boot-starter-actuator - org.springframework.boot spring-boot-starter-logging @@ -146,7 +162,6 @@ org.springframework.boot spring-boot-starter-test - org.springframework.boot spring-boot-starter-logging @@ -168,15 +183,14 @@ mockserver-client-java test - org.skyscreamer jsonassert 1.5.0 test - + @@ -191,11 +205,10 @@ maven-compiler-plugin 3.10.1 - 17 - 17 + 17 + 17 true - org.mapstruct mapstruct-processor