Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hbz/lobid-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
dr0i committed May 23, 2024
2 parents 7c0dd7d + 8865f03 commit 9dfcaaa
Show file tree
Hide file tree
Showing 43 changed files with 119 additions and 115 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
./gradlew publishToMavenLocal
cd ..
- name: Build with Maven
run: mvn install
run: |
mvn install
mvn editorconfig:check
- name: Cache SBT
uses: actions/cache@v3
with:
Expand Down
8 changes: 5 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.lobid</groupId>
<artifactId>lobid-resources</artifactId>
Expand Down Expand Up @@ -234,7 +234,7 @@
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<argLine>-Xmx1024m</argLine>
<argLine>-Xmx1536m</argLine>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -265,6 +265,7 @@
<excludes>
<exclude>web/public/javascripts/leaflet.js</exclude>
<exclude>**/*.woff2</exclude>
<exclude>web/conf/context.jsonld</exclude>
<exclude>src/test/resources/alma-fix/</exclude>
<exclude>web/public/stylesheets/bootstrap.min.css</exclude>
<exclude>web/public/stylesheets/font-awesome.min.css</exclude>
Expand All @@ -277,6 +278,7 @@
</excludes>
</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990001412590206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990001412590206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990001412590206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/alma-fix/990021974470206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990021974470206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990021974470206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand All @@ -202,7 +202,7 @@
"id" : "http://lobid.org/organisations/DE-38-208#!",
"label" : "Gemeinschaftsbibliothek Internationales Recht"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990021974470206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990021974470206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990026405480206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"id" : "http://lobid.org/organisations/DE-38-420#!",
"label" : "Historisches Institut, Abteilung für Mittlere und Neuere Geschichte mit Abteilung für Nationalismusforschung, Bibliothek"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990026405480206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990026405480206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990035016180206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990035016180206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990035016180206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990041403870206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990041403870206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990041403870206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990052965140206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
}, {
"label" : "lobid Bestandsressource",
"type" : [ "Item", "NurTitel" ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990052965140206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990052965140206441&fdb=uni" ],
"heldBy" : {
"isil" : "DE-38",
"id" : "http://lobid.org/organisations/DE-38#!",
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/alma-fix/990053976760206441.json
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
},
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990053976760206441&fdb=uni " ],
"seeAlso" : [ "https://katalog.ub.uni-koeln.de/portal/search.html?num=20&page=1&l=de&srt=year_desc&tab=books&hbzid=990053976760206441&fdb=uni" ],
"inCollection" : [ {
"id" : "http://lobid.org/organisations/DE-38#!",
"label" : "Universitäts- und Stadtbibliothek Köln, Hauptabteilung"
Expand Down
Loading

0 comments on commit 9dfcaaa

Please sign in to comment.