Skip to content

Commit

Permalink
issue #82: enable to be built with OpenJDK > 8
Browse files Browse the repository at this point in the history
  • Loading branch information
pkiraly committed Jan 15, 2021
1 parent 1f2e0ff commit 7bd75a4
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ before_install:
# - echo MAVEN_OPTS $MAVEN_OPTS

after_success:
- mvn clean cobertura:cobertura coveralls:report
- mvn clean jacoco:report coveralls:report

env:
global:
Expand Down
8 changes: 6 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,16 @@
<skipStaging>${skipStaging}</skipStaging>
</configuration>
</plugin>
<!-- this settings needed for coveralls service -->
<!-- aggregated reports for multi-module projects -->
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<!-- this settings needed for coveralls service -->
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
</configuration>
<executions>
Expand All @@ -299,6 +300,7 @@
</execution>
</executions>
</plugin>
-->
<!-- Autogenerated code coverage reports published at
https://coveralls.io/github/pkiraly/metadata-qa-marc -->
<plugin>
Expand Down Expand Up @@ -345,6 +347,7 @@

<reporting>
<plugins>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
Expand All @@ -364,6 +367,7 @@
</reportSet>
</reportSets>
</plugin>
-->
</plugins>
</reporting>

Expand Down
14 changes: 0 additions & 14 deletions scala/build.sbt

This file was deleted.

1 change: 1 addition & 0 deletions scala/build.sbt
13 changes: 13 additions & 0 deletions scala/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@
# target/scala-2.10/europeana-qa_2.10-1.0.jar
#

DEFAULT_VERSION=11
VERSION=$1
echo "v1: '$VERSION'"
if [[ "$VERSION" != "12" && "$VERSION" != "11" ]]; then
VERSION=$DEFAULT_VERSION
fi
echo "v2: '$VERSION'"

if [[ -e build.sbt ]]; then
rm build.sbt
fi
ln -s build-2.${VERSION}.tpl build.sbt

sbt clean compile package

exit 0
Expand Down
8 changes: 5 additions & 3 deletions scripts/gent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ NAME=gent
# TYPE_PARAMS="--marcVersion GENT"
# MARC_DIR=${BASE_INPUT_DIR}/gent/marc/2019-06-05
# MASK=*.mrc
TYPE_PARAMS="--marcVersion GENT --alephseq"
MARC_DIR=${BASE_INPUT_DIR}/gent/marc/2020-05-27
MASK=*.export
TYPE_PARAMS="--marcVersion GENT --alephseq --with-delete"
# MARC_DIR=${BASE_INPUT_DIR}/gent/marc/2020-05-27
# MASK=*.export
MARC_DIR=${BASE_INPUT_DIR}/gent/marc/2021-01-02
MASK=rug01.backup*

. ./common-script

Expand Down
2 changes: 1 addition & 1 deletion validator
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Calling Validator
. ./common-variables

/usr/bin/java -Xmx8g -cp $JAR de.gwdg.metadataqa.marc.cli.Validator $@
/usr/bin/java -Xmx12g -cp $JAR de.gwdg.metadataqa.marc.cli.Validator $@

0 comments on commit 7bd75a4

Please sign in to comment.