Merge branch 'remove-aws-maven-settings' into 'master'

remove aws maven setting

See merge request !508

NOTICE

@@ -514,7 +514,6 @@ GPL-2.0-only
 The following software have components provided under the terms of this license:
 
 - JBoss Jakarta Annotations API (from <https://github.com/jboss/jboss-jakarta-annotations-api_spec>, https://github.com/jboss/jboss-jakarta-annotations-api_spec)
-- Jakarta RESTful WS API (from https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
 - Jakarta WebSocket - Client API (from https://projects.eclipse.org/projects/ee4j.websocket)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
 
@@ -642,7 +641,7 @@ The following software have components provided under the terms of this license:
 - mockito-inline (from http://mockito.org, 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)
+- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java, https://github.com/AzureAD/microsoft-authentication-library-for-java)
 - qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
 
 ========================================================================
@@ -700,7 +699,6 @@ gpl-2.0-classpath
 The following software have components provided under the terms of this license:
 
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
-- Jakarta RESTful WS API (from https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
 - Jakarta Validation API (from https://beanvalidation.org)
 - Jakarta WebSocket - Client API (from https://projects.eclipse.org/projects/ee4j.websocket)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)

pom.xml

@@ -210,9 +210,9 @@
 		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>4.0.5</version>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
+				<version>8.0.2</version>
 				<executions>
 					<execution>
 						<goals>

provider/notification-aws/build-aws/buildspec.yaml

@@ -36,9 +36,7 @@ phases:
       - java -version
       - mvn -version
       - mkdir -p /root/.m2
-      - cp ./provider/notification-aws/maven/settings.xml /root/.m2/settings.xml # copy the AWS-specific settings.xml to the CodeBuild instance's .m2 folder
-      - export AWS_ACCOUNT_ID=`aws sts get-caller-identity | grep Account | cut -d':' -f 2 | cut -d'"' -f 2`
-      - export AWS_OSDU_DEV_MAVEN_AUTH_TOKEN=`aws codeartifact get-authorization-token --domain $AWS_OSDU_DEV_MAVEN_DOMAIN --domain-owner $AWS_ACCOUNT_ID --query authorizationToken --output text`
+      - cp ./.mvn/community-maven.settings.xml /root/.m2/settings.xml
       # Install git secrets
 
       - git clone https://github.com/awslabs/git-secrets.git
@@ -74,7 +72,7 @@ phases:
 
       - echo "Building primary service assemblies..."
       - mvn --no-transfer-progress -ntp -B test install -pl .,notification-core,provider/notification-aws -Ddeployment.environment=prod  
-      - mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -Dsonar.scm.provider=git -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME}
+      - mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -Dsonar.scm.provider=git -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
   
       - echo "Building integration testing assemblies and gathering artifacts..."
       - ./testing/notification-test-aws/build-aws/prepare-dist.sh

provider/notification-aws/maven/settings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.​
-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.
-
--->
-
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-    <profiles>
-        <profile>
-            <id>aws-osdu-dev-maven</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>aws-osdu-dev-maven</id>
-                    <url>${env.AWS_OSDU_DEV_MAVEN_URL}</url>
-                </repository>
-                <repository>
-                    <id>gitlab-os-core-common-maven</id>
-                    <url>https://community.opengroup.org/api/v4/projects/67/packages/maven</url>
-                </repository>
-                <repository>
-                    <id>gitlab-os-core-lib-aws-maven</id>
-                    <url>https://community.opengroup.org/api/v4/projects/68/packages/maven</url>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>credentialsConfiguration</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <deployment.environment>dev</deployment.environment>
-                <aws.accessKeyId>no-default</aws.accessKeyId>
-                <aws.secretKey>no-default</aws.secretKey>
-                <azure.devops.username>Another-Access-Token-2021</azure.devops.username>
-                <azure.devops.token>no-default</azure.devops.token>
-            </properties>
-        </profile>
-        <profile>
-            <id>sonar</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <sonar.host.url>
-                    ${env.SONAR_URL}
-                </sonar.host.url>
-            </properties>
-        </profile>
-    </profiles>
-
-    <servers>
-        <server>
-            <id>aws-osdu-dev-maven</id>
-            <username>aws</username>
-            <password>${env.AWS_OSDU_DEV_MAVEN_AUTH_TOKEN}</password>
-        </server>
-    </servers>
-
-    <mirrors>
-        <mirror>
-            <id>aws-osdu-dev-maven</id>
-            <name>aws-osdu-dev-maven</name>
-            <url>https://osdu-dev-${AWS_ACCOUNT_ID}.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/</url>
-            <mirrorOf>central,!gitlab-os-core-common-maven,!gitlab-os-core-lib-aws-maven</mirrorOf>
-        </mirror>
-    </mirrors>
-
-    <activeProfiles>
-        <activeProfile>credentialsConfiguration</activeProfile>
-    </activeProfiles>
-
-</settings>
\ No newline at end of file