update to gradle 5.6, xbib content 2.0.1

gradle.properties

@@ -1,9 +1,9 @@
 group = org.xbib
 name = marc
-version = 2.0.0
+version = 2.0.1
 
 # main
-xbib-content.version = 2.0.0
+xbib-content.version = 2.0.1
 
 # runtime
 xbib-bibliographic-character-sets.version = 1.0.0
@@ -14,5 +14,3 @@ xalan.version = 2.7.2
 xmlunit-matchers.version = 2.3.0
 system-rules.version = 1.16.0
 
-org.gradle.warning.mode = all
-org.gradle.daemon = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-#Thu Aug 08 19:51:59 CEST 2019
+#Fri Sep 13 21:19:04 CEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # 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
+#      https://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,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/xbib/marc/Marc.java

@@ -45,8 +45,6 @@ import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.XMLReader;
 
 import java.io.IOException;
@@ -278,7 +276,7 @@ public final class Marc {
         return wrapFields(BIBLIOGRAPHIC_TYPE, stream, true);
     }
 
-    public int wrapIntoCollection(String type, ChunkStream<byte[], BytesReference> stream) throws IOException {
+    private int wrapIntoCollection(String type, ChunkStream<byte[], BytesReference> stream) throws IOException {
         return wrapFields(type, stream, true);
     }
 
@@ -358,7 +356,7 @@ public final class Marc {
      * @return the number of chunks in the stream
      * @throws IOException if chunk reading fails
      */
-    public long wrapRecords(ChunkStream<byte[], BytesReference> stream,
+    private long wrapRecords(ChunkStream<byte[], BytesReference> stream,
                             boolean withCollection) throws IOException {
         final AtomicInteger l = new AtomicInteger();
         try {
@@ -415,22 +413,22 @@ public final class Marc {
         }
 
         @Override
-        public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
+        public void setFeature(String name, boolean value) {
             builder.setFeature(name, value);
         }
 
         @Override
-        public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+        public boolean getFeature(String name) {
             return builder.getFeature(name);
         }
 
         @Override
-        public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
+        public void setProperty(String name, Object value) {
             builder.setProperty(name, value);
         }
 
         @Override
-        public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+        public Object getProperty(String name) {
             return builder.getProperty(name);
         }
 
@@ -526,7 +524,7 @@ public final class Marc {
         }
 
         @Override
-        public void parse(String systemId) throws IOException, SAXException {
+        public void parse(String systemId) throws IOException {
             parse(new InputSource(systemId));
         }
 
@@ -1096,7 +1094,7 @@ public final class Marc {
                 this.marcGenerator = createGenerator();
             }
             this.marcRecordListener = this;
-            return new Iterator<MarcRecord>() {
+            return new Iterator<>() {
 
                 @Override
                 public boolean hasNext() {

src/main/java/org/xbib/marc/label/EncodingLevel.java

@@ -126,7 +126,7 @@ public enum EncodingLevel {
             case 'z':
                 return NOT_APPLICABLE;
             default:
-                logger.log(Level.FINEST,"unknown encoding level " + ch);
+                logger.log(Level.FINEST, "unknown encoding level " + ch);
                 return FULL;
         }
     }

src/main/java/org/xbib/marc/label/RecordStatus.java

@@ -82,7 +82,7 @@ public enum RecordStatus {
             case 'p':
                 return INCREASE_IN_ENCODING_LEVEL_FROM_PREPUBLICATION;
             default:
-                logger.log(Level.FINEST,"unknown record status: " + ch);
+                logger.log(Level.FINEST, "unknown record status: " + ch);
                 return UNKNOWN;
         }
     }

src/main/java/org/xbib/marc/label/TypeOfControl.java

@@ -55,7 +55,7 @@ public enum TypeOfControl {
             case 'a' :
                 return ARCHIVAL;
             default:
-                logger.log(Level.FINEST,"unknown type of control: " + ch);
+                logger.log(Level.FINEST, "unknown type of control: " + ch);
                 return UNSPECIFIED;
         }
     }

src/main/java/org/xbib/marc/label/TypeOfRecord.java

@@ -200,7 +200,7 @@ public enum TypeOfRecord {
             case 't':
                 return LANGUAGE_MATERIAL_MANUSCRIPT_MARC21;
             default:
-                logger.log(Level.FINEST,"unknown type of record: " + ch);
+                logger.log(Level.FINEST, "unknown type of record: " + ch);
                 return UNSPECIFIED;
         }
     }