diff --git a/.gitignore b/.gitignore index d8f73a2..33ae061 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .project .settings/ /build/** +.idea/ +*.iml diff --git a/pom.xml b/pom.xml index 08217bc..f539040 100644 --- a/pom.xml +++ b/pom.xml @@ -174,8 +174,8 @@ - com.mycila.maven-license-plugin - maven-license-plugin + com.mycila + license-maven-plugin 3.0
LICENSE.txt
@@ -318,7 +318,7 @@ central Maven Repository default - http://central.maven.org/maven2 + https://repo1.maven.org/maven2/ false @@ -327,12 +327,12 @@ maven - http://central.maven.org/maven2/ + https://repo1.maven.org/maven2/ spring-maven-release Spring Maven Release Repository - http://maven.springframework.org/release + https://maven.springframework.org/release @@ -362,7 +362,7 @@ - 5.4.1 + 5.6.3 2.35.0 *googlechrome src/main/java diff --git a/src/main/java/org/got5/tapestry5/upload/components/AjaxUpload.java b/src/main/java/org/got5/tapestry5/upload/components/AjaxUpload.java index fb69838..d3c825c 100644 --- a/src/main/java/org/got5/tapestry5/upload/components/AjaxUpload.java +++ b/src/main/java/org/got5/tapestry5/upload/components/AjaxUpload.java @@ -238,7 +238,7 @@ public JSONObject merge(final JSONObject defaults, final JSONObject overrides) { final Object overrideChild = overrides.get(key); - if (defaults.has(key)) { + if (defaults.containsKey(key)) { final Object defaultChild = defaults.get(key);