From ec98d1d3aa36a1497eb4b022816043e23da65b0f Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Thu, 26 Aug 2021 14:00:58 -0500 Subject: [PATCH 01/19] properly copy parent pom --- testing/legal-test-aws/build-aws/prepare-dist.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/legal-test-aws/build-aws/prepare-dist.sh b/testing/legal-test-aws/build-aws/prepare-dist.sh index baa16e0c..367e34d3 100755 --- a/testing/legal-test-aws/build-aws/prepare-dist.sh +++ b/testing/legal-test-aws/build-aws/prepare-dist.sh @@ -21,7 +21,8 @@ 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 -ntp install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml +mvn -ntp clean install -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" -pl legal-test-core,legal-test-aws -am +# 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 -ntp install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh) -- GitLab From bf3dcae2db4d175fed499e85252e0a936dd94503 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Wed, 15 Sep 2021 09:18:41 -0500 Subject: [PATCH 02/19] Removing snapshots --- legal-core/pom.xml | 4 ++-- pom.xml | 4 ++-- provider/legal-aws/pom.xml | 6 +++--- provider/legal-azure/pom.xml | 4 ++-- provider/legal-byoc/pom.xml | 4 ++-- provider/legal-gcp/pom.xml | 6 +++--- provider/legal-ibm/pom.xml | 6 +++--- provider/legal-reference/pom.xml | 6 +++--- testing/legal-test-aws/pom.xml | 6 +++--- testing/legal-test-azure/pom.xml | 6 +++--- testing/legal-test-core/pom.xml | 4 ++-- testing/legal-test-gcp/pom.xml | 6 +++--- testing/legal-test-ibm/pom.xml | 6 +++--- testing/pom.xml | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index bd5dd792..14d2dd1f 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -5,12 +5,12 @@ org.opengroup.osdu.legal legal-service - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu.legal legal-core - 0.11.0-SNAPSHOT + 0.11.0 jar legal-core Legal service core diff --git a/pom.xml b/pom.xml index 0903767d..271ba8b8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.11.0-SNAPSHOT + 0.11.0 1.26 @@ -22,7 +22,7 @@ org.opengroup.osdu.legal legal-service - 0.11.0-SNAPSHOT + 0.11.0 pom legal-service Legal service diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index b43b3e9f..af4bdf9a 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -18,7 +18,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml 4.0.0 @@ -29,7 +29,7 @@ 1.11.1018 dev - 0.11.0-SNAPSHOT + 0.11.0 @@ -37,7 +37,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml index 7add67b4..67c694ca 100644 --- a/provider/legal-azure/pom.xml +++ b/provider/legal-azure/pom.xml @@ -19,7 +19,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml 4.0.0 @@ -32,7 +32,7 @@ 0.10.0 - 0.11.0-SNAPSHOT + 0.11.0 1 4.0.1 5.3.0 diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index 081c31d1..876a790f 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -3,7 +3,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml 4.0.0 @@ -19,7 +19,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0-SNAPSHOT + 0.11.0 org.springframework.boot diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml index 04a899b7..196c2139 100644 --- a/provider/legal-gcp/pom.xml +++ b/provider/legal-gcp/pom.xml @@ -5,13 +5,13 @@ legal-service org.opengroup.osdu.legal - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml org.opengroup.osdu.legal legal-gcp - 0.11.0-SNAPSHOT + 0.11.0 jar legal-gcp Legal service Google App Engine flex @@ -25,7 +25,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index ff59892b..65bfaf52 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -3,7 +3,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml 4.0.0 @@ -11,14 +11,14 @@ legal-ibm jar - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu.legal legal-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/legal-reference/pom.xml b/provider/legal-reference/pom.xml index 5c2244c3..5b654cfa 100644 --- a/provider/legal-reference/pom.xml +++ b/provider/legal-reference/pom.xml @@ -7,12 +7,12 @@ org.opengroup.osdu.legal legal-service - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml legal-reference - 0.11.0-SNAPSHOT + 0.11.0 jar legal-reference Legal service for Anthos @@ -26,7 +26,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index bb7c48db..83a5a0ba 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.legal legal-test-aws - 0.11.0-SNAPSHOT + 0.11.0 jar @@ -40,7 +40,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu.core.aws diff --git a/testing/legal-test-azure/pom.xml b/testing/legal-test-azure/pom.xml index b3776877..3f943685 100644 --- a/testing/legal-test-azure/pom.xml +++ b/testing/legal-test-azure/pom.xml @@ -22,13 +22,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.legal legal-test-azure - 0.11.0-SNAPSHOT + 0.11.0 jar @@ -49,7 +49,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/legal-test-core/pom.xml b/testing/legal-test-core/pom.xml index 87060f8b..84465871 100644 --- a/testing/legal-test-core/pom.xml +++ b/testing/legal-test-core/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.legal legal-test-core - 0.11.0-SNAPSHOT + 0.11.0 jar 1.8 diff --git a/testing/legal-test-gcp/pom.xml b/testing/legal-test-gcp/pom.xml index d2c6310d..bba09012 100644 --- a/testing/legal-test-gcp/pom.xml +++ b/testing/legal-test-gcp/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.legal legal-test-gcp - 0.11.0-SNAPSHOT + 0.11.0 jar @@ -98,7 +98,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0-SNAPSHOT + 0.11.0 com.google.cloud diff --git a/testing/legal-test-ibm/pom.xml b/testing/legal-test-ibm/pom.xml index a20738f4..51384384 100644 --- a/testing/legal-test-ibm/pom.xml +++ b/testing/legal-test-ibm/pom.xml @@ -13,14 +13,14 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.legal legal-test-ibm - 0.11.0-SNAPSHOT + 0.11.0 jar @@ -34,7 +34,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/pom.xml b/testing/pom.xml index 11880f78..e2f93a90 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu.legal os-legal-testing - 0.11.0-SNAPSHOT + 0.11.0 Root Legal Service project pom -- GitLab From e8c4d7b697546f004fed95a3438de79dab240778 Mon Sep 17 00:00:00 2001 From: Kyle Longhurst Date: Tue, 28 Sep 2021 17:11:49 +0000 Subject: [PATCH 03/19] Use version 0.12.0-SNAPSHOT of core lib aws commit 50e76ac6 Author: Kyle Longhurst Date: Mon Sep 27 2021 14:54:40 GMT-0700 (PDT) Use version 0.12.0-SNAPSHOT of core lib aws --- provider/legal-aws/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index af4bdf9a..af53b10e 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -37,7 +37,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.11.0 + 0.12.0-SNAPSHOT org.opengroup.osdu -- GitLab From 2afb79a40d33ca373bb972a1c637633674e76946 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 14 Oct 2021 15:58:20 +0000 Subject: [PATCH 04/19] Compliance Trigger Fix commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- .../osdu/legal/api/LegalTagStatusJobApi.java | 6 +-- .../osdu/legal/logging/AuditLoggerTests.java | 8 +++- .../legal/aws/jobs/AwsStatusChangedTag.java | 30 ++++++++++++ .../legal/aws/jobs/LegalTagPublisherImpl.java | 13 +++-- .../LegalTagRepositoryFactoryAwsImpl.java | 48 +++++++++++++++++++ .../dataaccess/LegalTagRepositoryImpl.java | 32 +++++++++++-- .../aws/api/LegalTagRepositoryImplTest.java | 9 +++- 7 files changed, 132 insertions(+), 14 deletions(-) create mode 100644 provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java create mode 100644 provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java b/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java index 33103d97..90099678 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java @@ -51,7 +51,7 @@ public class LegalTagStatusJobApi { boolean allPassed = true; for (TenantInfo tenantInfo : tenantsInfo) { convertedHeaders.put(DpsHeaders.ACCOUNT_ID, tenantInfo.getName()); - boolean result = runJob(convertedHeaders, legalTagStatusJob); + boolean result = runJob(convertedHeaders, tenantInfo, legalTagStatusJob); if (allPassed) allPassed = result; } @@ -60,11 +60,11 @@ public class LegalTagStatusJobApi { return new ResponseEntity(status); } - private boolean runJob(DpsHeaders convertedHeaders, LegalTagStatusJob legalTagStatusJob) { + private boolean runJob(DpsHeaders convertedHeaders, TenantInfo tenantInfo, LegalTagStatusJob legalTagStatusJob) { boolean success = true; try { String projectId = requestInfo.getTenantInfo().getProjectId(); - StatusChangedTags result = legalTagStatusJob.run(projectId, convertedHeaders, requestInfo.getTenantInfo().getName()); + StatusChangedTags result = legalTagStatusJob.run(projectId, convertedHeaders, tenantInfo.getName()); auditLogger.legalTagJobRanSuccess(singletonList(result.toString())); } catch (Exception e) { success = false; diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java index 5d5220ea..038a5710 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java @@ -11,6 +11,8 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import java.util.Collections; import java.util.List; + +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -67,13 +69,15 @@ public class AuditLoggerTests { @Test public void should_writeLegalTagReadPropertiesSuccessEvent(){ - sut.readLegalPropertiesSuccess(any()); + List resource = Collections.singletonList("1"); + sut.readLegalPropertiesSuccess(resource); verify(log).audit(any()); } @Test public void should_writeLegalTagReadPropertiesFailEvent(){ - sut.readLegalPropertiesFail(any()); + List resource = Collections.singletonList("1"); + sut.readLegalPropertiesFail(resource); verify(log).audit(any()); } diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java new file mode 100644 index 00000000..e6882f4d --- /dev/null +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java @@ -0,0 +1,30 @@ +// Copyright © Amazon +// +// 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. + +package org.opengroup.osdu.legal.aws.jobs; + +import lombok.Data; +import org.opengroup.osdu.core.common.model.legal.StatusChangedTag; + +@Data +public class AwsStatusChangedTag extends StatusChangedTag { + + private String dataPartitionId; + + public AwsStatusChangedTag(String changedTagName, Enum changedTagStatus, String dataPartitionId) { + super(changedTagName, changedTagStatus); + this.dataPartitionId = dataPartitionId; + } +} + diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java index a130bd8f..2ba9af9c 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java @@ -30,9 +30,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import javax.inject.Inject; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service public class LegalTagPublisherImpl implements ILegalTagPublisher { @@ -43,7 +45,8 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher { private AmazonSNS snsClient; - + @Inject + private DpsHeaders headers; @PostConstruct public void init() throws K8sParameterNotFoundException { @@ -75,9 +78,13 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher { for (int i = 0; i < tags.getStatusChangedTags().size(); i += BATCH_SIZE){ List batch = tags.getStatusChangedTags().subList(i, Math.min(tags.getStatusChangedTags().size(), i + BATCH_SIZE)); - PublishRequestBuilder publishRequestBuilder = new PublishRequestBuilder<>(); + List awsBatch = batch.stream() + .map(t -> new AwsStatusChangedTag(t.getChangedTagName(), t.getChangedTagStatus(), headers.getPartitionId())) + .collect(Collectors.toList()); + + PublishRequestBuilder publishRequestBuilder = new PublishRequestBuilder<>(); PublishRequest publishRequest = publishRequestBuilder.generatePublishRequest("statusChangedTags", - batch, messageAttributes, amazonSNSTopic); + awsBatch, messageAttributes, amazonSNSTopic); snsClient.publish(publishRequest); } } diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java new file mode 100644 index 00000000..33c01883 --- /dev/null +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java @@ -0,0 +1,48 @@ +package org.opengroup.osdu.legal.aws.tags.dataaccess; + + +import org.apache.commons.lang3.StringUtils; +import org.opengroup.osdu.core.common.model.http.AppException; +import org.opengroup.osdu.core.common.model.http.DpsHeaders; +import org.opengroup.osdu.core.common.model.tenant.TenantInfo; +import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory; +import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; +import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +import javax.inject.Inject; + +@Service +@Primary +public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory { + + + private TenantInfo tenantInfo; + private ITenantFactory tenantFactory; + + @Inject + LegalTagRepositoryImpl repoImpl; + + public LegalTagRepositoryFactoryAwsImpl(TenantInfo tenantInfo, ITenantFactory tenantFactory) { + this.tenantInfo = tenantInfo; + this.tenantFactory = tenantFactory; + } + + @Override + public ILegalTagRepository get(String tenantName) { + if (StringUtils.isBlank(tenantName)) { + throw invalidTenantGivenException(tenantName); + } + TenantInfo tenantInfo = tenantFactory.getTenantInfo(tenantName); + repoImpl.setTenantInfo(tenantInfo); + + return repoImpl; + } + + AppException invalidTenantGivenException(String tenantName) { + return new AppException(403, "Forbidden", + String.format("You do not have access to the %s value given %s", + DpsHeaders.ACCOUNT_ID, tenantName)); + } +} diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java index 8bebf917..207cf5ab 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java @@ -21,13 +21,17 @@ import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2; import org.opengroup.osdu.core.aws.dynamodb.QueryPageResult; +import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.legal.ListLegalTagArgs; import org.opengroup.osdu.core.common.model.legal.LegalTag; import org.opengroup.osdu.core.common.model.http.AppException; +import org.opengroup.osdu.core.common.model.tenant.TenantInfo; +import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory; import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Repository; import javax.annotation.PostConstruct; @@ -41,14 +45,32 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { @Inject private DpsHeaders headers; + @Inject + private JaxRsDpsLog log; + + private TenantInfo tenantInfo; + @Inject private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory; @Value("${aws.dynamodb.legalTable.ssm.relativePath}") String legalRepositoryTableParameterRelativePath; + public void setTenantInfo(TenantInfo tenantInfo) { + this.tenantInfo = tenantInfo; + } + + private String getDataPartitionId(){ + if(this.tenantInfo == null){ + log.warning("TenantInfo found to be null, defaulting to partition in headers"); + return headers.getPartitionId(); + } + return tenantInfo.getDataPartitionId(); + } + private DynamoDBQueryHelperV2 getLegalRepositoryQueryHelper() { - return dynamoDBQueryHelperFactory.getQueryHelperForPartition(headers, legalRepositoryTableParameterRelativePath); + String dataPartitionId = getDataPartitionId(); + return dynamoDBQueryHelperFactory.getQueryHelperForPartition(dataPartitionId, legalRepositoryTableParameterRelativePath); } @@ -72,7 +94,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { List tags = new ArrayList<>(); for(long id: ids) { - LegalDoc ld = queryHelper.loadByPrimaryKey(LegalDoc.class, String.valueOf(id), headers.getPartitionId()); //dynamoDBLegal.findById(String.valueOf(id)); + LegalDoc ld = queryHelper.loadByPrimaryKey(LegalDoc.class, String.valueOf(id), getDataPartitionId()); //dynamoDBLegal.findById(String.valueOf(id)); if(ld != null) { tags.add(CreateLegalTagFromDoc(ld)); } @@ -87,7 +109,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { Boolean result = true; try { - queryHelper.deleteByPrimaryKey(LegalDoc.class, String.valueOf(legalTag.getId()), headers.getPartitionId()); + queryHelper.deleteByPrimaryKey(LegalDoc.class, String.valueOf(legalTag.getId()), getDataPartitionId()); } catch (Exception e){ // should be dynamodb specific exception result = false; // might need to throw app exception @@ -108,7 +130,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { String filterExpression = "dataPartitionId = :partitionId"; - AttributeValue dataPartitionAttributeValue = new AttributeValue(headers.getPartitionId()); + AttributeValue dataPartitionAttributeValue = new AttributeValue(getDataPartitionId()); Map eav = new HashMap<>(); eav.put(":partitionId", dataPartitionAttributeValue); @@ -162,7 +184,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { private LegalDoc CreateLegalDocFromTag(LegalTag legalTag){ LegalDoc legalDoc = new LegalDoc(); legalDoc.setId(String.valueOf(legalTag.getId())); - legalDoc.setDataPartitionId(headers.getPartitionId()); + legalDoc.setDataPartitionId(getDataPartitionId()); legalDoc.setDescription(legalTag.getDescription()); legalDoc.setName(legalTag.getName()); legalDoc.setProperties(legalTag.getProperties()); diff --git a/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java b/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java index 03abdf8a..3e6ed3dd 100644 --- a/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java +++ b/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java @@ -24,6 +24,7 @@ import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2; import org.opengroup.osdu.core.aws.dynamodb.QueryPageResult; +import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.legal.aws.tags.dataaccess.LegalDoc; import org.opengroup.osdu.legal.aws.tags.dataaccess.LegalTagRepositoryImpl; @@ -50,14 +51,20 @@ public class LegalTagRepositoryImplTest { @Mock private DpsHeaders headers; + @Mock + private JaxRsDpsLog log; + @Mock private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory; @Before public void setUp() { initMocks(this); - Mockito.when(dynamoDBQueryHelperFactory.getQueryHelperForPartition(Mockito.any(DpsHeaders.class), Mockito.any())) + String testPartition = "test-partition"; + Mockito.when(dynamoDBQueryHelperFactory.getQueryHelperForPartition(Mockito.eq(testPartition), Mockito.any())) .thenReturn(queryHelper); + Mockito.when(headers.getPartitionId()) + .thenReturn(testPartition); } @Test -- GitLab From a332fae1df9e2b10434e01c810f3f383ac8bca71 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 14 Oct 2021 20:38:13 +0000 Subject: [PATCH 05/19] Legal int test fix commit bb5e4245 Author: Spencer Sutton Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit d8d0fd56 Author: Spencer Sutton Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) Fixing broken unit test commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- .../test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java index fef96a52..0a1c0b31 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java @@ -49,7 +49,7 @@ public class AwsSqsHelper { // comes wrapped in non-escaped double quotes data = data.substring(1); data = data.substring(0, data.length() - 1); - String dataCheck = "{\"statusChangedTags\":[{\"changedTagName\":\"" + name + "\",\"changedTagStatus\":\"incompliant\"}]}"; + String dataCheck = "{\"statusChangedTags\":[{\"dataPartitionId\":\"" + TestUtils.getMyDataPartition() + "\",\"changedTagName\":\"" + name + "\",\"changedTagStatus\":\"incompliant\"}]}"; dataCheck = dataCheck.replaceAll("\"", "\\\\\""); return data.equals(dataCheck); } -- GitLab From 77355f27a52d2ffe440e4630a8b0c1a9cfc5f4a8 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Fri, 15 Oct 2021 19:49:34 +0000 Subject: [PATCH 06/19] RequestScope fix for AWS legal repo factory commit 1c6097e5 Author: Spencer Sutton Date: Fri Oct 15 2021 14:46:06 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit 8e1b36f7 Author: Spencer Sutton Date: Fri Oct 15 2021 14:45:31 GMT-0500 (Central Daylight Time) Fixing int tests commit 88c9315c Author: Spencer Sutton Date: Fri Oct 15 2021 13:46:33 GMT-0500 (Central Daylight Time) Disabling sonar commit 8a69da05 Author: Spencer Sutton Date: Fri Oct 15 2021 13:45:51 GMT-0500 (Central Daylight Time) Testing int test failure commit bb5e4245 Author: Spencer Sutton Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit d8d0fd56 Author: Spencer Sutton Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) Fixing broken unit test commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- provider/legal-aws/build-aws/buildspec.yaml | 4 ++-- .../aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java | 2 ++ .../legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/provider/legal-aws/build-aws/buildspec.yaml b/provider/legal-aws/build-aws/buildspec.yaml index 731961d4..4c1fa849 100644 --- a/provider/legal-aws/build-aws/buildspec.yaml +++ b/provider/legal-aws/build-aws/buildspec.yaml @@ -65,9 +65,9 @@ phases: - printenv - echo "Building primary service assemblies..." - - mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} + - mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -# Suspended until further notice + # Suspended until further notice # - echo "Copying assemblies to dist..." # - cp ./provider/legal-aws/target/*spring-boot.jar ${OUTPUT_DIR}/bin # copy aws jars # - cp ./legal-core/target/*.jar ${OUTPUT_DIR}/bin # copy core jar diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java index 33c01883..48e66dc4 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java @@ -10,11 +10,13 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; +import org.springframework.web.context.annotation.RequestScope; import javax.inject.Inject; @Service @Primary +@RequestScope public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory { diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java index 207cf5ab..691a0e76 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java @@ -33,6 +33,7 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Repository; +import org.springframework.web.context.annotation.RequestScope; import javax.annotation.PostConstruct; import javax.inject.Inject; @@ -40,6 +41,7 @@ import java.io.UnsupportedEncodingException; import java.util.*; @Repository // why use repository over component over service +@RequestScope public class LegalTagRepositoryImpl implements ILegalTagRepository { @Inject -- GitLab From ea102decd5824d371afa33a29a9b1b8e304a097b Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Mon, 18 Oct 2021 09:13:31 -0500 Subject: [PATCH 07/19] Reverting pom version changes --- legal-core/pom.xml | 4 ++-- pom.xml | 2 +- provider/legal-aws/pom.xml | 2 +- provider/legal-azure/pom.xml | 2 +- provider/legal-byoc/pom.xml | 4 ++-- provider/legal-gcp/pom.xml | 6 +++--- provider/legal-ibm/pom.xml | 4 ++-- provider/legal-reference/pom.xml | 6 +++--- testing/legal-test-aws/pom.xml | 6 +++--- testing/legal-test-azure/pom.xml | 6 +++--- testing/legal-test-core/pom.xml | 4 ++-- testing/legal-test-gcp/pom.xml | 6 +++--- testing/legal-test-ibm/pom.xml | 6 +++--- testing/pom.xml | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/legal-core/pom.xml b/legal-core/pom.xml index 14d2dd1f..bd5dd792 100644 --- a/legal-core/pom.xml +++ b/legal-core/pom.xml @@ -5,12 +5,12 @@ org.opengroup.osdu.legal legal-service - 0.11.0 + 0.11.0-SNAPSHOT org.opengroup.osdu.legal legal-core - 0.11.0 + 0.11.0-SNAPSHOT jar legal-core Legal service core diff --git a/pom.xml b/pom.xml index 271ba8b8..325891b3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.opengroup.osdu.legal legal-service - 0.11.0 + 0.11.0-SNAPSHOT pom legal-service Legal service diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index af53b10e..9121592c 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -18,7 +18,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml index 67c694ca..5b14dcc7 100644 --- a/provider/legal-azure/pom.xml +++ b/provider/legal-azure/pom.xml @@ -19,7 +19,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml index 876a790f..081c31d1 100644 --- a/provider/legal-byoc/pom.xml +++ b/provider/legal-byoc/pom.xml @@ -3,7 +3,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -19,7 +19,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0 + 0.11.0-SNAPSHOT org.springframework.boot diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml index 196c2139..04a899b7 100644 --- a/provider/legal-gcp/pom.xml +++ b/provider/legal-gcp/pom.xml @@ -5,13 +5,13 @@ legal-service org.opengroup.osdu.legal - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml org.opengroup.osdu.legal legal-gcp - 0.11.0 + 0.11.0-SNAPSHOT jar legal-gcp Legal service Google App Engine flex @@ -25,7 +25,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0 + 0.11.0-SNAPSHOT org.opengroup.osdu diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 65bfaf52..69f6b56d 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -3,7 +3,7 @@ legal-service org.opengroup.osdu.legal - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml 4.0.0 @@ -18,7 +18,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0 + 0.11.0-SNAPSHOT org.opengroup.osdu diff --git a/provider/legal-reference/pom.xml b/provider/legal-reference/pom.xml index 5b654cfa..5c2244c3 100644 --- a/provider/legal-reference/pom.xml +++ b/provider/legal-reference/pom.xml @@ -7,12 +7,12 @@ org.opengroup.osdu.legal legal-service - 0.11.0 + 0.11.0-SNAPSHOT ../../pom.xml legal-reference - 0.11.0 + 0.11.0-SNAPSHOT jar legal-reference Legal service for Anthos @@ -26,7 +26,7 @@ org.opengroup.osdu.legal legal-core - 0.11.0 + 0.11.0-SNAPSHOT org.opengroup.osdu diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index 83a5a0ba..bb7c48db 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.legal legal-test-aws - 0.11.0 + 0.11.0-SNAPSHOT jar @@ -40,7 +40,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0 + 0.11.0-SNAPSHOT org.opengroup.osdu.core.aws diff --git a/testing/legal-test-azure/pom.xml b/testing/legal-test-azure/pom.xml index 3f943685..b3776877 100644 --- a/testing/legal-test-azure/pom.xml +++ b/testing/legal-test-azure/pom.xml @@ -22,13 +22,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.legal legal-test-azure - 0.11.0 + 0.11.0-SNAPSHOT jar @@ -49,7 +49,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0 + 0.11.0-SNAPSHOT diff --git a/testing/legal-test-core/pom.xml b/testing/legal-test-core/pom.xml index 84465871..87060f8b 100644 --- a/testing/legal-test-core/pom.xml +++ b/testing/legal-test-core/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.legal legal-test-core - 0.11.0 + 0.11.0-SNAPSHOT jar 1.8 diff --git a/testing/legal-test-gcp/pom.xml b/testing/legal-test-gcp/pom.xml index bba09012..d2c6310d 100644 --- a/testing/legal-test-gcp/pom.xml +++ b/testing/legal-test-gcp/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.legal legal-test-gcp - 0.11.0 + 0.11.0-SNAPSHOT jar @@ -98,7 +98,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0 + 0.11.0-SNAPSHOT com.google.cloud diff --git a/testing/legal-test-ibm/pom.xml b/testing/legal-test-ibm/pom.xml index 51384384..a20738f4 100644 --- a/testing/legal-test-ibm/pom.xml +++ b/testing/legal-test-ibm/pom.xml @@ -13,14 +13,14 @@ org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.legal legal-test-ibm - 0.11.0 + 0.11.0-SNAPSHOT jar @@ -34,7 +34,7 @@ org.opengroup.osdu.legal legal-test-core - 0.11.0 + 0.11.0-SNAPSHOT diff --git a/testing/pom.xml b/testing/pom.xml index e2f93a90..11880f78 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu.legal os-legal-testing - 0.11.0 + 0.11.0-SNAPSHOT Root Legal Service project pom -- GitLab From 76f4e283b87fe75f54e695323c09cbf899a0d578 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Mon, 18 Oct 2021 09:14:18 -0500 Subject: [PATCH 08/19] Reverting more --- pom.xml | 2 +- provider/legal-aws/pom.xml | 2 +- provider/legal-azure/pom.xml | 2 +- provider/legal-ibm/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 325891b3..0903767d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.8 opendes UTF-8 - 0.11.0 + 0.11.0-SNAPSHOT 1.26 diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 9121592c..3851645d 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -29,7 +29,7 @@ 1.11.1018 dev - 0.11.0 + 0.11.0-SNAPSHOT diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml index 5b14dcc7..7add67b4 100644 --- a/provider/legal-azure/pom.xml +++ b/provider/legal-azure/pom.xml @@ -32,7 +32,7 @@ 0.10.0 - 0.11.0 + 0.11.0-SNAPSHOT 1 4.0.1 5.3.0 diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index 69f6b56d..ff59892b 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -11,7 +11,7 @@ legal-ibm jar - 0.11.0 + 0.11.0-SNAPSHOT -- GitLab From 6839b890a503a827c2d7d65cc005f706b96388d3 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Mon, 18 Oct 2021 10:41:57 -0500 Subject: [PATCH 09/19] Fixing build --- provider/legal-aws/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index 3d4196dc..7a61da5b 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -37,7 +37,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.12.0-SNAPSHOT + 0.11.0 org.opengroup.osdu -- GitLab From 6073a1daabbd413e5590a16a91b2605e57d5dad7 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Wed, 20 Oct 2021 12:40:12 -0500 Subject: [PATCH 10/19] Updating notice --- NOTICE | 299 ++++++++++++++++++++++++++------------------------------- 1 file changed, 136 insertions(+), 163 deletions(-) diff --git a/NOTICE b/NOTICE index 1ee4310b..4fd64c31 100644 --- a/NOTICE +++ b/NOTICE @@ -16,8 +16,8 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Cobertura (from http://cobertura.sourceforge.net) -- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus :: Default Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - oro (from ) ======================================================================== @@ -288,9 +288,10 @@ The following software have components provided under the terms of this license: - AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) - Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava) -- Apache Ant + JUnit (from https://ant.apache.org/) -- Apache Ant Core (from https://ant.apache.org/) -- Apache Ant Launcher (from https://ant.apache.org/) +- Apache Ant + JUnit (from http://ant.apache.org/) +- Apache Ant Core (from http://ant.apache.org/) +- Apache Ant Launcher (from http://ant.apache.org/) +- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) @@ -300,41 +301,44 @@ The following software have components provided under the terms of this license: - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Text (from https://commons.apache.org/proper/commons-text) -- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) -- Apache Groovy (from http://groovy-lang.org) +- Apache Groovy (from https://groovy-lang.org) +- Apache HttpClient (from http://hc.apache.org/httpcomponents-client) +- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client) +- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) - Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl) - Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j) -- Apache Maven Invoker (from ) - Apache Maven Reporting Implementation (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-impl) +- Apache Maven Wagon :: API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api) +- Apache Maven Wagon :: Providers :: File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file) +- Apache Maven Wagon :: Providers :: HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared) - Apache Velocity (from http://velocity.apache.org/engine/devel/) - AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) - Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) - Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils) -- AutoValue Annotations (from https://github.com/google/auto/tree/master/value) +- AutoValue Annotations (from https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) - BSON (from https://bsonspec.org) - Bean Validation API (from http://beanvalidation.org) -- BeanUtils (from http://jakarta.apache.org/commons/beanutils/) - Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave) - Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http) - Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Byte Buddy agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) -- Cloud Storage JSON API v1-rev20210914-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Key Management Service (KMS) API v1-rev20210820-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) +- Cloud Storage JSON API v1-rev20200814-1.30.10 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava) - Cobertura (from http://cobertura.sourceforge.net) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) -- Commons Digester (from http://commons.apache.org/digester/) - Commons Lang (from http://commons.apache.org/lang/) - Commons Lang (from http://commons.apache.org/lang/) +- Commons Validator (from http://commons.apache.org/validator/) - Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) -- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) - Doxia :: APT Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/) - Doxia :: Core (from http://maven.apache.org/doxia/doxia/doxia-core/) - Doxia :: FML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/) @@ -343,6 +347,7 @@ The following software have components provided under the terms of this license: - Doxia :: XHTML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/) - Doxia Sitetools :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/) - Doxia Sitetools :: Site Renderer (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-site-renderer) +- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson) - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) @@ -352,17 +357,16 @@ The following software have components provided under the terms of this license: - Google Cloud Core (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) -- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) -- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) +- Google Cloud Core gRPC (from https://github.com/googleapis/java-core) +- Google Cloud Core gRPC (from https://github.com/googleapis/java-core) - Google Cloud Datastore (from https://github.com/googleapis/java-datastore) - Google Cloud Datastore (from https://github.com/googleapis/java-datastore) - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials) -- Google Cloud Key Management Service (KMS) API v1-rev9-1.22.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) -- Google Cloud Logging (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging) -- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) -- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) -- Google Cloud Storage (from https://github.com/googleapis/java-storage) -- Google Cloud Storage (from https://github.com/googleapis/java-storage) +- Google Cloud Logging (from https://github.com/googleapis/java-logging) +- Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub) +- Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub) +- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) +- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) - Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client) - Groovy (from http://groovy.codehaus.org/) @@ -374,14 +378,11 @@ The following software have components provided under the terms of this license: - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) -- HttpClient (from http://hc.apache.org/httpcomponents-client) -- HttpClient Cache (from http://hc.apache.org/httpcomponents-client) -- HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) -- Identity and Access Management (IAM) API v1-rev284-1.25.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) +- Identity and Access Management (IAM) API v1-rev20191010-1.30.3 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) - J2ObjC Annotations (from https://github.com/google/j2objc/) - J2ObjC Annotations (from https://github.com/google/j2objc/) - JBoss Logging 3 (from http://www.jboss.org) @@ -392,7 +393,7 @@ The following software have components provided under the terms of this license: - JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart) - JSON Web Token support for the JVM (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt) - JSON library from Android SDK (from http://developer.android.com/sdk) -- JSONassert (from https://github.com/skyscreamer/JSONassert) +- JSONassert (from http://github.com/skyscreamer/yoga) - JSR107 API and SPI (from https://github.com/jsr107/jsr107spec) - Jackson (from http://jackson.codehaus.org) - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2) @@ -402,14 +403,13 @@ The following software have components provided under the terms of this license: - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) -- Jackson-core (from https://github.com/FasterXML/jackson-core) -- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) -- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) -- Jackson-datatype-JODA (from http://wiki.fasterxml.com/JacksonModuleJoda) +- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) +- Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml) +- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) +- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) -- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava) - Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) @@ -418,8 +418,8 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) -- Jetty Server (from http://jetty.mortbay.org) -- Jetty Utilities (from http://jetty.mortbay.org) +- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) +- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) @@ -437,6 +437,8 @@ The following software have components provided under the terms of this license: - Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager) - Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core) - Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics) +- Maven Invoker (from https://repo1.maven.org/maven2/org/apache/maven/shared/maven-invoker) +- Maven Local Settings Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) - Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model) - Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor) - Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api) @@ -447,10 +449,6 @@ The following software have components provided under the terms of this license: - Maven Project Builder (from https://repo1.maven.org/maven2/org/apache/maven/maven-project) - Maven Reporting API (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-api) - Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata) -- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) -- Maven Wagon API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api) -- Maven Wagon File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file) -- Maven Wagon HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared) - Maven Wagon Lightweight HTTP Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-lightweight) - Maven Wagon SSH Common Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common) - Maven Wagon SSH External Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-external) @@ -487,47 +485,49 @@ The following software have components provided under the terms of this license: - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) - Objenesis (from http://objenesis.org) -- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) +- Okio (from https://github.com/square/okio/) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) -- Plexus Velocity Component (from ) +- Plexus :: Default Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Velocity Component (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-velocity) +- PowerMock (from http://www.powermock.org) +- PowerMock (from http://www.powermock.org) +- PowerMock (from http://www.powermock.org) +- PowerMock (from http://www.powermock.org) +- PowerMock (from http://www.powermock.org) - PowerMock (from http://www.powermock.org) - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) -- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) -- QpidJMS Client (from ) -- RabbitMQ Java Client (from https://www.rabbitmq.com) -- Reactor Netty with all modules (from https://github.com/reactor/reactor-netty) +- QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client) +- RabbitMQ Java Client (from http://www.rabbitmq.com) +- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Servlet Specification 2.5 API (from http://jetty.mortbay.org) - SnakeYAML (from http://www.snakeyaml.org) -- Spring AOP (from https://github.com/spring-projects/spring-framework) -- Spring Beans (from https://github.com/spring-projects/spring-framework) -- Spring Boot AOP Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2) -- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/) +- Spring Beans (from https://github.com/SpringSource/spring-framework) +- Spring Boot (from http://projects.spring.io/spring-boot/) +- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) +- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) +- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/) +- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/) - Spring Boot Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot Test (from http://projects.spring.io/spring-boot/) +- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/) - Spring Boot Test Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat) +- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Context (from https://github.com/spring-projects/spring-framework) -- Spring Core (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/SpringSource/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) -- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) -- Spring JMS (from https://github.com/spring-projects/spring-framework) +- Spring Framework: JMS (from http://www.springframework.org) +- Spring Framework: Web (from http://www.springframework.org) +- Spring Framework: WebMVC (from http://www.springframework.org) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) -- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) -- Spring Transaction (from https://github.com/spring-projects/spring-framework) -- Spring Web (from https://github.com/spring-projects/spring-framework) -- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - Vavr (from http://vavr.io) - Vavr Match (from http://vavr.io) @@ -537,9 +537,7 @@ The following software have components provided under the terms of this license: - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) - aalto-xml (from ) -- asm (from http://asm.ow2.io/) -- asm (from http://asm.ow2.io/) -- asm (from http://asm.ow2.io/) +- commons-digester (from https://repo1.maven.org/maven2/commons-digester/commons-digester) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) @@ -561,68 +559,67 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amznlabs/ion-java/) - ion-java (from https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://github.com/FasterXML/jackson) +- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) - javax.inject (from http://code.google.com/p/atinject/) - jose4j (from https://bitbucket.org/b_c/jose4j/) -- lettuce (from https://github.com/lettuce-io/lettuce-core/wiki) +- lettuce (from http://github.com/mp911de/lettuce/wiki) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from http://mockito.org) +- mockito-core (from http://mockito.org) - okhttp (from https://square.github.io/okhttp/) -- okhttp-urlconnection (from https://github.com/square/okhttp) -- okio (from https://github.com/square/okio/) +- okhttp-logging-interceptor (from https://square.github.io/okhttp/) +- okhttp-urlconnection (from https://square.github.io/okhttp/) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) - perfmark:perfmark-api (from https://github.com/perfmark/perfmark) -- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-core (from http://www.powermock.org) -- powermock-module-junit4 (from http://www.powermock.org) -- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) -- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) - project ':json-path' (from https://github.com/jayway/JsonPath) - proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1) - proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1) - proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1) -- proto-google-cloud-logging-v2 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-logging-v2) -- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) -- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) +- proto-google-cloud-logging-v2 (from https://github.com/googleapis/java-logging/proto-google-cloud-logging-v2) +- proto-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1) +- proto-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1) - proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) +- proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - rxjava (from https://github.com/ReactiveX/RxJava) -- spring-boot (from https://spring.io/projects/spring-boot) +- spring-aop (from https://repo1.maven.org/maven2/org/springframework/spring-aop) +- spring-boot-actuator (from https://spring.io/projects/spring-boot) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) -- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot) +- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-starter-aop (from https://spring.io/projects/spring-boot) - spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) -- spring-boot-starter-json (from https://spring.io/projects/spring-boot) -- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) - spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) +- spring-boot-starter-security (from https://spring.io/projects/spring-boot) - spring-boot-starter-validation (from https://spring.io/projects/spring-boot) - spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) -- spring-boot-test (from https://spring.io/projects/spring-boot) -- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot) -- spring-security-config (from https://spring.io/spring-security) +- spring-context (from https://repo1.maven.org/maven2/org/springframework/spring-context) +- spring-expression (from https://repo1.maven.org/maven2/org/springframework/spring-expression) +- spring-security-config (from https://spring.io/projects/spring-security) - spring-security-core (from https://spring.io/projects/spring-security) -- spring-security-oauth2-client (from https://spring.io/spring-security) -- spring-security-oauth2-core (from https://spring.io/spring-security) -- spring-security-oauth2-jose (from https://spring.io/spring-security) -- spring-security-oauth2-resource-server (from https://spring.io/spring-security) +- spring-security-oauth2-client (from https://spring.io/projects/spring-security) +- spring-security-oauth2-core (from https://spring.io/projects/spring-security) +- spring-security-oauth2-jose (from https://spring.io/projects/spring-security) +- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security) - spring-security-test (from https://spring.io/projects/spring-security) - spring-security-web (from https://spring.io/projects/spring-security) +- spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test) +- spring-tx (from https://repo1.maven.org/maven2/org/springframework/spring-tx) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -631,10 +628,10 @@ The following software have components provided under the terms of this license: - springfox-swagger-ui (from https://github.com/springfox/springfox) - springfox-swagger2 (from https://github.com/springfox/springfox) - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) -- swagger-jaxrs (from ) +- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) - tomcat-embed-core (from http://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -648,13 +645,13 @@ The following software have components provided under the terms of this license: - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) -- Hamcrest Core (from http://hamcrest.org/) +- Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) -- Reflections (from http://code.google.com/p/reflections/) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) -- jaxen (from http://www.cafeconleche.org/jaxen) +- jaxen (from http://jaxen.codehaus.org/) ======================================================================== BSD-3-Clause @@ -664,7 +661,7 @@ The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis/api-common-java) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) -- Apache Groovy (from http://groovy-lang.org) +- Apache Groovy (from https://groovy-lang.org) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) @@ -672,7 +669,7 @@ The following software have components provided under the terms of this license: - Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials) - Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) -- Hamcrest Core (from http://hamcrest.org/) +- Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api) @@ -681,12 +678,12 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) -- Reflections (from http://code.google.com/p/reflections/) +- Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) -- Spring Core (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/SpringSource/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) @@ -696,7 +693,7 @@ The following software have components provided under the terms of this license: - asm-tree (from http://asm.ow2.io/) - asm-util (from http://asm.ow2.io/) - classworlds (from http://classworlds.codehaus.org/) -- jaxen (from http://www.cafeconleche.org/jaxen) +- jaxen (from http://jaxen.codehaus.org/) - jsch (from https://repo1.maven.org/maven2/com/jcraft/jsch) ======================================================================== @@ -751,20 +748,13 @@ The following software have components provided under the terms of this license: - JUnit (from http://junit.org) - System Rules (from http://stefanbirkner.github.io/system-rules/) -======================================================================== -DOC -======================================================================== -The following software have components provided under the terms of this license: - -- JDOM (from http://www.jdom.org) -- Woodstox (from https://github.com/FasterXML/woodstox) - ======================================================================== EPL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- AspectJ Weaver (from https://www.eclipse.org/aspectj/) +- AspectJ weaver (from http://www.aspectj.org) +- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -772,12 +762,11 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from https://junit.org/junit5/) - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) +- Logback Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -789,6 +778,7 @@ EPL-2.0 ======================================================================== The following software have components provided under the terms of this license: +- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -796,7 +786,6 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from https://junit.org/junit5/) - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) ======================================================================== GPL-2.0-only @@ -810,7 +799,7 @@ The following software have components provided under the terms of this license: - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -828,11 +817,11 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - Cobertura (from http://cobertura.sourceforge.net) +- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -841,25 +830,10 @@ GPL-3.0-only ======================================================================== The following software have components provided under the terms of this license: +- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) - -======================================================================== -ImageMagick -======================================================================== -The following software have components provided under the terms of this license: - -- Stax2 API (from http://github.com/FasterXML/stax2-api) -- Woodstox (from https://github.com/FasterXML/woodstox) - -======================================================================== -Info-ZIP -======================================================================== -The following software have components provided under the terms of this license: - -- Apache Ant Core (from https://ant.apache.org/) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) ======================================================================== JSON @@ -880,11 +854,11 @@ The following software have components provided under the terms of this license: - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) +- Logback Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -906,7 +880,7 @@ The following software have components provided under the terms of this license: - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MIT @@ -925,8 +899,6 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - Checker Qual (from https://checkerframework.org) - Checker Qual (from https://checkerframework.org) -- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) -- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -941,7 +913,6 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for Service Bus (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for eventgrid (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) -- Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for KeyVault Keys (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java) @@ -949,22 +920,25 @@ The following software have components provided under the terms of this license: - MongoDB Java Driver Core (from http://www.mongodb.org) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) +- Plexus :: Default Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) - Plexus Default Interactivity Handler (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) - SLF4J API Module (from http://www.slf4j.org) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos) - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java) -- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) +- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/) +- azure-identity (from https://repo1.maven.org/maven2/com/azure/azure-identity) - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) - java jwt (from https://github.com/auth0/java-jwt) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from http://mockito.org) +- mockito-core (from http://mockito.org) - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) +- qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions) - spring-security-core (from https://spring.io/projects/spring-security) ======================================================================== @@ -975,7 +949,7 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MPL-2.0 @@ -984,7 +958,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - okhttp (from https://square.github.io/okhttp/) ======================================================================== @@ -1000,7 +974,7 @@ Public-Domain ======================================================================== The following software have components provided under the terms of this license: -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== @@ -1008,7 +982,7 @@ SAX-PD ======================================================================== The following software have components provided under the terms of this license: -- Apache Ant Core (from https://ant.apache.org/) +- Apache Ant Core (from http://ant.apache.org/) ======================================================================== SPL-1.0 @@ -1024,7 +998,7 @@ W3C ======================================================================== The following software have components provided under the terms of this license: -- Apache Ant Core (from https://ant.apache.org/) +- Apache Ant Core (from http://ant.apache.org/) - JTidy (from http://jtidy.sourceforge.net) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) - xml-apis (from ) @@ -1034,7 +1008,7 @@ WTFPL ======================================================================== The following software have components provided under the terms of this license: -- Reflections (from http://code.google.com/p/reflections/) +- Reflections (from http://github.com/ronmamo/reflections) ======================================================================== public-domain @@ -1057,11 +1031,11 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) -- RabbitMQ Java Client (from https://www.rabbitmq.com) -- Spring Web (from https://github.com/spring-projects/spring-framework) -- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- RabbitMQ Java Client (from http://www.rabbitmq.com) +- Spring Framework: Web (from http://www.springframework.org) +- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - reactive-streams (from http://www.reactive-streams.org/) - xml-apis (from ) @@ -1075,7 +1049,6 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - JSON in Java (from https://github.com/douglascrockford/JSON-java) - JTidy (from http://jtidy.sourceforge.net) -- JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -1084,7 +1057,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - System Rules (from http://stefanbirkner.github.io/system-rules/) - xml-apis (from ) -- GitLab From 8c1d49f4dad7c63f45a05bee3e02b25cd911212e Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Wed, 20 Oct 2021 13:08:50 -0500 Subject: [PATCH 11/19] Fixing notice --- NOTICE | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/NOTICE b/NOTICE index 4fd64c31..9f87480a 100644 --- a/NOTICE +++ b/NOTICE @@ -506,7 +506,8 @@ The following software have components provided under the terms of this license: - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Servlet Specification 2.5 API (from http://jetty.mortbay.org) - SnakeYAML (from http://www.snakeyaml.org) -- Spring Beans (from https://github.com/SpringSource/spring-framework) +- Spring AOP (from https://github.com/spring-projects/spring-framework) +- Spring Beans (from https://github.com/spring-projects/spring-framework) - Spring Boot (from http://projects.spring.io/spring-boot/) - Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) - Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) @@ -519,15 +520,18 @@ The following software have components provided under the terms of this license: - Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat) - Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Core (from https://github.com/SpringSource/spring-framework) +- Spring Context (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/spring-projects/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) +- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) - Spring Framework: JMS (from http://www.springframework.org) -- Spring Framework: Web (from http://www.springframework.org) -- Spring Framework: WebMVC (from http://www.springframework.org) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) +- Spring Transaction (from https://github.com/spring-projects/spring-framework) +- Spring Web (from https://github.com/spring-projects/spring-framework) +- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - Vavr (from http://vavr.io) - Vavr Match (from http://vavr.io) @@ -589,15 +593,14 @@ The following software have components provided under the terms of this license: - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - rxjava (from https://github.com/ReactiveX/RxJava) -- spring-aop (from https://repo1.maven.org/maven2/org/springframework/spring-aop) - spring-boot-actuator (from https://spring.io/projects/spring-boot) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot) @@ -608,8 +611,6 @@ The following software have components provided under the terms of this license: - spring-boot-starter-security (from https://spring.io/projects/spring-boot) - spring-boot-starter-validation (from https://spring.io/projects/spring-boot) - spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) -- spring-context (from https://repo1.maven.org/maven2/org/springframework/spring-context) -- spring-expression (from https://repo1.maven.org/maven2/org/springframework/spring-expression) - spring-security-config (from https://spring.io/projects/spring-security) - spring-security-core (from https://spring.io/projects/spring-security) - spring-security-oauth2-client (from https://spring.io/projects/spring-security) @@ -619,7 +620,6 @@ The following software have components provided under the terms of this license: - spring-security-test (from https://spring.io/projects/spring-security) - spring-security-web (from https://spring.io/projects/spring-security) - spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test) -- spring-tx (from https://repo1.maven.org/maven2/org/springframework/spring-tx) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -683,7 +683,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) -- Spring Core (from https://github.com/SpringSource/spring-framework) +- Spring Core (from https://github.com/spring-projects/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) @@ -1034,7 +1034,7 @@ The following software have components provided under the terms of this license: - Project Lombok (from http://projectlombok.org) - Project Lombok (from http://projectlombok.org) - RabbitMQ Java Client (from http://www.rabbitmq.com) -- Spring Framework: Web (from http://www.springframework.org) +- Spring Web (from https://github.com/spring-projects/spring-framework) - azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - reactive-streams (from http://www.reactive-streams.org/) -- GitLab From b11416a8e2f88f23c2467fe3ba8186860cd3cc51 Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Thu, 26 Aug 2021 14:00:58 -0500 Subject: [PATCH 12/19] properly copy parent pom --- testing/legal-test-aws/build-aws/prepare-dist.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/legal-test-aws/build-aws/prepare-dist.sh b/testing/legal-test-aws/build-aws/prepare-dist.sh index baa16e0c..367e34d3 100755 --- a/testing/legal-test-aws/build-aws/prepare-dist.sh +++ b/testing/legal-test-aws/build-aws/prepare-dist.sh @@ -21,7 +21,8 @@ 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 -ntp install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml +mvn -ntp clean install -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" -pl legal-test-core,legal-test-aws -am +# 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 -ntp install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh) -- GitLab From 9a568752f02259dcfd359cb445b70134370a8397 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 14 Oct 2021 15:58:20 +0000 Subject: [PATCH 13/19] Compliance Trigger Fix commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- .../osdu/legal/api/LegalTagStatusJobApi.java | 6 +-- .../osdu/legal/logging/AuditLoggerTests.java | 8 +++- .../legal/aws/jobs/AwsStatusChangedTag.java | 30 ++++++++++++ .../legal/aws/jobs/LegalTagPublisherImpl.java | 13 +++-- .../LegalTagRepositoryFactoryAwsImpl.java | 48 +++++++++++++++++++ .../dataaccess/LegalTagRepositoryImpl.java | 32 +++++++++++-- .../aws/api/LegalTagRepositoryImplTest.java | 9 +++- 7 files changed, 132 insertions(+), 14 deletions(-) create mode 100644 provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java create mode 100644 provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java b/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java index 33103d97..90099678 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/api/LegalTagStatusJobApi.java @@ -51,7 +51,7 @@ public class LegalTagStatusJobApi { boolean allPassed = true; for (TenantInfo tenantInfo : tenantsInfo) { convertedHeaders.put(DpsHeaders.ACCOUNT_ID, tenantInfo.getName()); - boolean result = runJob(convertedHeaders, legalTagStatusJob); + boolean result = runJob(convertedHeaders, tenantInfo, legalTagStatusJob); if (allPassed) allPassed = result; } @@ -60,11 +60,11 @@ public class LegalTagStatusJobApi { return new ResponseEntity(status); } - private boolean runJob(DpsHeaders convertedHeaders, LegalTagStatusJob legalTagStatusJob) { + private boolean runJob(DpsHeaders convertedHeaders, TenantInfo tenantInfo, LegalTagStatusJob legalTagStatusJob) { boolean success = true; try { String projectId = requestInfo.getTenantInfo().getProjectId(); - StatusChangedTags result = legalTagStatusJob.run(projectId, convertedHeaders, requestInfo.getTenantInfo().getName()); + StatusChangedTags result = legalTagStatusJob.run(projectId, convertedHeaders, tenantInfo.getName()); auditLogger.legalTagJobRanSuccess(singletonList(result.toString())); } catch (Exception e) { success = false; diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java index 5d5220ea..038a5710 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/logging/AuditLoggerTests.java @@ -11,6 +11,8 @@ import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import java.util.Collections; import java.util.List; + +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -67,13 +69,15 @@ public class AuditLoggerTests { @Test public void should_writeLegalTagReadPropertiesSuccessEvent(){ - sut.readLegalPropertiesSuccess(any()); + List resource = Collections.singletonList("1"); + sut.readLegalPropertiesSuccess(resource); verify(log).audit(any()); } @Test public void should_writeLegalTagReadPropertiesFailEvent(){ - sut.readLegalPropertiesFail(any()); + List resource = Collections.singletonList("1"); + sut.readLegalPropertiesFail(resource); verify(log).audit(any()); } diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java new file mode 100644 index 00000000..e6882f4d --- /dev/null +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/AwsStatusChangedTag.java @@ -0,0 +1,30 @@ +// Copyright © Amazon +// +// 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. + +package org.opengroup.osdu.legal.aws.jobs; + +import lombok.Data; +import org.opengroup.osdu.core.common.model.legal.StatusChangedTag; + +@Data +public class AwsStatusChangedTag extends StatusChangedTag { + + private String dataPartitionId; + + public AwsStatusChangedTag(String changedTagName, Enum changedTagStatus, String dataPartitionId) { + super(changedTagName, changedTagStatus); + this.dataPartitionId = dataPartitionId; + } +} + diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java index a130bd8f..2ba9af9c 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/jobs/LegalTagPublisherImpl.java @@ -30,9 +30,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import javax.inject.Inject; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service public class LegalTagPublisherImpl implements ILegalTagPublisher { @@ -43,7 +45,8 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher { private AmazonSNS snsClient; - + @Inject + private DpsHeaders headers; @PostConstruct public void init() throws K8sParameterNotFoundException { @@ -75,9 +78,13 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher { for (int i = 0; i < tags.getStatusChangedTags().size(); i += BATCH_SIZE){ List batch = tags.getStatusChangedTags().subList(i, Math.min(tags.getStatusChangedTags().size(), i + BATCH_SIZE)); - PublishRequestBuilder publishRequestBuilder = new PublishRequestBuilder<>(); + List awsBatch = batch.stream() + .map(t -> new AwsStatusChangedTag(t.getChangedTagName(), t.getChangedTagStatus(), headers.getPartitionId())) + .collect(Collectors.toList()); + + PublishRequestBuilder publishRequestBuilder = new PublishRequestBuilder<>(); PublishRequest publishRequest = publishRequestBuilder.generatePublishRequest("statusChangedTags", - batch, messageAttributes, amazonSNSTopic); + awsBatch, messageAttributes, amazonSNSTopic); snsClient.publish(publishRequest); } } diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java new file mode 100644 index 00000000..33c01883 --- /dev/null +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java @@ -0,0 +1,48 @@ +package org.opengroup.osdu.legal.aws.tags.dataaccess; + + +import org.apache.commons.lang3.StringUtils; +import org.opengroup.osdu.core.common.model.http.AppException; +import org.opengroup.osdu.core.common.model.http.DpsHeaders; +import org.opengroup.osdu.core.common.model.tenant.TenantInfo; +import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory; +import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; +import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +import javax.inject.Inject; + +@Service +@Primary +public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory { + + + private TenantInfo tenantInfo; + private ITenantFactory tenantFactory; + + @Inject + LegalTagRepositoryImpl repoImpl; + + public LegalTagRepositoryFactoryAwsImpl(TenantInfo tenantInfo, ITenantFactory tenantFactory) { + this.tenantInfo = tenantInfo; + this.tenantFactory = tenantFactory; + } + + @Override + public ILegalTagRepository get(String tenantName) { + if (StringUtils.isBlank(tenantName)) { + throw invalidTenantGivenException(tenantName); + } + TenantInfo tenantInfo = tenantFactory.getTenantInfo(tenantName); + repoImpl.setTenantInfo(tenantInfo); + + return repoImpl; + } + + AppException invalidTenantGivenException(String tenantName) { + return new AppException(403, "Forbidden", + String.format("You do not have access to the %s value given %s", + DpsHeaders.ACCOUNT_ID, tenantName)); + } +} diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java index 8bebf917..207cf5ab 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java @@ -21,13 +21,17 @@ import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2; import org.opengroup.osdu.core.aws.dynamodb.QueryPageResult; +import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.core.common.model.legal.ListLegalTagArgs; import org.opengroup.osdu.core.common.model.legal.LegalTag; import org.opengroup.osdu.core.common.model.http.AppException; +import org.opengroup.osdu.core.common.model.tenant.TenantInfo; +import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory; import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Repository; import javax.annotation.PostConstruct; @@ -41,14 +45,32 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { @Inject private DpsHeaders headers; + @Inject + private JaxRsDpsLog log; + + private TenantInfo tenantInfo; + @Inject private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory; @Value("${aws.dynamodb.legalTable.ssm.relativePath}") String legalRepositoryTableParameterRelativePath; + public void setTenantInfo(TenantInfo tenantInfo) { + this.tenantInfo = tenantInfo; + } + + private String getDataPartitionId(){ + if(this.tenantInfo == null){ + log.warning("TenantInfo found to be null, defaulting to partition in headers"); + return headers.getPartitionId(); + } + return tenantInfo.getDataPartitionId(); + } + private DynamoDBQueryHelperV2 getLegalRepositoryQueryHelper() { - return dynamoDBQueryHelperFactory.getQueryHelperForPartition(headers, legalRepositoryTableParameterRelativePath); + String dataPartitionId = getDataPartitionId(); + return dynamoDBQueryHelperFactory.getQueryHelperForPartition(dataPartitionId, legalRepositoryTableParameterRelativePath); } @@ -72,7 +94,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { List tags = new ArrayList<>(); for(long id: ids) { - LegalDoc ld = queryHelper.loadByPrimaryKey(LegalDoc.class, String.valueOf(id), headers.getPartitionId()); //dynamoDBLegal.findById(String.valueOf(id)); + LegalDoc ld = queryHelper.loadByPrimaryKey(LegalDoc.class, String.valueOf(id), getDataPartitionId()); //dynamoDBLegal.findById(String.valueOf(id)); if(ld != null) { tags.add(CreateLegalTagFromDoc(ld)); } @@ -87,7 +109,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { Boolean result = true; try { - queryHelper.deleteByPrimaryKey(LegalDoc.class, String.valueOf(legalTag.getId()), headers.getPartitionId()); + queryHelper.deleteByPrimaryKey(LegalDoc.class, String.valueOf(legalTag.getId()), getDataPartitionId()); } catch (Exception e){ // should be dynamodb specific exception result = false; // might need to throw app exception @@ -108,7 +130,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { String filterExpression = "dataPartitionId = :partitionId"; - AttributeValue dataPartitionAttributeValue = new AttributeValue(headers.getPartitionId()); + AttributeValue dataPartitionAttributeValue = new AttributeValue(getDataPartitionId()); Map eav = new HashMap<>(); eav.put(":partitionId", dataPartitionAttributeValue); @@ -162,7 +184,7 @@ public class LegalTagRepositoryImpl implements ILegalTagRepository { private LegalDoc CreateLegalDocFromTag(LegalTag legalTag){ LegalDoc legalDoc = new LegalDoc(); legalDoc.setId(String.valueOf(legalTag.getId())); - legalDoc.setDataPartitionId(headers.getPartitionId()); + legalDoc.setDataPartitionId(getDataPartitionId()); legalDoc.setDescription(legalTag.getDescription()); legalDoc.setName(legalTag.getName()); legalDoc.setProperties(legalTag.getProperties()); diff --git a/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java b/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java index 03abdf8a..3e6ed3dd 100644 --- a/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java +++ b/provider/legal-aws/src/test/java/org/opengroup/osdu/legal/aws/api/LegalTagRepositoryImplTest.java @@ -24,6 +24,7 @@ import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory; import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2; import org.opengroup.osdu.core.aws.dynamodb.QueryPageResult; +import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.core.common.model.http.DpsHeaders; import org.opengroup.osdu.legal.aws.tags.dataaccess.LegalDoc; import org.opengroup.osdu.legal.aws.tags.dataaccess.LegalTagRepositoryImpl; @@ -50,14 +51,20 @@ public class LegalTagRepositoryImplTest { @Mock private DpsHeaders headers; + @Mock + private JaxRsDpsLog log; + @Mock private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory; @Before public void setUp() { initMocks(this); - Mockito.when(dynamoDBQueryHelperFactory.getQueryHelperForPartition(Mockito.any(DpsHeaders.class), Mockito.any())) + String testPartition = "test-partition"; + Mockito.when(dynamoDBQueryHelperFactory.getQueryHelperForPartition(Mockito.eq(testPartition), Mockito.any())) .thenReturn(queryHelper); + Mockito.when(headers.getPartitionId()) + .thenReturn(testPartition); } @Test -- GitLab From a75678f9caea2d9d7b08693ab0fb2810ae978e35 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 14 Oct 2021 20:38:13 +0000 Subject: [PATCH 14/19] Legal int test fix commit bb5e4245 Author: Spencer Sutton Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit d8d0fd56 Author: Spencer Sutton Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) Fixing broken unit test commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- .../test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java index fef96a52..0a1c0b31 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java @@ -49,7 +49,7 @@ public class AwsSqsHelper { // comes wrapped in non-escaped double quotes data = data.substring(1); data = data.substring(0, data.length() - 1); - String dataCheck = "{\"statusChangedTags\":[{\"changedTagName\":\"" + name + "\",\"changedTagStatus\":\"incompliant\"}]}"; + String dataCheck = "{\"statusChangedTags\":[{\"dataPartitionId\":\"" + TestUtils.getMyDataPartition() + "\",\"changedTagName\":\"" + name + "\",\"changedTagStatus\":\"incompliant\"}]}"; dataCheck = dataCheck.replaceAll("\"", "\\\\\""); return data.equals(dataCheck); } -- GitLab From 800706a36651ddda81bddb0cc2c5f958b8d4363a Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Fri, 15 Oct 2021 19:49:34 +0000 Subject: [PATCH 15/19] RequestScope fix for AWS legal repo factory commit 1c6097e5 Author: Spencer Sutton Date: Fri Oct 15 2021 14:46:06 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit 8e1b36f7 Author: Spencer Sutton Date: Fri Oct 15 2021 14:45:31 GMT-0500 (Central Daylight Time) Fixing int tests commit 88c9315c Author: Spencer Sutton Date: Fri Oct 15 2021 13:46:33 GMT-0500 (Central Daylight Time) Disabling sonar commit 8a69da05 Author: Spencer Sutton Date: Fri Oct 15 2021 13:45:51 GMT-0500 (Central Daylight Time) Testing int test failure commit bb5e4245 Author: Spencer Sutton Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger commit d8d0fd56 Author: Spencer Sutton Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) Fixing broken unit test commit 36b1e2f7 Author: Spencer Sutton Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) Adding log warning commit 3a0c1745 Author: Spencer Sutton Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) Fixing problem where data partitions got stuck across calls commit 9dbff512 Author: Spencer Sutton Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) Fixing bug with compliance process, partitions weren't handled right commit b663408a Author: Spencer Sutton Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) Adding custom class to include data partition --- provider/legal-aws/build-aws/buildspec.yaml | 4 ++-- .../aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java | 2 ++ .../legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/provider/legal-aws/build-aws/buildspec.yaml b/provider/legal-aws/build-aws/buildspec.yaml index 731961d4..4c1fa849 100644 --- a/provider/legal-aws/build-aws/buildspec.yaml +++ b/provider/legal-aws/build-aws/buildspec.yaml @@ -65,9 +65,9 @@ phases: - printenv - echo "Building primary service assemblies..." - - mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} + - mvn -ntp -B test install sonar:sonar -pl .,legal-core,provider/legal-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -# Suspended until further notice + # Suspended until further notice # - echo "Copying assemblies to dist..." # - cp ./provider/legal-aws/target/*spring-boot.jar ${OUTPUT_DIR}/bin # copy aws jars # - cp ./legal-core/target/*.jar ${OUTPUT_DIR}/bin # copy core jar diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java index 33c01883..48e66dc4 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryFactoryAwsImpl.java @@ -10,11 +10,13 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepositoryFactory; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; +import org.springframework.web.context.annotation.RequestScope; import javax.inject.Inject; @Service @Primary +@RequestScope public class LegalTagRepositoryFactoryAwsImpl implements ILegalTagRepositoryFactory { diff --git a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java index 207cf5ab..691a0e76 100644 --- a/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java +++ b/provider/legal-aws/src/main/java/org/opengroup/osdu/legal/aws/tags/dataaccess/LegalTagRepositoryImpl.java @@ -33,6 +33,7 @@ import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Repository; +import org.springframework.web.context.annotation.RequestScope; import javax.annotation.PostConstruct; import javax.inject.Inject; @@ -40,6 +41,7 @@ import java.io.UnsupportedEncodingException; import java.util.*; @Repository // why use repository over component over service +@RequestScope public class LegalTagRepositoryImpl implements ILegalTagRepository { @Inject -- GitLab From f739c1b2a27559d14be7632745786744c24eb09b Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Tue, 26 Oct 2021 15:19:11 -0500 Subject: [PATCH 16/19] Merge conflict --- NOTICE | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/NOTICE b/NOTICE index 622c757b..f109b572 100644 --- a/NOTICE +++ b/NOTICE @@ -413,8 +413,8 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) -- Jetty Server (from http://jetty.mortbay.org) -- Jetty Utilities (from http://jetty.mortbay.org) +- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) +- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) @@ -504,19 +504,15 @@ The following software have components provided under the terms of this license: - Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) - Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Context (from https://github.com/spring-projects/spring-framework) -- Spring Core (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/SpringSource/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) -- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) -- Spring JMS (from https://github.com/spring-projects/spring-framework) +- Spring Framework: JMS (from http://www.springframework.org) +- Spring Framework: Web (from http://www.springframework.org) +- Spring Framework: WebMVC (from http://www.springframework.org) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) -- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) -- Spring Transaction (from https://github.com/spring-projects/spring-framework) -- Spring Web (from https://github.com/spring-projects/spring-framework) -- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - Vavr (from http://vavr.io) - Vavr Match (from http://vavr.io) @@ -543,7 +539,7 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amznlabs/ion-java/) - ion-java (from https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://github.com/FasterXML/jackson) +- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) @@ -552,8 +548,8 @@ The following software have components provided under the terms of this license: - lettuce (from http://github.com/mp911de/lettuce/wiki) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from http://mockito.org) +- mockito-core (from http://mockito.org) - okhttp (from https://square.github.io/okhttp/) - okhttp-logging-interceptor (from https://square.github.io/okhttp/) - okhttp-urlconnection (from https://square.github.io/okhttp/) @@ -583,7 +579,6 @@ The following software have components provided under the terms of this license: - spring-boot (from https://spring.io/projects/spring-boot) - spring-boot-actuator (from https://spring.io/projects/spring-boot) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) -- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot) - spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) @@ -618,7 +613,7 @@ The following software have components provided under the terms of this license: - swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) - tomcat-embed-core (from http://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -671,7 +666,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) -- Spring Core (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/SpringSource/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) @@ -787,7 +782,7 @@ The following software have components provided under the terms of this license: - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -808,7 +803,7 @@ The following software have components provided under the terms of this license: - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -867,7 +862,7 @@ The following software have components provided under the terms of this license: - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MIT @@ -919,8 +914,8 @@ The following software have components provided under the terms of this license: - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) - java jwt (from http://www.jwt.io) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from http://mockito.org) +- mockito-core (from http://mockito.org) - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) @@ -935,7 +930,7 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MPL-2.0 @@ -944,7 +939,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - okhttp (from https://square.github.io/okhttp/) ======================================================================== @@ -1043,7 +1038,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - System Rules (from http://stefanbirkner.github.io/system-rules/) - xml-apis (from ) -- GitLab From 7e3f4cfe83b17027b52ce14ce72771ec65e01661 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Tue, 26 Oct 2021 15:19:30 -0500 Subject: [PATCH 17/19] Merge conflict --- NOTICE | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/NOTICE b/NOTICE index f109b572..d06e8d75 100644 --- a/NOTICE +++ b/NOTICE @@ -504,15 +504,18 @@ The following software have components provided under the terms of this license: - Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) - Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Core (from https://github.com/SpringSource/spring-framework) +- Spring Context (from https://github.com/spring-projects/spring-framework) +- Spring Core (from https://github.com/spring-projects/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) +- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) - Spring Framework: JMS (from http://www.springframework.org) -- Spring Framework: Web (from http://www.springframework.org) -- Spring Framework: WebMVC (from http://www.springframework.org) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) +- Spring Transaction (from https://github.com/spring-projects/spring-framework) +- Spring Web (from https://github.com/spring-projects/spring-framework) +- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - Vavr (from http://vavr.io) - Vavr Match (from http://vavr.io) @@ -568,11 +571,11 @@ The following software have components provided under the terms of this license: - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://github.com/resilience4j/resilience4j) - rxjava (from https://github.com/ReactiveX/RxJava) @@ -666,7 +669,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) -- Spring Core (from https://github.com/SpringSource/spring-framework) +- Spring Core (from https://github.com/spring-projects/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) -- GitLab From 3a62966a6d4487e7eab6a6a4dbea09d4292a4a2a Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Wed, 27 Oct 2021 08:53:44 -0500 Subject: [PATCH 18/19] Updating notice --- NOTICE | 142 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/NOTICE b/NOTICE index 08707afe..270439da 100644 --- a/NOTICE +++ b/NOTICE @@ -289,8 +289,8 @@ The following software have components provided under the terms of this license: - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) - Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava) - Apache Ant + JUnit (from http://ant.apache.org/) -- Apache Ant Core (from http://ant.apache.org/) -- Apache Ant Launcher (from http://ant.apache.org/) +- Apache Ant Core (from https://ant.apache.org/) +- Apache Ant Launcher (from https://ant.apache.org/) - Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) @@ -303,7 +303,9 @@ The following software have components provided under the terms of this license: - Apache Commons Text (from https://commons.apache.org/proper/commons-text) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) - Apache Groovy (from https://groovy-lang.org) -- Apache HttpClient (from http://hc.apache.org/httpcomponents-client) +- Apache Groovy (from https://groovy-lang.org) +- Apache Groovy (from https://groovy-lang.org) +- Apache HTTP transport v2 for the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2) - Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client) - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) @@ -311,10 +313,12 @@ The following software have components provided under the terms of this license: - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) - Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl) - Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j) -- Apache Maven Reporting Implementation (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-impl) - Apache Maven Wagon :: API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api) - Apache Maven Wagon :: Providers :: File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file) - Apache Maven Wagon :: Providers :: HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared) +- Apache Maven Wagon :: Providers :: SSH Common Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common) +- Apache Maven Wagon :: Providers :: SSH External Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-external) +- Apache Maven Wagon :: Providers :: SSH Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh) - Apache Velocity (from http://velocity.apache.org/engine/devel/) - AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) - Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) @@ -330,7 +334,7 @@ The following software have components provided under the terms of this license: - Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) - Cloud Key Management Service (KMS) API v1-rev20210820-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) -- Cloud Storage JSON API v1-rev20200814-1.30.10 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20210918-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava) - Cobertura (from http://cobertura.sourceforge.net) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) @@ -339,14 +343,15 @@ The following software have components provided under the terms of this license: - Commons Validator (from http://commons.apache.org/validator/) - Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) -- Doxia :: APT Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/) -- Doxia :: Core (from http://maven.apache.org/doxia/doxia/doxia-core/) -- Doxia :: FML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/) +- Digester (from https://repo1.maven.org/maven2/commons-digester/commons-digester) +- Doxia :: APT Module (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-module-apt) +- Doxia :: Core (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-core) +- Doxia :: FML Module (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-module-fml) - Doxia :: Sink API (from http://maven.apache.org/doxia/doxia/doxia-sink-api/) -- Doxia :: XDoc Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/) -- Doxia :: XHTML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/) -- Doxia Sitetools :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/) -- Doxia Sitetools :: Site Renderer (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-site-renderer) +- Doxia :: XDoc Module (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-module-xdoc) +- Doxia :: XHTML Module (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-module-xhtml) +- Doxia Sitetools :: Decoration Model (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-decoration-model) +- Doxia Sitetools :: Site Renderer Component (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-site-renderer) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson) @@ -354,17 +359,13 @@ The following software have components provided under the terms of this license: - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) - Google Cloud Core (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) -- Google Cloud Core HTTP (from https://github.com/googleapis/java-core) - Google Cloud Core gRPC (from https://github.com/googleapis/java-core) -- Google Cloud Core gRPC (from https://github.com/googleapis/java-core) -- Google Cloud Datastore (from https://github.com/googleapis/java-datastore) - Google Cloud Datastore (from https://github.com/googleapis/java-datastore) - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials) - Google Cloud Logging (from https://github.com/googleapis/java-logging) - Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub) -- Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub) -- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) -- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) +- Google Cloud Storage (from https://github.com/googleapis/java-storage) +- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) - Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client) - Gson (from http://code.google.com/p/google-gson/) @@ -374,11 +375,11 @@ The following software have components provided under the terms of this license: - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- HttpClient (from http://hc.apache.org/httpcomponents-client) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) -- Identity and Access Management (IAM) API v1-rev20191010-1.30.3 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) - J2ObjC Annotations (from https://github.com/google/j2objc/) - J2ObjC Annotations (from https://github.com/google/j2objc/) - JBoss Logging 3 (from http://www.jboss.org) @@ -397,9 +398,9 @@ The following software have components provided under the terms of this license: - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) -- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) +- Jackson-core (from https://github.com/FasterXML/jackson) - Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml) -- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) +- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) @@ -412,8 +413,8 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) -- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) -- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) +- Jetty Server (from http://jetty.mortbay.org) +- Jetty Utilities (from http://jetty.mortbay.org) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) @@ -477,7 +478,7 @@ The following software have components provided under the terms of this license: - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) - Objenesis (from http://objenesis.org) -- Okio (from https://github.com/square/okio/) +- OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -493,34 +494,26 @@ The following software have components provided under the terms of this license: - PowerMock (from http://www.powermock.org) - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) - QpidJMS Client (from https://repo1.maven.org/maven2/org/apache/qpid/qpid-jms-client) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Servlet Specification 2.5 API (from http://jetty.mortbay.org) - SnakeYAML (from http://www.snakeyaml.org) - Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) -- Spring Boot (from http://projects.spring.io/spring-boot/) -- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) -- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) -- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/) -- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Test (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat) -- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) +- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) +- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb) - Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) -- Spring Framework: JMS (from http://www.springframework.org) +- Spring JMS (from https://github.com/spring-projects/spring-framework) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) +- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) - Spring Transaction (from https://github.com/spring-projects/spring-framework) - Spring Web (from https://github.com/spring-projects/spring-framework) - Spring Web MVC (from https://github.com/spring-projects/spring-framework) @@ -533,7 +526,6 @@ The following software have components provided under the terms of this license: - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) - aalto-xml (from ) -- commons-digester (from https://repo1.maven.org/maven2/commons-digester/commons-digester) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) @@ -551,7 +543,7 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amznlabs/ion-java/) - ion-java (from https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) @@ -560,11 +552,12 @@ The following software have components provided under the terms of this license: - lettuce (from http://github.com/mp911de/lettuce/wiki) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from http://mockito.org) -- mockito-core (from http://mockito.org) +- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from https://github.com/mockito/mockito) - okhttp (from https://square.github.io/okhttp/) - okhttp-logging-interceptor (from https://square.github.io/okhttp/) - okhttp-urlconnection (from https://square.github.io/okhttp/) +- okio (from https://github.com/square/okio/) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) @@ -575,38 +568,45 @@ The following software have components provided under the terms of this license: - proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1) - proto-google-cloud-logging-v2 (from https://github.com/googleapis/java-logging/proto-google-cloud-logging-v2) - proto-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1) -- proto-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1) - proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - rxjava (from https://github.com/ReactiveX/RxJava) +- spring-boot (from https://spring.io/projects/spring-boot) - spring-boot-actuator (from https://spring.io/projects/spring-boot) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) +- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot) +- spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) - spring-boot-starter-aop (from https://spring.io/projects/spring-boot) - spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) -- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) +- spring-boot-starter-json (from https://spring.io/projects/spring-boot) +- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot) +- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) - spring-boot-starter-security (from https://spring.io/projects/spring-boot) +- spring-boot-starter-test (from https://spring.io/projects/spring-boot) +- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot) - spring-boot-starter-validation (from https://spring.io/projects/spring-boot) -- spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) -- spring-security-config (from https://spring.io/projects/spring-security) -- spring-security-core (from https://spring.io/projects/spring-security) -- spring-security-oauth2-client (from https://spring.io/projects/spring-security) -- spring-security-oauth2-core (from https://spring.io/projects/spring-security) -- spring-security-oauth2-jose (from https://spring.io/projects/spring-security) -- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security) -- spring-security-test (from https://spring.io/projects/spring-security) -- spring-security-web (from https://spring.io/projects/spring-security) -- spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test) +- spring-boot-starter-web (from https://spring.io/projects/spring-boot) +- spring-boot-test (from https://spring.io/projects/spring-boot) +- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot) +- spring-security-config (from https://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) +- spring-security-oauth2-client (from https://spring.io/spring-security) +- spring-security-oauth2-core (from https://spring.io/spring-security) +- spring-security-oauth2-jose (from https://spring.io/spring-security) +- spring-security-oauth2-resource-server (from https://spring.io/spring-security) +- spring-security-test (from https://spring.io/spring-security) +- spring-security-web (from https://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -618,7 +618,7 @@ The following software have components provided under the terms of this license: - swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) - tomcat-embed-core (from http://tomcat.apache.org/) -- tomcat-embed-websocket (from https://tomcat.apache.org/) +- tomcat-embed-websocket (from http://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -667,6 +667,7 @@ The following software have components provided under the terms of this license: - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) +- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) @@ -688,7 +689,6 @@ CC-BY-2.5 ======================================================================== The following software have components provided under the terms of this license: -- Checker Qual (from https://checkerframework.org) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - MongoDB Java Driver Core (from http://www.mongodb.org) @@ -786,7 +786,7 @@ The following software have components provided under the terms of this license: - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -807,7 +807,7 @@ The following software have components provided under the terms of this license: - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -866,7 +866,7 @@ The following software have components provided under the terms of this license: - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) ======================================================================== MIT @@ -884,7 +884,6 @@ The following software have components provided under the terms of this license: - Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java) - Checker Qual (from https://checkerframework.org) - Checker Qual (from https://checkerframework.org) -- Checker Qual (from https://checkerframework.org) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -919,13 +918,13 @@ The following software have components provided under the terms of this license: - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) - java jwt (from http://www.jwt.io) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) -- mockito-core (from http://mockito.org) -- mockito-core (from http://mockito.org) +- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from https://github.com/mockito/mockito) - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) - qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions) -- spring-security-core (from https://spring.io/projects/spring-security) +- spring-security-core (from https://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -935,7 +934,7 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) ======================================================================== MPL-2.0 @@ -944,7 +943,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - okhttp (from https://square.github.io/okhttp/) ======================================================================== @@ -968,15 +967,13 @@ SAX-PD ======================================================================== The following software have components provided under the terms of this license: -- Apache Ant Core (from http://ant.apache.org/) +- Apache Ant Core (from https://ant.apache.org/) ======================================================================== SPL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- Checker Qual (from https://checkerframework.org) -- Checker Qual (from https://checkerframework.org) - Servlet Specification 2.5 API (from http://jetty.mortbay.org) ======================================================================== @@ -984,7 +981,7 @@ W3C ======================================================================== The following software have components provided under the terms of this license: -- Apache Ant Core (from http://ant.apache.org/) +- Apache Ant Core (from https://ant.apache.org/) - JTidy (from http://jtidy.sourceforge.net) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) - xml-apis (from ) @@ -1019,7 +1016,7 @@ The following software have components provided under the terms of this license: - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) - Project Lombok (from http://projectlombok.org) - Project Lombok (from http://projectlombok.org) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - Spring Web (from https://github.com/spring-projects/spring-framework) - azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) @@ -1033,6 +1030,7 @@ The following software have components provided under the terms of this license: - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) +- Checker Qual (from https://checkerframework.org) - JSON in Java (from https://github.com/douglascrockford/JSON-java) - JTidy (from http://jtidy.sourceforge.net) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) @@ -1043,7 +1041,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api) -- RabbitMQ Java Client (from http://www.rabbitmq.com) +- RabbitMQ Java Client (from https://www.rabbitmq.com) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - System Rules (from http://stefanbirkner.github.io/system-rules/) - xml-apis (from ) -- GitLab From d34c8daf87e86778f7b9b90a70620eb65cc3e656 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 28 Oct 2021 09:49:17 -0500 Subject: [PATCH 19/19] Notice changed again? --- NOTICE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 440b3f59..96b5625e 100644 --- a/NOTICE +++ b/NOTICE @@ -585,12 +585,12 @@ The following software have components provided under the terms of this license: - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) - rxjava (from https://github.com/ReactiveX/RxJava) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot) -- GitLab