Merge pull request xmlresolver#22 from ndw/dev

Remove `xmlresolver.properties` from the distribution

README.md

@@ -22,6 +22,13 @@ See also: https://xmlresolver.org/
 
 ## Release notes
 
+### 1.0.1, 5 March 2019
+
+* Removed the default `xmlresolver.properties` file that shipped in the XML Resolver jar file.
+  This fixes [issue 21](https://github.com/ndw/xmlresolver/issues/21) but introduces no change
+  in behavior because the default values in the absence of a property configuration file are all
+  the same as what was in that default properties file.
+
 ### 1.0.0, 2 March 2019
 
 * Let’s call it 1.0.0!

core/src/main/java/org/xmlresolver/Configuration.java

@@ -16,6 +16,15 @@
  * @author swachter
  */
 public class Configuration {
+    private final Properties properties;
+    private final URL propertiesFileUri;
+
+    public Configuration(Properties properties, URL propertiesFileUri) {
+        Catalog.logger.debug("XMLResolver version " + BuildConfig.VERSION);
+        Catalog.logger.debug("Loading xmlresolver.properties: " + propertiesFileUri);
+        this.properties = properties;
+        this.propertiesFileUri = propertiesFileUri;
+    }
 
     private static boolean isTrue(String aString) {
         return "true".equalsIgnoreCase(aString) || "yes".equalsIgnoreCase(aString) || "1".equalsIgnoreCase(aString);
@@ -77,8 +86,6 @@ private static Configuration fromProperties(URL propurl) {
         Configuration config = null;
 
         if (propurl != null) {
-            Catalog.logger.debug("XMLResolver version " + BuildConfig.VERSION);
-            Catalog.logger.debug("Loading xmlresolver.properties: " + propurl);
             Properties properties = new Properties();
             try {
                 properties.load(propurl.openStream());
@@ -91,14 +98,6 @@ private static Configuration fromProperties(URL propurl) {
         return config;
     }
 
-    private final Properties properties;
-    private final URL propertiesFileUri;
-
-    public Configuration(Properties properties, URL propertiesFileUri) {
-        this.properties = properties;
-        this.propertiesFileUri = propertiesFileUri;
-    }
-
     private String getProperty(String aPropertyName) {
         return properties != null ? properties.getProperty(aPropertyName) : null;
     }

gradle.properties

@@ -1,2 +1,2 @@
-version=1.0.0
+version=1.0.1a
 group=org.xmlresolver