Updating lists of excluded libraries for coldfusion build to run with…

… newer coldfusion. Adding TODO notes for tdwg/bdq#73 based on failures with the validation data. Cleaning up indentation for clarity.
FilteredPush · Jul 28, 2023 · e65dab8 · e65dab8
1 parent 23ced64
commit e65dab8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -331,6 +331,9 @@
 									<exclude>javax.media:jai_imageio*</exclude>
 									<exclude>com.sun.xml.bind:jaxb-impl</exclude>
 									<exclude>com.sun.mail:jakarta.mail</exclude>
+									<exclude>javax.mail:mail</exclude>
+									<exclude>xerces:xercesImpl</exclude>
+									<exclude>commons-logging:commons</exclude>
 								</excludes>
 							</artifactSet>
 							<transformers>
@@ -405,4 +408,4 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>
diff --git a/src/main/java/org/filteredpush/qc/georeference/DwCGeoRefDQ.java b/src/main/java/org/filteredpush/qc/georeference/DwCGeoRefDQ.java
@@ -1260,6 +1260,14 @@ public static DQResponse<AmendmentValue> amendmentCountrycodeFromCoordinates(
         	result.addComment("No value supplied for dwc:decimalLongitude, unable to propose a dwc:countryCode .");
         	result.setResultState(ResultState.INTERNAL_PREREQUISITES_NOT_MET);
         } else { 
+
+        	// TODO: Parameter
+        	//551 #73 Fail got FILLED_IN expected EXTERNAL_PREREQUISITES_NOT_MET Propose filling in empty countryCode with value [AU] which contains the coordinate specified by dwc:decimalLatitude [-25.23], dwc:decimalLongitude [135.43].
+        	// TODO: uninterpretable lat/long
+        	//559 #73 Fail got NOT_AMENDED expected INTERNAL_PREREQUISITES_NOT_MET No unique dwc:contryCode found containing the coordinate specified by dwc:decimalLatitude [x], dwc:decimalLongitude [135.87].
+        	//562 #73 Fail got NOT_AMENDED expected INTERNAL_PREREQUISITES_NOT_MET No unique dwc:contryCode found containing the coordinate specified by dwc:decimalLatitude [-25.23], dwc:decimalLongitude [x].
+
+
         	String countryCode3 = GEOUtil.getCountryForPoint(decimalLatitude, decimalLongitude);
         	if (countryCode3== null) { 
         		result.addComment("No unique dwc:contryCode found containing the coordinate specified by dwc:decimalLatitude ["+decimalLatitude+"], dwc:decimalLongitude ["+decimalLongitude+"].");
@@ -1384,7 +1392,9 @@ public static DQResponse<ComplianceValue> validationDecimallatitudeInrange(
     @Provides("1bf0e210-6792-4128-b8cc-ab6828aa4871")
     @ProvidesVersion("https://rs.tdwg.org/bdq/terms/1bf0e210-6792-4128-b8cc-ab6828aa4871/2023-06-20")
     @Specification("INTERNAL_PREREQUISITES_NOT_MET if dwc:decimalLatitude is EMPTY or is not interpretable as a number, or dwc:decimalLongitude is EMPTY or is not interpretable as a number; COMPLIANT if either the value of dwc:decimalLatitude is not = 0 or the value of dwc:decimalLongitude is not = 0; otherwise NOT_COMPLIANT ")
-    public static DQResponse<ComplianceValue> validationCoordinatesNotzero(@ActedUpon("dwc:decimalLatitude") String decimalLatitude, @ActedUpon("dwc:decimalLongitude") String decimalLongitude) {
+    public static DQResponse<ComplianceValue> validationCoordinatesNotzero(
+    		@ActedUpon("dwc:decimalLatitude") String decimalLatitude, 
+    		@ActedUpon("dwc:decimalLongitude") String decimalLongitude) {
         DQResponse<ComplianceValue> result = new DQResponse<ComplianceValue>();
 
         // Specification