From fb8e2f8b13a7f2bfc42fcce26bf12e1ecea10921 Mon Sep 17 00:00:00 2001 From: wanzhiji Date: Tue, 22 Dec 2020 16:27:51 +0000 Subject: [PATCH 1/7] Squashed commit of the following commit 1d1b4ef8 Author: zhijie wang Date: Mon Dec 21 2020 15:34:26 GMT-0800 (Pacific Standard Time) bump os-core-lib-aws version, supress maven transport progress log --- testing/partition-test-aws/build-aws/prepare-dist.sh | 10 +++++----- testing/partition-test-aws/build-aws/run-tests.sh | 4 ++-- testing/partition-test-aws/pom.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testing/partition-test-aws/build-aws/prepare-dist.sh b/testing/partition-test-aws/build-aws/prepare-dist.sh index 48f2db17..07d41712 100755 --- a/testing/partition-test-aws/build-aws/prepare-dist.sh +++ b/testing/partition-test-aws/build-aws/prepare-dist.sh @@ -38,13 +38,13 @@ echo $INTEGRATION_TEST_OUTPUT_BIN_DIR rm -rf "$INTEGRATION_TEST_OUTPUT_DIR" mkdir -p "$INTEGRATION_TEST_OUTPUT_DIR" && mkdir -p "$INTEGRATION_TEST_OUTPUT_BIN_DIR" echo "Building integration testing assemblies and gathering artifacts..." -mvn install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml -mvn install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom +mvn -ntp install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml +mvn -ntp install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom cp "$INTEGRATION_TEST_SOURCE_DIR_AWS"/target/dependency/* "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" -(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh) +(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn -ntp install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh) chmod +x "${INTEGRATION_TEST_OUTPUT_BIN_DIR}"/install-deps.sh -mvn clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml +mvn -ntp clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml cp -R "$INTEGRATION_TEST_SOURCE_DIR_AWS"/* "${INTEGRATION_TEST_OUTPUT_DIR}"/ #copy testing parent pom to output -cp "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" "${OUTPUT_DIR}/testing" \ No newline at end of file +cp "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" "${OUTPUT_DIR}/testing" diff --git a/testing/partition-test-aws/build-aws/run-tests.sh b/testing/partition-test-aws/build-aws/run-tests.sh index be59c88f..a03a533e 100755 --- a/testing/partition-test-aws/build-aws/run-tests.sh +++ b/testing/partition-test-aws/build-aws/run-tests.sh @@ -46,7 +46,7 @@ export ENVIRONMENT=$RESOURCE_PREFIX #### RUN INTEGRATION TEST ######################################################################### -mvn test -f "$SCRIPT_SOURCE_DIR"/../pom.xml +mvn -ntp test -f "$SCRIPT_SOURCE_DIR"/../pom.xml TEST_EXIT_CODE=$? #### COPY TEST REPORTS ######################################################################### @@ -59,4 +59,4 @@ fi echo "### Partition Service Integration Tests Finished ###" -exit $TEST_EXIT_CODE \ No newline at end of file +exit $TEST_EXIT_CODE diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index d0dae2e9..ee25db3c 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -71,7 +71,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.3.7 + 0.3.16 -- GitLab From 7c2b1dcb09cd592cd29795579c12880acab6f555 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Wed, 3 Feb 2021 15:23:26 +0000 Subject: [PATCH 2/7] SSL AWS commit 3cc01135 Author: Sutton Date: Fri Jan 29 2021 12:49:08 GMT-0600 (Central Standard Time) Adding ssl commit 97b9d5f4 Author: wanzhiji Date: Tue Dec 22 2020 10:27:51 GMT-0600 (Central Standard Time) Squashed commit of the following commit 1d1b4ef8 Author: zhijie wang Date: Mon Dec 21 2020 15:34:26 GMT-0800 (Pacific Standard Time) bump os-core-lib-aws version, supress maven transport progress log --- provider/partition-aws/build-aws/Dockerfile | 9 ++++- .../partition-aws/build-aws/entrypoint.sh | 15 ++++++++ provider/partition-aws/build-aws/ssl.sh | 34 +++++++++++++++++++ .../src/main/resources/application.properties | 9 ++++- 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100755 provider/partition-aws/build-aws/entrypoint.sh create mode 100755 provider/partition-aws/build-aws/ssl.sh diff --git a/provider/partition-aws/build-aws/Dockerfile b/provider/partition-aws/build-aws/Dockerfile index 40a86743..f2dd89fb 100644 --- a/provider/partition-aws/build-aws/Dockerfile +++ b/provider/partition-aws/build-aws/Dockerfile @@ -16,7 +16,14 @@ FROM amazoncorretto:8 ARG JAR_FILE=provider/partition-aws/target/*spring-boot.jar + +#Default to using self signed generated TLS cert +ENV USE_SELF_SIGNED_SSL_CERT true + WORKDIR / COPY ${JAR_FILE} app.jar +COPY /provider/partition-aws/build-aws/ssl.sh /ssl.sh +COPY /provider/partition-aws/build-aws/entrypoint.sh /entrypoint.sh EXPOSE 8080 -ENTRYPOINT java $JAVA_OPTS -jar /app.jar + +ENTRYPOINT ["/bin/sh", "-c", ". /entrypoint.sh"] diff --git a/provider/partition-aws/build-aws/entrypoint.sh b/provider/partition-aws/build-aws/entrypoint.sh new file mode 100755 index 00000000..9bd3ec69 --- /dev/null +++ b/provider/partition-aws/build-aws/entrypoint.sh @@ -0,0 +1,15 @@ + + +if [ -n $USE_SELF_SIGNED_SSL_CERT ]; +then + export SSL_KEY_PASSWORD=$RANDOM$RANDOM$RANDOM; + export SSL_KEY_STORE_PASSWORD=$SSL_KEY_PASSWORD; + export SSL_KEY_STORE_DIR=/tmp/certs; + export SSL_KEY_STORE_NAME=osduonaws.p12; + export SSL_KEY_STORE_PATH=$SSL_KEY_STORE_DIR/$SSL_KEY_STORE_NAME; + export SSL_KEY_ALIAS=osduonaws; + + ./ssl.sh; +fi + +java $JAVA_OPTS -jar /app.jar \ No newline at end of file diff --git a/provider/partition-aws/build-aws/ssl.sh b/provider/partition-aws/build-aws/ssl.sh new file mode 100755 index 00000000..9ede5656 --- /dev/null +++ b/provider/partition-aws/build-aws/ssl.sh @@ -0,0 +1,34 @@ +# Copyright © 2021 Amazon Web Services +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#!/usr/bin/env bash + +#Future: Support for using Amazon Cert Manager +# if [ "$1" == "webserver" ] && [ -n $ACM_CERTIFICATE_ARN ]; +# then + +# aws acm export-certificate --certificate-arn $ACM_CERTIFICATE_ARN --passphrase $(echo -n 'aws123' | openssl base64 -e) | jq -r '"\(.PrivateKey)"' > ${SSL_KEY_PATH}.enc +# openssl rsa -in ${SSL_KEY_PATH}.enc -out $SSL_KEY_PATH -passin pass:aws123 +# aws acm get-certificate --certificate-arn $ACM_CERTIFICATE_ARN | jq -r '"\(.CertificateChain)"' > $SSL_CERT_PATH +# aws acm get-certificate --certificate-arn $ACM_CERTIFICATE_ARN | jq -r '"\(.Certificate)"' >> $SSL_CERT_PATH + +# fi + +if [ -n $USE_SELF_SIGNED_SSL_CERT ]; +then + mkdir -p $SSL_KEY_STORE_DIR + pushd $SSL_KEY_STORE_DIR + keytool -genkeypair -alias $SSL_KEY_ALIAS -keyalg RSA -keysize 2048 -storetype PKCS12 -keystore $SSL_KEY_STORE_NAME -validity 3650 -keypass $SSL_KEY_PASSWORD -storepass $SSL_KEY_PASSWORD -dname "CN=localhost, OU=AWS, O=Energy, L=Houston, ST=TX, C=US" + popd +fi diff --git a/provider/partition-aws/src/main/resources/application.properties b/provider/partition-aws/src/main/resources/application.properties index ec8271b2..050ffab5 100644 --- a/provider/partition-aws/src/main/resources/application.properties +++ b/provider/partition-aws/src/main/resources/application.properties @@ -36,4 +36,11 @@ aws.dynamodb.endpoint=dynamodb.${AWS_REGION}.amazonaws.com ## AWS ElastiCache configuration aws.elasticache.cluster.endpoint=${CACHE_CLUSTER_ENDPOINT} -aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT} \ No newline at end of file +aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT} + +server.ssl.enabled=${SSL_ENABLED:true} +server.ssl.key-store-type=PKCS12 +server.ssl.key-store=${SSL_KEY_STORE_PATH:/certs/osduonaws.p12} +server.ssl.key-alias=${SSL_KEY_ALIAS:osduonaws} +server.ssl.key-password=${SSL_KEY_PASSWORD:} +server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:} \ No newline at end of file -- GitLab From 2a952d562f1e6c25495c498ad2873e8bc4dc9d9d Mon Sep 17 00:00:00 2001 From: Sutton Date: Wed, 3 Feb 2021 10:14:24 -0600 Subject: [PATCH 3/7] ubuntu expired key fix --- provider/partition-aws/build-aws/buildspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/provider/partition-aws/build-aws/buildspec.yaml b/provider/partition-aws/build-aws/buildspec.yaml index 85b1a5b2..788ce1a9 100644 --- a/provider/partition-aws/build-aws/buildspec.yaml +++ b/provider/partition-aws/build-aws/buildspec.yaml @@ -27,6 +27,8 @@ phases: runtime-versions: java: corretto8 commands: + # fix error noted here: https://github.com/yarnpkg/yarn/issues/7866 + - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - - if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi - apt-get update -y - apt-get install -y maven -- GitLab From a52963d93cc0e07fc0a9f71ed8d1429df92fb6fb Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Fri, 5 Feb 2021 22:32:53 +0000 Subject: [PATCH 4/7] CORS fix commit ec808896 Author: Sutton Date: Fri Feb 05 2021 15:48:18 GMT-0600 (Central Standard Time) Incrementing to latest core lib aws commit 366f9ef6 Author: Sutton Date: Fri Feb 05 2021 14:01:55 GMT-0600 (Central Standard Time) Updating CORS int test to work with better values commit bae97ae6 Author: Sutton Date: Fri Feb 05 2021 12:44:34 GMT-0600 (Central Standard Time) Needed to inject httpResponseBodyMapper commit 060646c6 Author: Sutton Date: Wed Feb 03 2021 16:25:45 GMT-0600 (Central Standard Time) core lib update commit 768e31ce Author: Sutton Date: Wed Feb 03 2021 15:12:46 GMT-0600 (Central Standard Time) entitlements client factory problem commit 5cee0fec Author: Sutton Date: Wed Feb 03 2021 14:59:12 GMT-0600 (Central Standard Time) Merge branch 'dev' of codecommit::us-east-1://default@os-partition into bug/CORS commit 93c4dc77 Author: Sutton Date: Wed Feb 03 2021 14:41:47 GMT-0600 (Central Standard Time) Cors fix commit 8c25f070 Author: Sutton Date: Thu Jan 21 2021 09:50:07 GMT-0600 (Central Standard Time) Added response headers factory commit 452cde98 Author: wanzhiji Date: Tue Dec 22 2020 10:27:51 GMT-0600 (Central Standard Time) Squashed commit of the following commit 1d1b4ef8 Author: zhijie wang Date: Mon Dec 21 2020 15:34:26 GMT-0800 (Pacific Standard Time) bump os-core-lib-aws version, supress maven transport progress log --- .../partition/middleware/PartitionFilter.java | 11 ++++-- .../middleware/PartitionFilterTest.java | 36 ++++++++++--------- pom.xml | 2 +- provider/partition-aws/pom.xml | 2 +- .../security/EntitlementsClientFactory.java | 11 ++++-- .../osdu/partition/util/BaseTestTemplate.java | 18 +++++----- 6 files changed, 47 insertions(+), 33 deletions(-) diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/PartitionFilter.java b/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/PartitionFilter.java index d6ca8102..f6ff159b 100644 --- a/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/PartitionFilter.java +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/middleware/PartitionFilter.java @@ -15,6 +15,7 @@ package org.opengroup.osdu.partition.middleware; import org.opengroup.osdu.core.common.http.ResponseHeaders; +import org.opengroup.osdu.core.common.http.ResponseHeadersFactory; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.http.Request; @@ -42,6 +43,12 @@ public class PartitionFilter implements Filter { @Value("${ACCEPT_HTTP:false}") private boolean acceptHttp; + // defaults to * for any front-end, string must be comma-delimited if more than one domain + @Value("${ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS:*}") + String ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS; + + private ResponseHeadersFactory responseHeadersFactory = new ResponseHeadersFactory(); + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest httpServletRequest = (HttpServletRequest) request; @@ -105,8 +112,8 @@ public class PartitionFilter implements Filter { } private void setResponseHeaders(HttpServletResponse httpServletResponse) { - Map> standardHeaders = ResponseHeaders.STANDARD_RESPONSE_HEADERS; - for (Map.Entry> header : standardHeaders.entrySet()) { + Map responseHeaders = responseHeadersFactory.getResponseHeaders(ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS); + for(Map.Entry header : responseHeaders.entrySet()){ if("Cache-Control".equalsIgnoreCase(header.getKey())){ httpServletResponse.addHeader(header.getKey(), "private, max-age=300"); }else { diff --git a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java index f32a2b4d..e848b1ad 100644 --- a/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java +++ b/partition-core/src/test/java/org/opengroup/osdu/partition/middleware/PartitionFilterTest.java @@ -48,26 +48,26 @@ public class PartitionFilterTest { HttpServletRequest httpServletRequest = mock(HttpServletRequest.class); HttpServletResponse httpServletResponse = mock(HttpServletResponse.class); when(httpServletRequest.getRequestURL()).thenReturn(new StringBuffer("https://test.com")); - FilterChain filterChain = mock(FilterChain.class); - when(headers.getCorrelationId()).thenReturn("correlation-id-value"); - when(httpServletRequest.getMethod()).thenReturn("POST"); + FilterChain filterChain = Mockito.mock(FilterChain.class); + Mockito.when(headers.getCorrelationId()).thenReturn("correlation-id-value"); + Mockito.when(httpServletRequest.getMethod()).thenReturn("POST"); + org.springframework.test.util.ReflectionTestUtils.setField(partitionFilter, "ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS", "custom-domain"); partitionFilter.doFilter(httpServletRequest, httpServletResponse, filterChain); - verify(httpServletResponse).addHeader("Access-Control-Allow-Origin", singletonList("*").toString()); - verify(httpServletResponse).addHeader("Access-Control-Allow-Headers", singletonList("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey").toString()); - verify(httpServletResponse).addHeader("Access-Control-Allow-Methods", singletonList("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH").toString()); - verify(httpServletResponse).addHeader("Access-Control-Allow-Credentials", singletonList("true").toString()); - verify(httpServletResponse).addHeader("X-Frame-Options", singletonList("DENY").toString()); - verify(httpServletResponse).addHeader("X-XSS-Protection", singletonList("1; mode=block").toString()); - verify(httpServletResponse).addHeader("X-Content-Type-Options", singletonList("nosniff").toString()); - verify(httpServletResponse).addHeader("Cache-Control", "private, max-age=300"); - verify(httpServletResponse).addHeader("Content-Security-Policy", singletonList("default-src 'self'").toString()); - verify(httpServletResponse).addHeader("Strict-Transport-Security", singletonList("max-age=31536000; includeSubDomains").toString()); - verify(httpServletResponse).addHeader("Expires", singletonList("0").toString()); - verify(httpServletResponse).addHeader("correlation-id", "correlation-id-value"); - verify(filterChain).doFilter(httpServletRequest, httpServletResponse); - verify(logger).request(Mockito.any(Request.class)); + Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Origin", "custom-domain"); + Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Headers", "origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey"); + Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH"); + Mockito.verify(httpServletResponse).addHeader("Access-Control-Allow-Credentials", "true"); + Mockito.verify(httpServletResponse).addHeader("X-Frame-Options", "DENY"); + Mockito.verify(httpServletResponse).addHeader("X-XSS-Protection", "1; mode=block"); + Mockito.verify(httpServletResponse).addHeader("X-Content-Type-Options", "nosniff"); + Mockito.verify(httpServletResponse).addHeader("Cache-Control", "private, max-age=300"); + Mockito.verify(httpServletResponse).addHeader("Content-Security-Policy", "default-src 'self'"); + Mockito.verify(httpServletResponse).addHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains"); + Mockito.verify(httpServletResponse).addHeader("Expires", "0"); + Mockito.verify(httpServletResponse).addHeader("correlation-id", "correlation-id-value"); + Mockito.verify(filterChain).doFilter(httpServletRequest, httpServletResponse); } @Test @@ -77,6 +77,7 @@ public class PartitionFilterTest { when(httpServletRequest.getRequestURL()).thenReturn(new StringBuffer("http://test.com")); FilterChain filterChain = mock(FilterChain.class); when(httpServletRequest.getMethod()).thenReturn("POST"); + org.springframework.test.util.ReflectionTestUtils.setField(partitionFilter, "ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS", "custom-domain"); partitionFilter.doFilter(httpServletRequest, httpServletResponse, filterChain); @@ -90,6 +91,7 @@ public class PartitionFilterTest { when(httpServletRequest.getRequestURL()).thenReturn(new StringBuffer("https://test.com")); FilterChain filterChain = mock(FilterChain.class); when(httpServletRequest.getMethod()).thenReturn("OPTIONS"); + org.springframework.test.util.ReflectionTestUtils.setField(partitionFilter, "ACCESS_CONTROL_ALLOW_ORIGIN_DOMAINS", "custom-domain"); partitionFilter.doFilter(httpServletRequest, httpServletResponse, filterChain); diff --git a/pom.xml b/pom.xml index f04c5491..54c01e16 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.8 1.8 UTF-8 - 0.3.16 + 0.3.27 9.0.37 diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 9aa9eaa0..fcbbcd09 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -58,7 +58,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.3.7 + 0.3.17 org.opengroup.osdu diff --git a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/EntitlementsClientFactory.java b/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/EntitlementsClientFactory.java index 8420ca50..e77b8354 100644 --- a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/EntitlementsClientFactory.java +++ b/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/EntitlementsClientFactory.java @@ -18,10 +18,13 @@ package org.opengroup.osdu.partition.provider.aws.security; import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig; import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory; import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory; +import org.opengroup.osdu.core.common.http.json.HttpResponseBodyMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.stereotype.Component; +import javax.inject.Inject; + @Component public class EntitlementsClientFactory extends AbstractFactoryBean { @@ -31,14 +34,16 @@ public class EntitlementsClientFactory extends AbstractFactoryBean Date: Thu, 18 Feb 2021 19:13:17 -0600 Subject: [PATCH 5/7] Upgrading core common to 0.3.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54c01e16..4a3dccec 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.8 1.8 UTF-8 - 0.3.27 + 0.3.28 9.0.37 -- GitLab From 9563d6883f7da2fbe24d2bc64627718fc63bf7ce Mon Sep 17 00:00:00 2001 From: Sutton Date: Mon, 22 Feb 2021 10:20:23 -0600 Subject: [PATCH 6/7] Fixing the build --- provider/partition-ibm/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml index 90dcd2ef..45752a19 100644 --- a/provider/partition-ibm/pom.xml +++ b/provider/partition-ibm/pom.xml @@ -25,11 +25,11 @@ - + 0.3.16 + org.opengroup.osdu os-core-lib-ibm -- GitLab From a332c56a2c45d839d50c4e0b7befa03862da3bcb Mon Sep 17 00:00:00 2001 From: Sutton Date: Mon, 22 Feb 2021 10:51:27 -0600 Subject: [PATCH 7/7] Fixing the build again --- provider/partition-gcp/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml index 54335188..fc41a5ad 100644 --- a/provider/partition-gcp/pom.xml +++ b/provider/partition-gcp/pom.xml @@ -21,6 +21,11 @@ partition-core 0.6.0-SNAPSHOT + + org.opengroup.osdu + os-core-common + 0.3.16 + org.opengroup.osdu -- GitLab