diff --git a/README.md b/README.md index cce2f8af0..5a6f77fd5 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ 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.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. ## Features diff --git a/geoportal-SDK/geoportal-harvester-api-base/pom.xml b/geoportal-SDK/geoportal-harvester-api-base/pom.xml index af19d12e3..9302eed16 100644 --- a/geoportal-SDK/geoportal-harvester-api-base/pom.xml +++ b/geoportal-SDK/geoportal-harvester-api-base/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-SDK - 2.7.1 + 2.7.2 harvester-api-base Esri :: Geoportal Server :: Harvester :: Api Base diff --git a/geoportal-SDK/geoportal-harvester-api/pom.xml b/geoportal-SDK/geoportal-harvester-api/pom.xml index 8ca7330a3..cb6af927c 100644 --- a/geoportal-SDK/geoportal-harvester-api/pom.xml +++ b/geoportal-SDK/geoportal-harvester-api/pom.xml @@ -4,12 +4,12 @@ geoportal-SDK com.esri.geoportal - 2.7.1 + 2.7.2 harvester-api Esri :: Geoportal Server :: Harvester :: Api Definitions of all basic elements of the Harvester (interfaces, final classes, etc.). - 2.7.1 + 2.7.2 jar diff --git a/geoportal-SDK/pom.xml b/geoportal-SDK/pom.xml index 2088d0bb2..cf26e9675 100644 --- a/geoportal-SDK/pom.xml +++ b/geoportal-SDK/pom.xml @@ -4,7 +4,7 @@ geoportal-harvester com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-SDK pom diff --git a/geoportal-application/geoportal-harvester-cli/pom.xml b/geoportal-application/geoportal-harvester-cli/pom.xml index 9d78426e8..ca40c1044 100644 --- a/geoportal-application/geoportal-harvester-cli/pom.xml +++ b/geoportal-application/geoportal-harvester-cli/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-application - 2.7.1 + 2.7.2 geoportal-harvester-cli jar diff --git a/geoportal-application/geoportal-harvester-engine/pom.xml b/geoportal-application/geoportal-harvester-engine/pom.xml index efd007cf9..03cec7a5a 100644 --- a/geoportal-application/geoportal-harvester-engine/pom.xml +++ b/geoportal-application/geoportal-harvester-engine/pom.xml @@ -4,7 +4,7 @@ geoportal-application com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-harvester-engine Esri :: Geoportal Server :: Harvester :: Application :: Engine diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml index 00aa94749..cabc9276e 100644 --- a/geoportal-application/geoportal-harvester-war/pom.xml +++ b/geoportal-application/geoportal-harvester-war/pom.xml @@ -4,7 +4,7 @@ geoportal-application com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-harvester-war war @@ -89,12 +89,27 @@ org.springframework.security.oauth spring-security-oauth2 - 2.5.1.RELEASE + 2.5.2.RELEASE org.springframework.security spring-security-jwt 1.1.1.RELEASE + + + org.springframework.security + spring-security-oauth2-client + ${springsecurity.version} + + + org.springframework.security + spring-security-oauth2-jose + ${springsecurity.version} + + + org.springframework.security + spring-security-oauth2-core + ${springsecurity.version} 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 000000000..e0814b06b --- /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 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 000000000..dbbec247d --- /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, OAuth2AccessTokenResponse> { + private static final Set 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 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 scopes = Collections.emptySet(); + if (tokenResponseParameters.containsKey(OAuth2ParameterNames.SCOPE)) { + String scope = tokenResponseParameters.get(OAuth2ParameterNames.SCOPE); + scopes = Arrays.stream(StringUtils.delimitedListToStringArray(scope, " ")).collect(Collectors.toSet()); + } + + Map 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 000000000..addf6e92e --- /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> { + + 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 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 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 000000000..a84280f64 --- /dev/null +++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/app-security-arcgis.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 66b69dac1..3206161df 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 @@ - + + 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 2cbd27700..ab1ac68c0 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 @@ spring / - - - - + + --> 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 119d17e13..2fb75f67a 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,13 +4,13 @@
-
Ver. 2.7.1
+
Ver. 2.7.2
-
© Harvester 2023
+
© Harvester 2024
diff --git a/geoportal-application/pom.xml b/geoportal-application/pom.xml index eb338b8e9..0a71e2be7 100644 --- a/geoportal-application/pom.xml +++ b/geoportal-application/pom.xml @@ -4,7 +4,7 @@ geoportal-harvester com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-application pom diff --git a/geoportal-commons/geoportal-commons-agp-client/pom.xml b/geoportal-commons/geoportal-commons-agp-client/pom.xml index 64348fb61..f973e7064 100644 --- a/geoportal-commons/geoportal-commons-agp-client/pom.xml +++ b/geoportal-commons/geoportal-commons-agp-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-agp-client Esri :: Geoportal Server :: Commons :: ArcGIS Portal Client diff --git a/geoportal-commons/geoportal-commons-ags-client/pom.xml b/geoportal-commons/geoportal-commons-ags-client/pom.xml index a46acd570..07c4561cd 100644 --- a/geoportal-commons/geoportal-commons-ags-client/pom.xml +++ b/geoportal-commons/geoportal-commons-ags-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-ags-client Esri :: Geoportal Server :: Commons :: ArcGIS Server Client diff --git a/geoportal-commons/geoportal-commons-ckan-client/pom.xml b/geoportal-commons/geoportal-commons-ckan-client/pom.xml index 3bc44bb0f..87011fa2d 100644 --- a/geoportal-commons/geoportal-commons-ckan-client/pom.xml +++ b/geoportal-commons/geoportal-commons-ckan-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-ckan-client Esri :: Geoportal Server :: Commons :: CKAN Lightweight Client diff --git a/geoportal-commons/geoportal-commons-constants/pom.xml b/geoportal-commons/geoportal-commons-constants/pom.xml index 49631bfb7..044008f26 100644 --- a/geoportal-commons/geoportal-commons-constants/pom.xml +++ b/geoportal-commons/geoportal-commons-constants/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-constants jar diff --git a/geoportal-commons/geoportal-commons-csw-client/pom.xml b/geoportal-commons/geoportal-commons-csw-client/pom.xml index 4fafbf194..fc1eeb3cd 100644 --- a/geoportal-commons/geoportal-commons-csw-client/pom.xml +++ b/geoportal-commons/geoportal-commons-csw-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-csw-client Esri :: Geoportal Server :: Commons :: Csw Client diff --git a/geoportal-commons/geoportal-commons-dcat-client/pom.xml b/geoportal-commons/geoportal-commons-dcat-client/pom.xml index c771281c1..f10cd5969 100644 --- a/geoportal-commons/geoportal-commons-dcat-client/pom.xml +++ b/geoportal-commons/geoportal-commons-dcat-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-dcat-client jar diff --git a/geoportal-commons/geoportal-commons-doc/pom.xml b/geoportal-commons/geoportal-commons-doc/pom.xml index c823f28ee..f0cd12273 100644 --- a/geoportal-commons/geoportal-commons-doc/pom.xml +++ b/geoportal-commons/geoportal-commons-doc/pom.xml @@ -6,7 +6,7 @@ geoportal-commons com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-commons-doc jar diff --git a/geoportal-commons/geoportal-commons-geometry/pom.xml b/geoportal-commons/geoportal-commons-geometry/pom.xml index cca39d022..f75752e16 100644 --- a/geoportal-commons/geoportal-commons-geometry/pom.xml +++ b/geoportal-commons/geoportal-commons-geometry/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-geometry Esri :: Geoportal Server :: Commons :: Geometry Utils diff --git a/geoportal-commons/geoportal-commons-gpt-client/pom.xml b/geoportal-commons/geoportal-commons-gpt-client/pom.xml index 9e9a1a515..351977807 100644 --- a/geoportal-commons/geoportal-commons-gpt-client/pom.xml +++ b/geoportal-commons/geoportal-commons-gpt-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-gpt-client Esri :: Geoportal Server :: Commons :: Geoportal Rest Client diff --git a/geoportal-commons/geoportal-commons-meta/pom.xml b/geoportal-commons/geoportal-commons-meta/pom.xml index 89e7e7f78..b1d4e817e 100644 --- a/geoportal-commons/geoportal-commons-meta/pom.xml +++ b/geoportal-commons/geoportal-commons-meta/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-meta Esri :: Geoportal Server :: Commons :: Meta 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 ee02dd40e..409433062 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 @@ -98,7 +98,6 @@ - --> diff --git a/geoportal-commons/geoportal-commons-oai-client/pom.xml b/geoportal-commons/geoportal-commons-oai-client/pom.xml index 887b3627d..b05cd0ace 100644 --- a/geoportal-commons/geoportal-commons-oai-client/pom.xml +++ b/geoportal-commons/geoportal-commons-oai-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-oai-client Esri :: Geoportal Server :: Commons :: OAI-PMH Client diff --git a/geoportal-commons/geoportal-commons-pdf/pom.xml b/geoportal-commons/geoportal-commons-pdf/pom.xml index 13f631052..23164c67a 100644 --- a/geoportal-commons/geoportal-commons-pdf/pom.xml +++ b/geoportal-commons/geoportal-commons-pdf/pom.xml @@ -6,7 +6,7 @@ geoportal-commons com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-commons-pdf jar diff --git a/geoportal-commons/geoportal-commons-robots/pom.xml b/geoportal-commons/geoportal-commons-robots/pom.xml index d60714707..08be8b5aa 100644 --- a/geoportal-commons/geoportal-commons-robots/pom.xml +++ b/geoportal-commons/geoportal-commons-robots/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 commons-robots Esri :: Geoportal Server :: Commons :: Robots diff --git a/geoportal-commons/geoportal-commons-stac-client/pom.xml b/geoportal-commons/geoportal-commons-stac-client/pom.xml index 208cb9f2c..f0ab57184 100644 --- a/geoportal-commons/geoportal-commons-stac-client/pom.xml +++ b/geoportal-commons/geoportal-commons-stac-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-stac-client jar diff --git a/geoportal-commons/geoportal-commons-thredds-client/pom.xml b/geoportal-commons/geoportal-commons-thredds-client/pom.xml index 381e496fb..567425c20 100644 --- a/geoportal-commons/geoportal-commons-thredds-client/pom.xml +++ b/geoportal-commons/geoportal-commons-thredds-client/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 geoportal-commons-thredds-client Esri :: Geoportal Server :: Commons :: THREDDS Client diff --git a/geoportal-commons/geoportal-commons-utils/pom.xml b/geoportal-commons/geoportal-commons-utils/pom.xml index 5b300eca2..906197d92 100644 --- a/geoportal-commons/geoportal-commons-utils/pom.xml +++ b/geoportal-commons/geoportal-commons-utils/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-commons - 2.7.1 + 2.7.2 commons-utils jar diff --git a/geoportal-commons/pom.xml b/geoportal-commons/pom.xml index a3e726d2d..16bdc6c0d 100644 --- a/geoportal-commons/pom.xml +++ b/geoportal-commons/pom.xml @@ -4,7 +4,7 @@ geoportal-harvester com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-commons pom diff --git a/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml b/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml index 5ac6223bf..78b5b3c3d 100644 --- a/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml +++ b/geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-agp-publisher Esri :: Geoportal Server :: Harvester :: Data Publisher :: ArcGIS Portal @@ -14,7 +14,7 @@ ${project.groupId} geoportal-commons-agp-client - 2.7.1 + 2.7.2 jar diff --git a/geoportal-connectors/geoportal-harvester-agp-source/pom.xml b/geoportal-connectors/geoportal-harvester-agp-source/pom.xml index 21521e404..e00790142 100644 --- a/geoportal-connectors/geoportal-harvester-agp-source/pom.xml +++ b/geoportal-connectors/geoportal-harvester-agp-source/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-agp-source Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Portal diff --git a/geoportal-connectors/geoportal-harvester-ags/pom.xml b/geoportal-connectors/geoportal-harvester-ags/pom.xml index ab98819dc..2d7c606f3 100644 --- a/geoportal-connectors/geoportal-harvester-ags/pom.xml +++ b/geoportal-connectors/geoportal-harvester-ags/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-ags Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Server diff --git a/geoportal-connectors/geoportal-harvester-ckan/pom.xml b/geoportal-connectors/geoportal-harvester-ckan/pom.xml index 053003b26..7df4e5faa 100644 --- a/geoportal-connectors/geoportal-harvester-ckan/pom.xml +++ b/geoportal-connectors/geoportal-harvester-ckan/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-ckan jar diff --git a/geoportal-connectors/geoportal-harvester-console/pom.xml b/geoportal-connectors/geoportal-harvester-console/pom.xml index 4e91cc789..b00a21f6e 100644 --- a/geoportal-connectors/geoportal-harvester-console/pom.xml +++ b/geoportal-connectors/geoportal-harvester-console/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-console Esri :: Geoportal Server :: Harvester :: Data Publisher :: Console diff --git a/geoportal-connectors/geoportal-harvester-csw/pom.xml b/geoportal-connectors/geoportal-harvester-csw/pom.xml index 6c089cc2a..0e1673567 100644 --- a/geoportal-connectors/geoportal-harvester-csw/pom.xml +++ b/geoportal-connectors/geoportal-harvester-csw/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-csw Esri :: Geoportal Server :: Harvester :: Data Source :: Csw diff --git a/geoportal-connectors/geoportal-harvester-dcat/pom.xml b/geoportal-connectors/geoportal-harvester-dcat/pom.xml index c5104fe08..aab261117 100644 --- a/geoportal-connectors/geoportal-harvester-dcat/pom.xml +++ b/geoportal-connectors/geoportal-harvester-dcat/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-dcat jar diff --git a/geoportal-connectors/geoportal-harvester-folder-big/pom.xml b/geoportal-connectors/geoportal-harvester-folder-big/pom.xml index 748e4272f..b479d96c2 100644 --- a/geoportal-connectors/geoportal-harvester-folder-big/pom.xml +++ b/geoportal-connectors/geoportal-harvester-folder-big/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-folder-big Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder :: Big diff --git a/geoportal-connectors/geoportal-harvester-folder/pom.xml b/geoportal-connectors/geoportal-harvester-folder/pom.xml index e4d247e0c..7c7ff1b88 100644 --- a/geoportal-connectors/geoportal-harvester-folder/pom.xml +++ b/geoportal-connectors/geoportal-harvester-folder/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-folder Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder diff --git a/geoportal-connectors/geoportal-harvester-gpt/pom.xml b/geoportal-connectors/geoportal-harvester-gpt/pom.xml index a269cb0d1..eb1f779c3 100644 --- a/geoportal-connectors/geoportal-harvester-gpt/pom.xml +++ b/geoportal-connectors/geoportal-harvester-gpt/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-gpt Esri :: Geoportal Server :: Harvester :: Data Publisher :: Geoportal Rest 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 484f70b46..33b5ec88c 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; diff --git a/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml b/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml index dabc93cff..f50748598 100644 --- a/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml +++ b/geoportal-connectors/geoportal-harvester-gptsrc/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-gptsrc Esri :: Geoportal Server :: Harvester :: Data Source :: Geoportal Rest diff --git a/geoportal-connectors/geoportal-harvester-jdbc/pom.xml b/geoportal-connectors/geoportal-harvester-jdbc/pom.xml index c6c4383f2..a80220577 100644 --- a/geoportal-connectors/geoportal-harvester-jdbc/pom.xml +++ b/geoportal-connectors/geoportal-harvester-jdbc/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-jdbc Esri :: Geoportal Server :: Harvester :: Data Source :: JDBC diff --git a/geoportal-connectors/geoportal-harvester-migration/pom.xml b/geoportal-connectors/geoportal-harvester-migration/pom.xml index ae1b2239d..bbe72c31f 100644 --- a/geoportal-connectors/geoportal-harvester-migration/pom.xml +++ b/geoportal-connectors/geoportal-harvester-migration/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-migration Esri :: Geoportal Server :: Harvester :: Data Source :: Migration Tool diff --git a/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml b/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml index ef740bfc8..db89fbd85 100644 --- a/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml +++ b/geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-oai-pmh Esri :: Geoportal Server :: Harvester :: Data Source :: OAI-PMH diff --git a/geoportal-connectors/geoportal-harvester-sink/pom.xml b/geoportal-connectors/geoportal-harvester-sink/pom.xml index 39bc365a8..7e0ade400 100644 --- a/geoportal-connectors/geoportal-harvester-sink/pom.xml +++ b/geoportal-connectors/geoportal-harvester-sink/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-sink Esri :: Geoportal Server :: Harvester :: Data Source :: Sink diff --git a/geoportal-connectors/geoportal-harvester-stac/pom.xml b/geoportal-connectors/geoportal-harvester-stac/pom.xml index 43043550a..7f8d60de3 100644 --- a/geoportal-connectors/geoportal-harvester-stac/pom.xml +++ b/geoportal-connectors/geoportal-harvester-stac/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-stac jar diff --git a/geoportal-connectors/geoportal-harvester-thredds/pom.xml b/geoportal-connectors/geoportal-harvester-thredds/pom.xml index bb80222df..65cde0042 100644 --- a/geoportal-connectors/geoportal-harvester-thredds/pom.xml +++ b/geoportal-connectors/geoportal-harvester-thredds/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-thredds jar diff --git a/geoportal-connectors/geoportal-harvester-unc/pom.xml b/geoportal-connectors/geoportal-harvester-unc/pom.xml index 6dab131eb..4177b8707 100644 --- a/geoportal-connectors/geoportal-harvester-unc/pom.xml +++ b/geoportal-connectors/geoportal-harvester-unc/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-unc Esri :: Geoportal Server :: Harvester :: Data Source :: Unc diff --git a/geoportal-connectors/geoportal-harvester-waf/pom.xml b/geoportal-connectors/geoportal-harvester-waf/pom.xml index a21eae8c3..b6a8f9ed4 100644 --- a/geoportal-connectors/geoportal-harvester-waf/pom.xml +++ b/geoportal-connectors/geoportal-harvester-waf/pom.xml @@ -4,7 +4,7 @@ com.esri.geoportal geoportal-connectors - 2.7.1 + 2.7.2 geoportal-harvester-waf Esri :: Geoportal Server :: Harvester :: Data Source :: Waf diff --git a/geoportal-connectors/pom.xml b/geoportal-connectors/pom.xml index 1f07a6773..6106d4cb1 100644 --- a/geoportal-connectors/pom.xml +++ b/geoportal-connectors/pom.xml @@ -4,7 +4,7 @@ geoportal-harvester com.esri.geoportal - 2.7.1 + 2.7.2 geoportal-connectors pom diff --git a/pom.xml b/pom.xml index 80be9e707..f47fd60ca 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.esri.geoportal geoportal-harvester - 2.7.1 + 2.7.2 pom Esri :: Geoportal Server :: Harvester Top-level project for all Harvester modules.