From b192001b948f37914acd45e5d40fa4f34f2db721 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Mon, 26 Feb 2024 16:13:29 +0530
Subject: [PATCH 01/15] Revert "Update README.md"

This reverts commit 8d22a266ff847c40cf27e84f4b44769006a099e3.
---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cce2f8af..7995570d 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,9 @@ To report an issue, please go to [issues](https://github.com/Esri/geoportal-serv
 The nature of the Harvester application is, as the name suggests, to harvest metadata from whatever web endpoints it is provided. The list(s) of endpoints to download metadata from can also be provided by external entities over the internet. Neither the metadata being harvested nor the list(s) of endpoints provided by external entities are vetted or checked by the Harvester. **Users who wish to limit the scope of the Harvester's reach should configure the network or machine where the Harvester is located with allow lists or deny lists of web endpoints to prevent the Harvester from reaching undesirable locations.**
 
 ## Releases and Downloads
-- 2.7.1 - December 21, 2023, [release notes](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1). 
-- 2.7.0 - June 13, 2021. 
-- 2.6.5 - July 13, 2021. 
-- 2.6.4 - July 8, 2020. 
+- 2.7.0 - June 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
+- 2.6.5 - July 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.5) for release notes and downloads. 
+- 2.6.4 - July 8, 2020, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.4) for release notes and downloads. 
 
 ## Features
 

From 5d69203ca353ad643cff4411daf723b279fb3000 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Mon, 26 Feb 2024 22:11:18 +0530
Subject: [PATCH 02/15] Added ArcGIS OAuth2 Login

---
 .../geoportal-harvester-war/pom.xml           |  15 +++
 .../security/ArcGISOAuth2LoginConfig.java     |  71 ++++++++++++
 .../CustomAccessTokenResponseConverter.java   |  74 +++++++++++++
 .../CustomRequestEntityConverter.java         | 102 ++++++++++++++++++
 .../resources/config/app-security-arcgis.xml  |  50 +++++++++
 .../src/main/resources/config/hrv-context.xml |   3 +-
 .../src/main/webapp/WEB-INF/web.xml           |   7 +-
 7 files changed, 318 insertions(+), 4 deletions(-)
 create mode 100644 geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/ArcGISOAuth2LoginConfig.java
 create mode 100644 geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomAccessTokenResponseConverter.java
 create mode 100644 geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomRequestEntityConverter.java
 create mode 100644 geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml

diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml
index 00aa9474..632a3a1c 100644
--- a/geoportal-application/geoportal-harvester-war/pom.xml
+++ b/geoportal-application/geoportal-harvester-war/pom.xml
@@ -95,6 +95,21 @@
           <groupId>org.springframework.security</groupId>
           <artifactId>spring-security-jwt</artifactId>
           <version>1.1.1.RELEASE</version>
