update to gradle 5.6, xbib content 2.0.1
This commit is contained in:
parent
fac8020183
commit
d4e06c58ed
10 changed files with 21 additions and 25 deletions
|
@ -1,9 +1,9 @@
|
||||||
group = org.xbib
|
group = org.xbib
|
||||||
name = marc
|
name = marc
|
||||||
version = 2.0.0
|
version = 2.0.1
|
||||||
|
|
||||||
# main
|
# main
|
||||||
xbib-content.version = 2.0.0
|
xbib-content.version = 2.0.1
|
||||||
|
|
||||||
# runtime
|
# runtime
|
||||||
xbib-bibliographic-character-sets.version = 1.0.0
|
xbib-bibliographic-character-sets.version = 1.0.0
|
||||||
|
@ -14,5 +14,3 @@ xalan.version = 2.7.2
|
||||||
xmlunit-matchers.version = 2.3.0
|
xmlunit-matchers.version = 2.3.0
|
||||||
system-rules.version = 1.16.0
|
system-rules.version = 1.16.0
|
||||||
|
|
||||||
org.gradle.warning.mode = all
|
|
||||||
org.gradle.daemon = false
|
|
||||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
6
gradlew
vendored
6
gradlew
vendored
|
@ -7,7 +7,7 @@
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
# You may obtain a copy of the License at
|
# 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
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
# 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\""
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
fi
|
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"`
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
2
gradlew.bat
vendored
2
gradlew.bat
vendored
|
@ -5,7 +5,7 @@
|
||||||
@rem you may not use this file except in compliance with the License.
|
@rem you may not use this file except in compliance with the License.
|
||||||
@rem You may obtain a copy of the License at
|
@rem You may obtain a copy of the License at
|
||||||
@rem
|
@rem
|
||||||
@rem http://www.apache.org/licenses/LICENSE-2.0
|
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||||
@rem
|
@rem
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
@rem Unless required by applicable law or agreed to in writing, software
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
|
|
@ -45,8 +45,6 @@ import org.xml.sax.EntityResolver;
|
||||||
import org.xml.sax.ErrorHandler;
|
import org.xml.sax.ErrorHandler;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
import org.xml.sax.SAXNotRecognizedException;
|
|
||||||
import org.xml.sax.SAXNotSupportedException;
|
|
||||||
import org.xml.sax.XMLReader;
|
import org.xml.sax.XMLReader;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -278,7 +276,7 @@ public final class Marc {
|
||||||
return wrapFields(BIBLIOGRAPHIC_TYPE, stream, true);
|
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);
|
return wrapFields(type, stream, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -358,7 +356,7 @@ public final class Marc {
|
||||||
* @return the number of chunks in the stream
|
* @return the number of chunks in the stream
|
||||||
* @throws IOException if chunk reading fails
|
* @throws IOException if chunk reading fails
|
||||||
*/
|
*/
|
||||||
public long wrapRecords(ChunkStream<byte[], BytesReference> stream,
|
private long wrapRecords(ChunkStream<byte[], BytesReference> stream,
|
||||||
boolean withCollection) throws IOException {
|
boolean withCollection) throws IOException {
|
||||||
final AtomicInteger l = new AtomicInteger();
|
final AtomicInteger l = new AtomicInteger();
|
||||||
try {
|
try {
|
||||||
|
@ -415,22 +413,22 @@ public final class Marc {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
|
public void setFeature(String name, boolean value) {
|
||||||
builder.setFeature(name, value);
|
builder.setFeature(name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
|
public boolean getFeature(String name) {
|
||||||
return builder.getFeature(name);
|
return builder.getFeature(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
|
public void setProperty(String name, Object value) {
|
||||||
builder.setProperty(name, value);
|
builder.setProperty(name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
|
public Object getProperty(String name) {
|
||||||
return builder.getProperty(name);
|
return builder.getProperty(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -526,7 +524,7 @@ public final class Marc {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void parse(String systemId) throws IOException, SAXException {
|
public void parse(String systemId) throws IOException {
|
||||||
parse(new InputSource(systemId));
|
parse(new InputSource(systemId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1096,7 +1094,7 @@ public final class Marc {
|
||||||
this.marcGenerator = createGenerator();
|
this.marcGenerator = createGenerator();
|
||||||
}
|
}
|
||||||
this.marcRecordListener = this;
|
this.marcRecordListener = this;
|
||||||
return new Iterator<MarcRecord>() {
|
return new Iterator<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasNext() {
|
public boolean hasNext() {
|
||||||
|
|
Loading…
Reference in a new issue