+        </dependency> 
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
+            <version>${springsecurity.version}</version>
+        </dependency>
+       <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-jose</artifactId>
+            <version>${springsecurity.version}</version>
+        </dependency> 
+         <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-core</artifactId>
+            <version>${springsecurity.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/ArcGISOAuth2LoginConfig.java b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/ArcGISOAuth2LoginConfig.java
new file mode 100644
index 00000000..e0814b06
--- /dev/null
+++ b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/ArcGISOAuth2LoginConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 cont_anki.
+ *
+ * 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 com.esri.geoportal.base.security;
+
+
+import java.util.Arrays;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.FormHttpMessageConverter;
+import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient;
+import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient;
+import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest;
+import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ *
+ * @author cont_anki
+ */
+@Configuration
+public class ArcGISOAuth2LoginConfig {
+    
+  
+     @Bean
+     public OAuth2AccessTokenResponseClient<OAuth2AuthorizationCodeGrantRequest> arcgisTokenResponseClient() {
+		OAuth2AccessTokenResponseHttpMessageConverter tokenResponseHttpMessageConverter =
+				new OAuth2AccessTokenResponseHttpMessageConverter();
+		tokenResponseHttpMessageConverter.setTokenResponseConverter(new CustomAccessTokenResponseConverter());
+
+		RestTemplate restTemplate = new RestTemplate(Arrays.asList(
+				new FormHttpMessageConverter(), tokenResponseHttpMessageConverter));
+		restTemplate.setErrorHandler(new OAuth2ErrorResponseErrorHandler());
+
+		DefaultAuthorizationCodeTokenResponseClient tokenResponseClient = new DefaultAuthorizationCodeTokenResponseClient();
+		tokenResponseClient.setRestOperations(restTemplate);
+
+		return tokenResponseClient;
+	}
+     
+     @Bean
+     public DefaultOAuth2UserService customUserService()
+     {
+         DefaultOAuth2UserService userService = new DefaultOAuth2UserService();
+         
+         userService.setRequestEntityConverter(new CustomRequestEntityConverter());
+         
+         return userService;
+         
+     }
+     
+     
+}
+
+    
+
+
diff --git a/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomAccessTokenResponseConverter.java b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomAccessTokenResponseConverter.java
new file mode 100644
index 00000000..dbbec247
--- /dev/null
+++ b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomAccessTokenResponseConverter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 cont_anki.
+ *
+ * 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 com.esri.geoportal.base.security;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
+import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
+import org.springframework.util.StringUtils;
+
+/**
+ *
+ * @author cont_anki
+ */
+public class CustomAccessTokenResponseConverter implements Converter<Map<String, String>, OAuth2AccessTokenResponse> {
+	private static final Set<String> TOKEN_RESPONSE_PARAMETER_NAMES = Stream.of(
+			OAuth2ParameterNames.ACCESS_TOKEN,
+			OAuth2ParameterNames.TOKEN_TYPE,
+			OAuth2ParameterNames.EXPIRES_IN,
+			OAuth2ParameterNames.REFRESH_TOKEN,
+			OAuth2ParameterNames.SCOPE).collect(Collectors.toSet());
+
+	@Override
+	public OAuth2AccessTokenResponse convert(Map<String, String> tokenResponseParameters) {
+		String accessToken = tokenResponseParameters.get(OAuth2ParameterNames.ACCESS_TOKEN);
+
+		OAuth2AccessToken.TokenType accessTokenType = OAuth2AccessToken.TokenType.BEARER;
+
+		long expiresIn = 0;
+		if (tokenResponseParameters.containsKey(OAuth2ParameterNames.EXPIRES_IN)) {
+			try {
+				expiresIn = Long.valueOf(tokenResponseParameters.get(OAuth2ParameterNames.EXPIRES_IN));
+			} catch (NumberFormatException ex) { }
+		}
+
+		Set<String> scopes = Collections.emptySet();
+		if (tokenResponseParameters.containsKey(OAuth2ParameterNames.SCOPE)) {
+			String scope = tokenResponseParameters.get(OAuth2ParameterNames.SCOPE);
+			scopes = Arrays.stream(StringUtils.delimitedListToStringArray(scope, " ")).collect(Collectors.toSet());
+		}
+
+		Map<String, Object> additionalParameters = new LinkedHashMap<>();
+		tokenResponseParameters.entrySet().stream()
+				.filter(e -> !TOKEN_RESPONSE_PARAMETER_NAMES.contains(e.getKey()))
+				.forEach(e -> additionalParameters.put(e.getKey(), e.getValue()));
+
+		return OAuth2AccessTokenResponse.withToken(accessToken)
+				.tokenType(accessTokenType)
+				.expiresIn(expiresIn)
+				.scopes(scopes)
+				.additionalParameters(additionalParameters)
+				.build();
+	}
+}
\ No newline at end of file
diff --git a/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomRequestEntityConverter.java b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomRequestEntityConverter.java
new file mode 100644
index 00000000..addf6e92
--- /dev/null
+++ b/geoportal-application/geoportal-harvester-war/src/main/java/com/esri/geoportal/base/security/CustomRequestEntityConverter.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2024 cont_anki.
+ *
+ * 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 com.esri.geoportal.base.security;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.Map;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.RequestEntity;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.AuthenticationMethod;
+import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.util.UriComponentsBuilder;
+
+/**
+ *
+ * @author cont_anki
+ */
+public class CustomRequestEntityConverter implements Converter<OAuth2UserRequest, RequestEntity<?>> {
+
+	private static final MediaType DEFAULT_CONTENT_TYPE = MediaType
+		.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
+
+	/**
+	 * Returns the {@link RequestEntity} used for the UserInfo Request.
+	 * @param userRequest the user request
+	 * @return the {@link RequestEntity} used for the UserInfo Request
+	 */
+	@Override
+	public RequestEntity<?> convert(OAuth2UserRequest userRequest) {
+//                String name = SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString();
+//                System.out.println("Pricipal name "+name);
+                
+		ClientRegistration clientRegistration = userRequest.getClientRegistration();
+		HttpMethod httpMethod = getHttpMethod(clientRegistration);
+		HttpHeaders headers = new HttpHeaders();
+		headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+                
+                String userNameAttributeName = userRequest.getClientRegistration()
+                .getProviderDetails()
+                .getUserInfoEndpoint()
+                .getUserNameAttributeName();
+                
+                Map<String, Object> reqParamMap = userRequest.getAdditionalParameters();
+                String userName="";
+                if(reqParamMap.get(userNameAttributeName) != null)
+                {
+                    userName = (String)reqParamMap.get(userNameAttributeName);
+                }
+                String userInfoUri = clientRegistration.getProviderDetails().getUserInfoEndpoint().getUri();
+                userInfoUri =userInfoUri+"/"+userName+"?f=json";
+                
+		URI uri = UriComponentsBuilder
+			.fromUriString(userInfoUri)
+			.build()
+			.toUri();
+                
+
+
+		RequestEntity<?> request;
+		if (HttpMethod.POST.equals(httpMethod)) {
+			headers.setContentType(DEFAULT_CONTENT_TYPE);
+			MultiValueMap<String, String> formParameters = new LinkedMultiValueMap<>();
+			formParameters.add(OAuth2ParameterNames.ACCESS_TOKEN, userRequest.getAccessToken().getTokenValue());
+			request = new RequestEntity<>(formParameters, headers, httpMethod, uri);
+		}
+		else {
+			headers.setBearerAuth(userRequest.getAccessToken().getTokenValue());
+			request = new RequestEntity<>(headers, httpMethod, uri);
+		}
+
+		return request;
+	}
+
+	private HttpMethod getHttpMethod(ClientRegistration clientRegistration) {
+		if (AuthenticationMethod.FORM
+			.equals(clientRegistration.getProviderDetails().getUserInfoEndpoint().getAuthenticationMethod())) {
+			return HttpMethod.POST;
+		}
+		return HttpMethod.GET;
+	}
+
+}
diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
new file mode 100644
index 00000000..b989bf13
--- /dev/null
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -0,0 +1,50 @@
+<b:beans xmlns:b="http://www.springframework.org/schema/beans"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://www.springframework.org/schema/security"
+		 xsi:schemaLocation="
+			http://www.springframework.org/schema/security
+			https://www.springframework.org/schema/security/spring-security.xsd
+			http://www.springframework.org/schema/beans
+			https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<http auto-config="true" >
+		<intercept-url pattern="/**" access="authenticated"/>
+		<oauth2-login authorized-client-repository-ref="authorizedClientRepository" access-token-response-client-ref="arcgisTokenResponseClient"
+                user-service-ref="customUserService"/>
+	</http>
+              
+
+	<client-registrations>
+            <client-registration registration-id="arcgis"
+                                                    client-authentication-method="post"
+                                                     client-id="VbQMHv3XKryz4bRE"
+                                                     client-secret="dbd010b2f2414b9a9048525c6c1d0396"							 
+                                                     authorization-grant-type="authorization_code"    
+                                                     redirect-uri="http://localhost:8080/harvester/login/oauth2/code/arcgis"                                                                                                
+                                                     client-name="ArcGIS"                                                     
+                                                     provider-id="arcgis"
+                                                     
+                />
+            <provider provider-id="arcgis"                               
+                              authorization-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/authorize"
+                              token-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/token?f=json"
+                              user-info-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/community/users"
+                              user-info-user-name-attribute="username"                             
+                              />
+        </client-registrations>
+
+	<user-service>
+		<user name="user" password="{noop}password" authorities="ROLE_USER" />
+	</user-service>
+        
+        <b:bean id="authorizedClientService"
+			class="org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService"
+			autowire="constructor"/>
+
+	<b:bean id="authorizedClientRepository"
+			class="org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository">
+		<b:constructor-arg ref="authorizedClientService"/>
+	</b:bean>      
+        
+
+</b:beans>
diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
index 66b69dac..679d9b8d 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
@@ -43,7 +43,8 @@
     <import resource="hrv-beans.xml" />
 
     <!-- Security -->
-    <import resource="app-security.xml" />
+  <!-- <import resource="app-security.xml" /> -->
+   <import resource="app-security-arcgis.xml" />
     
     <!-- ADD PERSISTENCE SUPPORT HERE (jpa, hibernate, etc) -->
 
diff --git a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
index 2cbd2770..27a31e16 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
@@ -14,10 +14,11 @@
   <servlet-mapping>
     <servlet-name>spring</servlet-name>
     <url-pattern>/</url-pattern>
-  </servlet-mapping>
+  </servlet-mapping> 
+
   
   <!-- Uncomment to secure application -->
-  <!--filter>
+<!--  <filter>
     <filter-name>springSecurityFilterChain</filter-name>
     <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     <async-supported>true</async-supported>
@@ -27,7 +28,7 @@
     <url-pattern>/*</url-pattern>
     <dispatcher>ERROR</dispatcher>
     <dispatcher>REQUEST</dispatcher>
-  </filter-mapping-->
+  </filter-mapping>-->
   
   <session-config>
     <session-timeout>

From 223cab53f2b79032d6e8bea2291a9a9b909145e7 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 13 Mar 2024 21:22:58 +0530
Subject: [PATCH 03/15] Removed sensitive information

---
 .../src/main/resources/config/app-security-arcgis.xml  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
index b989bf13..b0f7fe93 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -17,8 +17,8 @@
 	<client-registrations>
             <client-registration registration-id="arcgis"
                                                     client-authentication-method="post"
-                                                     client-id="VbQMHv3XKryz4bRE"
-                                                     client-secret="dbd010b2f2414b9a9048525c6c1d0396"							 
+                                                     client-id=""
+                                                     client-secret=""							 
                                                      authorization-grant-type="authorization_code"    
                                                      redirect-uri="http://localhost:8080/harvester/login/oauth2/code/arcgis"                                                                                                
                                                      client-name="ArcGIS"                                                     
@@ -26,9 +26,9 @@
                                                      
                 />
             <provider provider-id="arcgis"                               
-                              authorization-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/authorize"
-                              token-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/token?f=json"
-                              user-info-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/community/users"
+                              authorization-uri="https://hostname/portal/sharing/rest/oauth2/authorize"
+                              token-uri="https://hostname/portal/sharing/rest/oauth2/token?f=json"
+                              user-info-uri="https://hostname/portal/sharing/rest/community/users"
                               user-info-user-name-attribute="username"                             
                               />
         </client-registrations>

From c8d16cf8814236849d68466a60324e51ed34ea30 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Fri, 31 May 2024 11:21:22 +0530
Subject: [PATCH 04/15] Updated spring security oAuth2 - BOT PullRequest 217

---
 geoportal-application/geoportal-harvester-war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml
index 00aa9474..66c4adaf 100644
--- a/geoportal-application/geoportal-harvester-war/pom.xml
+++ b/geoportal-application/geoportal-harvester-war/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
           <groupId>org.springframework.security.oauth</groupId>
           <artifactId>spring-security-oauth2</artifactId>
-          <version>2.5.1.RELEASE</version>
+          <version>2.5.2.RELEASE</version>
         </dependency>
         <dependency>
           <groupId>org.springframework.security</groupId>

From d4e531afe660f0dd040d6f13b25054079c8e06a8 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Fri, 31 May 2024 11:22:20 +0530
Subject: [PATCH 05/15] Added Source URL GPT Output broker

---
 .../main/java/com/esri/geoportal/harvester/gpt/GptBroker.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geoportal-connectors/geoportal-harvester-gpt/src/main/java/com/esri/geoportal/harvester/gpt/GptBroker.java b/geoportal-connectors/geoportal-harvester-gpt/src/main/java/com/esri/geoportal/harvester/gpt/GptBroker.java
index 484f70b4..33b5ec88 100644
--- a/geoportal-connectors/geoportal-harvester-gpt/src/main/java/com/esri/geoportal/harvester/gpt/GptBroker.java
+++ b/geoportal-connectors/geoportal-harvester-gpt/src/main/java/com/esri/geoportal/harvester/gpt/GptBroker.java
@@ -215,7 +215,7 @@ public PublishingStatus publish(DataReference ref) throws DataOutputException {
         throw new DataOutputException(this, ref, "No response received");
       }
       if (response.getError() != null) {
-        throw new DataOutputException(this, ref, response.getError().getMessage()) {
+        throw new DataOutputException(this, ref, response.getError().getMessage()+"Source URI: "+ref.getSourceUri()) {
           @Override
           public boolean isNegligible() {
             return true;

From ff78a67d39adb4b17bb47d53fb0ddcb8814fcb86 Mon Sep 17 00:00:00 2001
From: Marten Hogeweg <mhogeweg@esri.com>
Date: Mon, 24 Jun 2024 08:59:59 -0700
Subject: [PATCH 06/15] read PT_Locale into ArcGIS XML

---
 .../resources/meta/ISO19139_to_ArcGIS.xsl     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl
index 17deaca0..968024f0 100644
--- a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl
+++ b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl
@@ -31,6 +31,28 @@
                     <ArcGISFormat>1.0</ArcGISFormat>
                     <ArcGISstyle>ISO 19139 Metadata Implementation Specification GML3.2</ArcGISstyle>
                     <ArcGISProfile>ISO19139</ArcGISProfile>
+					<xsl:if test="count(/gmd:MD_Metadata/gmd:locale/gmd:PT_Locale)>0">
+					<locales>
+						<xsl:for-each select="/gmd:MD_Metadata/gmd:locale/gmd:PT_Locale">
+						<locale>
+							<id><xsl:value-of select="@id"/></id>
+							<xsl:attribute name="language">
+								<xsl:value-of select="./gmd:language/gmd:LanguageCode/@codeListValue"/>
+							</xsl:attribute>
+							<xsl:attribute name="country">
+								<xsl:value-of select="./gmd:country/gmd:CountryCode/@codeListValue"/>
+							</xsl:attribute>
+							<resTitle>
+								<xsl:value-of select="@locale=gmd:language/gmd:languageCode/@codeListValue"/>
+								<xsl:value-of select="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale=@id]"/>
+							</resTitle>
+							<idAbs>
+								<xsl:value-of select="/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale=@id]"/>
+							</idAbs>
+						</locale>
+						</xsl:for-each>
+					</locales>
+					</xsl:if>
                 </Esri>
                 <!--
                 <Esri>

From c8bb5e79db448740008072a6f9001356d44b4c66 Mon Sep 17 00:00:00 2001
From: Ankita Srivastava <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 10:58:52 +0530
Subject: [PATCH 07/15] Update app-security-arcgis.xml, sample url as per
 documentation

---
 .../src/main/resources/config/app-security-arcgis.xml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
index b0f7fe93..f212a0df 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -26,9 +26,9 @@
                                                      
                 />
             <provider provider-id="arcgis"                               
-                              authorization-uri="https://hostname/portal/sharing/rest/oauth2/authorize"
-                              token-uri="https://hostname/portal/sharing/rest/oauth2/token?f=json"
-                              user-info-uri="https://hostname/portal/sharing/rest/community/users"
+                              authorization-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/authorize"
+                              token-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/token?f=json"
+                              user-info-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/community/users"
                               user-info-user-name-attribute="username"                             
                               />
         </client-registrations>

From e9beb84540361432b5e112eea5145fb269169dba Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 11:46:37 +0530
Subject: [PATCH 08/15] Updated version to 2.7.2

---
 geoportal-application/geoportal-harvester-cli/pom.xml  |  2 +-
 .../geoportal-harvester-engine/pom.xml                 |  2 +-
 geoportal-application/geoportal-harvester-war/pom.xml  |  2 +-
 .../src/main/resources/config/app-security-arcgis.xml  | 10 +++++-----
 .../src/main/webapp/WEB-INF/web.xml                    |  4 ++--
 geoportal-application/pom.xml                          |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/geoportal-application/geoportal-harvester-cli/pom.xml b/geoportal-application/geoportal-harvester-cli/pom.xml
index 9d78426e..ca40c104 100644
--- a/geoportal-application/geoportal-harvester-cli/pom.xml
+++ b/geoportal-application/geoportal-harvester-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-application</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-cli</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-application/geoportal-harvester-engine/pom.xml b/geoportal-application/geoportal-harvester-engine/pom.xml
index efd007cf..03cec7a5 100644
--- a/geoportal-application/geoportal-harvester-engine/pom.xml
+++ b/geoportal-application/geoportal-harvester-engine/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <artifactId>geoportal-application</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-engine</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Application :: Engine</name>
diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml
index b5ccdeeb..cabc9276 100644
--- a/geoportal-application/geoportal-harvester-war/pom.xml
+++ b/geoportal-application/geoportal-harvester-war/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <artifactId>geoportal-application</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-war</artifactId>
     <packaging>war</packaging>
diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
index f212a0df..b989bf13 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -17,8 +17,8 @@
 	<client-registrations>
             <client-registration registration-id="arcgis"
                                                     client-authentication-method="post"
-                                                     client-id=""
-                                                     client-secret=""							 
+                                                     client-id="VbQMHv3XKryz4bRE"
+                                                     client-secret="dbd010b2f2414b9a9048525c6c1d0396"							 
                                                      authorization-grant-type="authorization_code"    
                                                      redirect-uri="http://localhost:8080/harvester/login/oauth2/code/arcgis"                                                                                                
                                                      client-name="ArcGIS"                                                     
@@ -26,9 +26,9 @@
                                                      
                 />
             <provider provider-id="arcgis"                               
-                              authorization-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/authorize"
-                              token-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/token?f=json"
-                              user-info-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/community/users"
+                              authorization-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/authorize"
+                              token-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/token?f=json"
+                              user-info-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/community/users"
                               user-info-user-name-attribute="username"                             
                               />
         </client-registrations>
diff --git a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
index 27a31e16..5fc6dcd2 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
 
   
   <!-- Uncomment to secure application -->
-<!--  <filter>
+  <filter>
     <filter-name>springSecurityFilterChain</filter-name>
     <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     <async-supported>true</async-supported>
@@ -28,7 +28,7 @@
     <url-pattern>/*</url-pattern>
     <dispatcher>ERROR</dispatcher>
     <dispatcher>REQUEST</dispatcher>
-  </filter-mapping>-->
+  </filter-mapping>
   
   <session-config>
     <session-timeout>
diff --git a/geoportal-application/pom.xml b/geoportal-application/pom.xml
index eb338b8e..0a71e2be 100644
--- a/geoportal-application/pom.xml
+++ b/geoportal-application/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <artifactId>geoportal-harvester</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-application</artifactId>
     <packaging>pom</packaging>

From e87fbd8a97cdc293ad44e8e8d5b0a143641484ec Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 11:46:50 +0530
Subject: [PATCH 09/15] Updated version to 2.7.2

---
 .../geoportal-harvester-agp-publisher/pom.xml                 | 4 ++--
 geoportal-connectors/geoportal-harvester-agp-source/pom.xml   | 2 +-
 geoportal-connectors/geoportal-harvester-ags/pom.xml          | 2 +-
 geoportal-connectors/geoportal-harvester-ckan/pom.xml         | 2 +-
 geoportal-connectors/geoportal-harvester-console/pom.xml      | 2 +-
 geoportal-connectors/geoportal-harvester-csw/pom.xml          | 2 +-
 geoportal-connectors/geoportal-harvester-dcat/pom.xml         | 2 +-
 geoportal-connectors/geoportal-harvester-folder-big/pom.xml   | 2 +-
 geoportal-connectors/geoportal-harvester-folder/pom.xml       | 2 +-
 geoportal-connectors/geoportal-harvester-gpt/pom.xml          | 2 +-
 geoportal-connectors/geoportal-harvester-gptsrc/pom.xml       | 2 +-
 geoportal-connectors/geoportal-harvester-jdbc/pom.xml         | 2 +-
 geoportal-connectors/geoportal-harvester-migration/pom.xml    | 2 +-
 geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml      | 2 +-
 geoportal-connectors/geoportal-harvester-sink/pom.xml         | 2 +-
 geoportal-connectors/geoportal-harvester-stac/pom.xml         | 2 +-
 geoportal-connectors/geoportal-harvester-thredds/pom.xml      | 2 +-
 geoportal-connectors/geoportal-harvester-unc/pom.xml          | 2 +-
 geoportal-connectors/geoportal-harvester-waf/pom.xml          | 2 +-
 geoportal-connectors/pom.xml                                  | 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml b/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml
index 5ac6223b..78b5b3c3 100644
--- a/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-agp-publisher</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: ArcGIS Portal</name>
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>geoportal-commons-agp-client</artifactId>
-            <version>2.7.1</version>
+            <version>2.7.2</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/geoportal-connectors/geoportal-harvester-agp-source/pom.xml b/geoportal-connectors/geoportal-harvester-agp-source/pom.xml
index 21521e40..e0079014 100644
--- a/geoportal-connectors/geoportal-harvester-agp-source/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-agp-source/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-agp-source</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Portal</name>
diff --git a/geoportal-connectors/geoportal-harvester-ags/pom.xml b/geoportal-connectors/geoportal-harvester-ags/pom.xml
index ab98819d..2d7c606f 100644
--- a/geoportal-connectors/geoportal-harvester-ags/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-ags/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-ags</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Server</name>
diff --git a/geoportal-connectors/geoportal-harvester-ckan/pom.xml b/geoportal-connectors/geoportal-harvester-ckan/pom.xml
index 053003b2..7df4e5fa 100644
--- a/geoportal-connectors/geoportal-harvester-ckan/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-ckan/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-ckan</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-connectors/geoportal-harvester-console/pom.xml b/geoportal-connectors/geoportal-harvester-console/pom.xml
index 4e91cc78..b00a21f6 100644
--- a/geoportal-connectors/geoportal-harvester-console/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-console/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-console</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Console</name>
diff --git a/geoportal-connectors/geoportal-harvester-csw/pom.xml b/geoportal-connectors/geoportal-harvester-csw/pom.xml
index 6c089cc2..0e167356 100644
--- a/geoportal-connectors/geoportal-harvester-csw/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-csw/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-csw</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Csw</name>
diff --git a/geoportal-connectors/geoportal-harvester-dcat/pom.xml b/geoportal-connectors/geoportal-harvester-dcat/pom.xml
index c5104fe0..aab26111 100644
--- a/geoportal-connectors/geoportal-harvester-dcat/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-dcat/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-dcat</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-connectors/geoportal-harvester-folder-big/pom.xml b/geoportal-connectors/geoportal-harvester-folder-big/pom.xml
index 748e4272..b479d96c 100644
--- a/geoportal-connectors/geoportal-harvester-folder-big/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-folder-big/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.esri.geoportal</groupId>
     <artifactId>geoportal-connectors</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-harvester-folder-big</artifactId>
   <name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder :: Big</name>
diff --git a/geoportal-connectors/geoportal-harvester-folder/pom.xml b/geoportal-connectors/geoportal-harvester-folder/pom.xml
index e4d247e0..7c7ff1b8 100644
--- a/geoportal-connectors/geoportal-harvester-folder/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-folder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.esri.geoportal</groupId>
     <artifactId>geoportal-connectors</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-harvester-folder</artifactId>
   <name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder</name>
diff --git a/geoportal-connectors/geoportal-harvester-gpt/pom.xml b/geoportal-connectors/geoportal-harvester-gpt/pom.xml
index a269cb0d..eb1f779c 100644
--- a/geoportal-connectors/geoportal-harvester-gpt/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-gpt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-gpt</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Geoportal Rest</name>
diff --git a/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml b/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml
index dabc93cf..f5074859 100644
--- a/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-gptsrc</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Geoportal Rest</name>
diff --git a/geoportal-connectors/geoportal-harvester-jdbc/pom.xml b/geoportal-connectors/geoportal-harvester-jdbc/pom.xml
index c6c4383f..a8022057 100644
--- a/geoportal-connectors/geoportal-harvester-jdbc/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-jdbc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-jdbc</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: JDBC</name>
diff --git a/geoportal-connectors/geoportal-harvester-migration/pom.xml b/geoportal-connectors/geoportal-harvester-migration/pom.xml
index ae1b2239..bbe72c31 100644
--- a/geoportal-connectors/geoportal-harvester-migration/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-migration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-migration</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Migration Tool</name>
diff --git a/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml b/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml
index ef740bfc..db89fbd8 100644
--- a/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-oai-pmh</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: OAI-PMH</name>
diff --git a/geoportal-connectors/geoportal-harvester-sink/pom.xml b/geoportal-connectors/geoportal-harvester-sink/pom.xml
index 39bc365a..7e0ade40 100644
--- a/geoportal-connectors/geoportal-harvester-sink/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-sink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-sink</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Sink</name>
diff --git a/geoportal-connectors/geoportal-harvester-stac/pom.xml b/geoportal-connectors/geoportal-harvester-stac/pom.xml
index 43043550..7f8d60de 100644
--- a/geoportal-connectors/geoportal-harvester-stac/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-stac/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-stac</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-connectors/geoportal-harvester-thredds/pom.xml b/geoportal-connectors/geoportal-harvester-thredds/pom.xml
index bb80222d..65cde004 100644
--- a/geoportal-connectors/geoportal-harvester-thredds/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-thredds/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-thredds</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-connectors/geoportal-harvester-unc/pom.xml b/geoportal-connectors/geoportal-harvester-unc/pom.xml
index 6dab131e..4177b870 100644
--- a/geoportal-connectors/geoportal-harvester-unc/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-unc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-unc</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Unc</name>
diff --git a/geoportal-connectors/geoportal-harvester-waf/pom.xml b/geoportal-connectors/geoportal-harvester-waf/pom.xml
index a21eae8c..b6a8f9ed 100644
--- a/geoportal-connectors/geoportal-harvester-waf/pom.xml
+++ b/geoportal-connectors/geoportal-harvester-waf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-connectors</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-harvester-waf</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Data Source :: Waf</name>
diff --git a/geoportal-connectors/pom.xml b/geoportal-connectors/pom.xml
index 1f07a677..6106d4cb 100644
--- a/geoportal-connectors/pom.xml
+++ b/geoportal-connectors/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <artifactId>geoportal-harvester</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-connectors</artifactId>
     <packaging>pom</packaging>

From 0630d995eb93c3443d0a76f9e2871e83bef917a9 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 11:47:10 +0530
Subject: [PATCH 10/15] Updated version to 2.7.2

---
 geoportal-SDK/geoportal-harvester-api-base/pom.xml         | 2 +-
 geoportal-SDK/geoportal-harvester-api/pom.xml              | 4 ++--
 geoportal-SDK/pom.xml                                      | 2 +-
 geoportal-commons/geoportal-commons-agp-client/pom.xml     | 2 +-
 geoportal-commons/geoportal-commons-ags-client/pom.xml     | 2 +-
 geoportal-commons/geoportal-commons-ckan-client/pom.xml    | 2 +-
 geoportal-commons/geoportal-commons-constants/pom.xml      | 2 +-
 geoportal-commons/geoportal-commons-csw-client/pom.xml     | 2 +-
 geoportal-commons/geoportal-commons-dcat-client/pom.xml    | 2 +-
 geoportal-commons/geoportal-commons-doc/pom.xml            | 2 +-
 geoportal-commons/geoportal-commons-geometry/pom.xml       | 2 +-
 geoportal-commons/geoportal-commons-gpt-client/pom.xml     | 2 +-
 geoportal-commons/geoportal-commons-meta/pom.xml           | 2 +-
 geoportal-commons/geoportal-commons-oai-client/pom.xml     | 2 +-
 geoportal-commons/geoportal-commons-pdf/pom.xml            | 2 +-
 geoportal-commons/geoportal-commons-robots/pom.xml         | 2 +-
 geoportal-commons/geoportal-commons-stac-client/pom.xml    | 2 +-
 geoportal-commons/geoportal-commons-thredds-client/pom.xml | 2 +-
 geoportal-commons/geoportal-commons-utils/pom.xml          | 2 +-
 geoportal-commons/pom.xml                                  | 2 +-
 pom.xml                                                    | 2 +-
 21 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/geoportal-SDK/geoportal-harvester-api-base/pom.xml b/geoportal-SDK/geoportal-harvester-api-base/pom.xml
index af19d12e..9302eed1 100644
--- a/geoportal-SDK/geoportal-harvester-api-base/pom.xml
+++ b/geoportal-SDK/geoportal-harvester-api-base/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-SDK</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>harvester-api-base</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Api Base</name>
diff --git a/geoportal-SDK/geoportal-harvester-api/pom.xml b/geoportal-SDK/geoportal-harvester-api/pom.xml
index 8ca7330a..cb6af927 100644
--- a/geoportal-SDK/geoportal-harvester-api/pom.xml
+++ b/geoportal-SDK/geoportal-harvester-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
       <artifactId>geoportal-SDK</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>harvester-api</artifactId>
     <name>Esri :: Geoportal Server :: Harvester :: Api</name>
     <description>Definitions of all basic elements of the Harvester (interfaces, final classes, etc.).</description>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
diff --git a/geoportal-SDK/pom.xml b/geoportal-SDK/pom.xml
index 2088d0bb..cf26e967 100644
--- a/geoportal-SDK/pom.xml
+++ b/geoportal-SDK/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <artifactId>geoportal-harvester</artifactId>
       <groupId>com.esri.geoportal</groupId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-SDK</artifactId>
     <packaging>pom</packaging>
diff --git a/geoportal-commons/geoportal-commons-agp-client/pom.xml b/geoportal-commons/geoportal-commons-agp-client/pom.xml
index 64348fb6..f973e706 100644
--- a/geoportal-commons/geoportal-commons-agp-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-agp-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-agp-client</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: ArcGIS Portal Client</name>
diff --git a/geoportal-commons/geoportal-commons-ags-client/pom.xml b/geoportal-commons/geoportal-commons-ags-client/pom.xml
index a46acd57..07c4561c 100644
--- a/geoportal-commons/geoportal-commons-ags-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-ags-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-ags-client</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: ArcGIS Server Client</name>
diff --git a/geoportal-commons/geoportal-commons-ckan-client/pom.xml b/geoportal-commons/geoportal-commons-ckan-client/pom.xml
index 3bc44bb0..87011fa2 100644
--- a/geoportal-commons/geoportal-commons-ckan-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-ckan-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-ckan-client</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: CKAN Lightweight Client</name>
diff --git a/geoportal-commons/geoportal-commons-constants/pom.xml b/geoportal-commons/geoportal-commons-constants/pom.xml
index 49631bfb..044008f2 100644
--- a/geoportal-commons/geoportal-commons-constants/pom.xml
+++ b/geoportal-commons/geoportal-commons-constants/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-constants</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-commons/geoportal-commons-csw-client/pom.xml b/geoportal-commons/geoportal-commons-csw-client/pom.xml
index 4fafbf19..fc1eeb3c 100644
--- a/geoportal-commons/geoportal-commons-csw-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-csw-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>com.esri.geoportal</groupId>
       <artifactId>geoportal-commons</artifactId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-commons-csw-client</artifactId>
   <name>Esri :: Geoportal Server :: Commons :: Csw Client</name>
diff --git a/geoportal-commons/geoportal-commons-dcat-client/pom.xml b/geoportal-commons/geoportal-commons-dcat-client/pom.xml
index c771281c..f10cd596 100644
--- a/geoportal-commons/geoportal-commons-dcat-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-dcat-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-dcat-client</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-commons/geoportal-commons-doc/pom.xml b/geoportal-commons/geoportal-commons-doc/pom.xml
index c823f28e..f0cd1227 100644
--- a/geoportal-commons/geoportal-commons-doc/pom.xml
+++ b/geoportal-commons/geoportal-commons-doc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>geoportal-commons</artifactId>
     <groupId>com.esri.geoportal</groupId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-commons-doc</artifactId>
   <packaging>jar</packaging>
diff --git a/geoportal-commons/geoportal-commons-geometry/pom.xml b/geoportal-commons/geoportal-commons-geometry/pom.xml
index cca39d02..f75752e1 100644
--- a/geoportal-commons/geoportal-commons-geometry/pom.xml
+++ b/geoportal-commons/geoportal-commons-geometry/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-geometry</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: Geometry Utils</name>
diff --git a/geoportal-commons/geoportal-commons-gpt-client/pom.xml b/geoportal-commons/geoportal-commons-gpt-client/pom.xml
index 9e9a1a51..35197780 100644
--- a/geoportal-commons/geoportal-commons-gpt-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-gpt-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-gpt-client</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: Geoportal Rest Client</name>
diff --git a/geoportal-commons/geoportal-commons-meta/pom.xml b/geoportal-commons/geoportal-commons-meta/pom.xml
index 89e7e7f7..b1d4e817 100644
--- a/geoportal-commons/geoportal-commons-meta/pom.xml
+++ b/geoportal-commons/geoportal-commons-meta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-meta</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: Meta</name>
diff --git a/geoportal-commons/geoportal-commons-oai-client/pom.xml b/geoportal-commons/geoportal-commons-oai-client/pom.xml
index 887b3627..b05cd0ac 100644
--- a/geoportal-commons/geoportal-commons-oai-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-oai-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.esri.geoportal</groupId>
     <artifactId>geoportal-commons</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-commons-oai-client</artifactId>
   <name>Esri :: Geoportal Server :: Commons :: OAI-PMH Client</name>
diff --git a/geoportal-commons/geoportal-commons-pdf/pom.xml b/geoportal-commons/geoportal-commons-pdf/pom.xml
index 13f63105..23164c67 100644
--- a/geoportal-commons/geoportal-commons-pdf/pom.xml
+++ b/geoportal-commons/geoportal-commons-pdf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>geoportal-commons</artifactId>
     <groupId>com.esri.geoportal</groupId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-commons-pdf</artifactId>
   <packaging>jar</packaging>
diff --git a/geoportal-commons/geoportal-commons-robots/pom.xml b/geoportal-commons/geoportal-commons-robots/pom.xml
index d6071470..08be8b5a 100644
--- a/geoportal-commons/geoportal-commons-robots/pom.xml
+++ b/geoportal-commons/geoportal-commons-robots/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>com.esri.geoportal</groupId>
       <artifactId>geoportal-commons</artifactId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
   </parent>
   <artifactId>commons-robots</artifactId>
   <name>Esri :: Geoportal Server :: Commons :: Robots</name>
diff --git a/geoportal-commons/geoportal-commons-stac-client/pom.xml b/geoportal-commons/geoportal-commons-stac-client/pom.xml
index 208cb9f2..f0ab5718 100644
--- a/geoportal-commons/geoportal-commons-stac-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-stac-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-stac-client</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-commons/geoportal-commons-thredds-client/pom.xml b/geoportal-commons/geoportal-commons-thredds-client/pom.xml
index 381e496f..567425c2 100644
--- a/geoportal-commons/geoportal-commons-thredds-client/pom.xml
+++ b/geoportal-commons/geoportal-commons-thredds-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>geoportal-commons-thredds-client</artifactId>
     <name>Esri :: Geoportal Server :: Commons :: THREDDS Client</name>
diff --git a/geoportal-commons/geoportal-commons-utils/pom.xml b/geoportal-commons/geoportal-commons-utils/pom.xml
index 5b300eca..906197d9 100644
--- a/geoportal-commons/geoportal-commons-utils/pom.xml
+++ b/geoportal-commons/geoportal-commons-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.esri.geoportal</groupId>
         <artifactId>geoportal-commons</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.2</version>
     </parent>
     <artifactId>commons-utils</artifactId>
     <packaging>jar</packaging>
diff --git a/geoportal-commons/pom.xml b/geoportal-commons/pom.xml
index a3e726d2..16bdc6c0 100644
--- a/geoportal-commons/pom.xml
+++ b/geoportal-commons/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>geoportal-harvester</artifactId>
     <groupId>com.esri.geoportal</groupId>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
   </parent>
   <artifactId>geoportal-commons</artifactId>
   <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 80be9e70..f47fd60c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.esri.geoportal</groupId>
   <artifactId>geoportal-harvester</artifactId>
-  <version>2.7.1</version>
+  <version>2.7.2</version>
   <packaging>pom</packaging>
   <name>Esri :: Geoportal Server :: Harvester</name>
   <description>Top-level project for all Harvester modules.</description>

From 9934e564ca75f60ea2c7cbb13b6b625c81d03c00 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 11:55:11 +0530
Subject: [PATCH 11/15] Updated version to 2.7.2 and removed server information

---
 .../main/resources/config/app-security-arcgis.xml    | 12 ++++++------
 .../src/main/resources/config/hrv-context.xml        |  2 +-
 .../src/main/webapp/WEB-INF/web.xml                  |  6 +++---
 .../src/main/webapp/hrv/ui/main/templates/App.html   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
index b989bf13..baace492 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -17,8 +17,8 @@
 	<client-registrations>
             <client-registration registration-id="arcgis"
                                                     client-authentication-method="post"
-                                                     client-id="VbQMHv3XKryz4bRE"
-                                                     client-secret="dbd010b2f2414b9a9048525c6c1d0396"							 
+                                                     client-id=""
+                                                     client-secret=""							 
                                                      authorization-grant-type="authorization_code"    
                                                      redirect-uri="http://localhost:8080/harvester/login/oauth2/code/arcgis"                                                                                                
                                                      client-name="ArcGIS"                                                     
@@ -26,9 +26,9 @@
                                                      
                 />
             <provider provider-id="arcgis"                               
-                              authorization-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/authorize"
-                              token-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/oauth2/token?f=json"
-                              user-info-uri="https://rdx1081.esriemcs.com/portal/sharing/rest/community/users"
+                              authorization-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/authorize"
+                              token-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/token?f=json"
+                              user-info-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/community/users"
                               user-info-user-name-attribute="username"                             
                               />
         </client-registrations>
@@ -47,4 +47,4 @@
 	</b:bean>      
         
 
-</b:beans>
+</b:beans>
\ No newline at end of file
diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
index 679d9b8d..3206161d 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-context.xml
@@ -44,7 +44,7 @@
 
     <!-- Security -->
   <!-- <import resource="app-security.xml" /> -->
-   <import resource="app-security-arcgis.xml" />
+  <!-- <import resource="app-security-arcgis.xml" /> -->
     
     <!-- ADD PERSISTENCE SUPPORT HERE (jpa, hibernate, etc) -->
 
diff --git a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
index 5fc6dcd2..ab1ac68c 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/webapp/WEB-INF/web.xml
@@ -16,8 +16,8 @@
     <url-pattern>/</url-pattern>
   </servlet-mapping> 
 
-  
-  <!-- Uncomment to secure application -->
+   <!-- Uncomment to secure application -->
+    <!--
   <filter>
     <filter-name>springSecurityFilterChain</filter-name>
     <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -28,7 +28,7 @@
     <url-pattern>/*</url-pattern>
     <dispatcher>ERROR</dispatcher>
     <dispatcher>REQUEST</dispatcher>
-  </filter-mapping>
+  </filter-mapping> -->
   
   <session-config>
     <session-timeout>
diff --git a/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html b/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
index 119d17e1..e6a48809 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
+++ b/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
@@ -4,7 +4,7 @@
       <div class="h-header-container">
         <div data-dojo-type="hrv/ui/main/Header"></div>
         <div data-dojo-type="hrv/ui/main/Nav"></div>
-        <div class="h-version">Ver. 2.7.1</div>
+        <div class="h-version">Ver. 2.7.2</div>
       </div>
     </div>
     <div class="h-stage-layout">

From 42400c615802a795b896b1bedd6410b851de2a96 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 11:57:13 +0530
Subject: [PATCH 12/15] Updated year in Footer

---
 .../src/main/webapp/hrv/ui/main/templates/App.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html b/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
index e6a48809..2fb75f67 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
+++ b/geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/ui/main/templates/App.html
@@ -11,6 +11,6 @@
       <div data-dojo-type="hrv/ui/main/Status"></div>
       <div data-dojo-type="hrv/ui/main/Stage"></div>
     </div>
-    <div class="h-stage-footer">© Harvester 2023</div>
+    <div class="h-stage-footer">© Harvester 2024</div>
   </div>
 </div>

From 3728f702a2df2a48f161509567206dd0d2702a66 Mon Sep 17 00:00:00 2001
From: cont_anki <ankita_srivastava@esri.com>
Date: Wed, 17 Jul 2024 13:33:16 +0530
Subject: [PATCH 13/15] Added Component Scan

---
 .../resources/config/app-security-arcgis.xml  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
index baace492..a84280f6 100644
--- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
+++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml
@@ -1,12 +1,17 @@
 <b:beans xmlns:b="http://www.springframework.org/schema/beans"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xmlns="http://www.springframework.org/schema/security"
+                 xmlns:context="http://www.springframework.org/schema/context"
 		 xsi:schemaLocation="
 			http://www.springframework.org/schema/security
 			https://www.springframework.org/schema/security/spring-security.xsd
 			http://www.springframework.org/schema/beans
-			https://www.springframework.org/schema/beans/spring-beans.xsd">
-
+			https://www.springframework.org/schema/beans/spring-beans.xsd
+                        http://www.springframework.org/schema/context
+                        https://www.springframework.org/schema/context/spring-context.xsd">
+    
+       <context:component-scan base-package="com.esri.geoportal.base.security"/> 
+                       
 	<http auto-config="true" >
 		<intercept-url pattern="/**" access="authenticated"/>
 		<oauth2-login authorized-client-repository-ref="authorizedClientRepository" access-token-response-client-ref="arcgisTokenResponseClient"
@@ -24,13 +29,13 @@
                                                      client-name="ArcGIS"                                                     
                                                      provider-id="arcgis"
                                                      
-                />
+            />
             <provider provider-id="arcgis"                               
-                              authorization-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/authorize"
-                              token-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/token?f=json"
-                              user-info-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/community/users"
-                              user-info-user-name-attribute="username"                             
-                              />
+                authorization-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/authorize"
+                token-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/oauth2/token?f=json"
+                user-info-uri="https://portal_hostname/portal_webadaptorname/sharing/rest/community/users"
+                user-info-user-name-attribute="username"                             
+            />
         </client-registrations>
 
 	<user-service>

From 8e0156ff5fa022192a307f343cb2b42ff2dbfd9e Mon Sep 17 00:00:00 2001
From: Ankita Srivastava <ankita_srivastava@esri.com>
Date: Mon, 22 Jul 2024 10:09:40 +0530
Subject: [PATCH 14/15] Added 2.7.1 release link

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7995570d..cc4cb27e 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ To report an issue, please go to [issues](https://github.com/Esri/geoportal-serv
 The nature of the Harvester application is, as the name suggests, to harvest metadata from whatever web endpoints it is provided. The list(s) of endpoints to download metadata from can also be provided by external entities over the internet. Neither the metadata being harvested nor the list(s) of endpoints provided by external entities are vetted or checked by the Harvester. **Users who wish to limit the scope of the Harvester's reach should configure the network or machine where the Harvester is located with allow lists or deny lists of web endpoints to prevent the Harvester from reaching undesirable locations.**
 
 ## Releases and Downloads
+- 2.7.1 - December 21, 2023, [release notes](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
 - 2.7.0 - June 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
 - 2.6.5 - July 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.5) for release notes and downloads. 
 - 2.6.4 - July 8, 2020, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.4) for release notes and downloads. 

From 7567cce028f1ef2a1ef5a00c01ed1493cc6299de Mon Sep 17 00:00:00 2001
From: Ankita Srivastava <ankita_srivastava@esri.com>
Date: Mon, 22 Jul 2024 10:10:28 +0530
Subject: [PATCH 15/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cc4cb27e..5a6f77fd 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To report an issue, please go to [issues](https://github.com/Esri/geoportal-serv
 The nature of the Harvester application is, as the name suggests, to harvest metadata from whatever web endpoints it is provided. The list(s) of endpoints to download metadata from can also be provided by external entities over the internet. Neither the metadata being harvested nor the list(s) of endpoints provided by external entities are vetted or checked by the Harvester. **Users who wish to limit the scope of the Harvester's reach should configure the network or machine where the Harvester is located with allow lists or deny lists of web endpoints to prevent the Harvester from reaching undesirable locations.**
 
 ## Releases and Downloads
-- 2.7.1 - December 21, 2023, [release notes](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
+- 2.7.1 - December 21, 2023, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
 - 2.7.0 - June 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.7.1) for release notes and downloads. 
 - 2.6.5 - July 13, 2021, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.5) for release notes and downloads. 
 - 2.6.4 - July 8, 2020, click [here](https://github.com/Esri/geoportal-server-harvester/releases/tag/v2.6.4) for release notes and downloads.