Update dependencies for new metafacture version #452

hbz · Jun 15, 2023 · fb1b2b8 · fb1b2b8
1 parent ac5ee85
commit fb1b2b8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/app/transformation/TransformAll.java b/app/transformation/TransformAll.java
@@ -8,8 +8,8 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import org.culturegraph.mf.morph.Metamorph;
-import org.culturegraph.mf.stream.converter.JsonToElasticsearchBulk;
+import org.metafacture.morph.Metamorph;
+import org.metafacture.elasticsearch.JsonToElasticsearchBulk;
 
 import controllers.Application;
 import transformation.GeoLookupMap.LookupType;

diff --git a/app/transformation/TransformDbs.java b/app/transformation/TransformDbs.java
@@ -2,15 +2,15 @@
 
 package transformation;
 
-import org.culturegraph.mf.morph.Metamorph;
-import org.culturegraph.mf.stream.converter.CsvDecoder;
-import org.culturegraph.mf.stream.converter.JsonEncoder;
-import org.culturegraph.mf.stream.converter.LineReader;
-import org.culturegraph.mf.stream.converter.StreamToTriples;
-import org.culturegraph.mf.stream.pipe.TripleFilter;
-import org.culturegraph.mf.stream.pipe.sort.TripleCollect;
-import org.culturegraph.mf.stream.sink.ObjectWriter;
-import org.culturegraph.mf.stream.source.FileOpener;
+import org.metafacture.morph.Metamorph;
+import org.metafacture.csv.CsvDecoder;
+import org.metafacture.json.JsonEncoder;
+import org.metafacture.io.LineReader;
+import org.metafacture.triples.StreamToTriples;
+import org.metafacture.triples.TripleFilter;
+import org.metafacture.triples.TripleCollect;
+import org.metafacture.io.ObjectWriter;
+import org.metafacture.io.FileOpener;
 
 /**
  * Transformation from DBS CSV to JSON.

diff --git a/app/transformation/TransformSigel.java b/app/transformation/TransformSigel.java
@@ -14,19 +14,19 @@
 import java.util.Date;
 import java.util.stream.Collectors;
 
-import org.culturegraph.mf.morph.Metamorph;
-import org.culturegraph.mf.stream.converter.JsonEncoder;
-import org.culturegraph.mf.stream.converter.StreamToTriples;
-import org.culturegraph.mf.stream.converter.xml.PicaXmlHandler;
-import org.culturegraph.mf.stream.converter.xml.XmlDecoder;
-import org.culturegraph.mf.stream.pipe.TripleFilter;
-import org.culturegraph.mf.stream.pipe.XmlElementSplitter;
-import org.culturegraph.mf.stream.pipe.sort.TripleCollect;
-import org.culturegraph.mf.stream.sink.ObjectWriter;
-import org.culturegraph.mf.stream.sink.XmlFilenameWriter;
-import org.culturegraph.mf.stream.source.FileOpener;
-import org.culturegraph.mf.stream.source.OaiPmhOpener;
-import org.culturegraph.mf.stream.source.Opener;
+import org.metafacture.morph.Metamorph;
+import org.metafacture.json.JsonEncoder
+import org.metafacture.triples.StreamToTriples;
+import org.metafacture.biblio.pica.PicaXmlHandler;
+import org.metafacture.xml.XmlDecoder;
+import org.metafacture.triples.TripleFilter;
+import org.metafacture.xml.XmlElementSplitter;
+import org.metafacture.triples.TripleCollect;
+import org.metafacture.io.ObjectWriter;
+import org.metafacture.xml.XmlFilenameWriter;
+import org.metafacture.io.FileOpener;
+import org.metafacture.biblio.OaiPmhOpener;
+TODO_ import org.culturegraph.mf.stream.source.Opener;
 
 import controllers.Application;
 import play.Logger;

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ libraryDependencies ++= Seq(
   "com.github.jsonld-java" % "jsonld-java" % "0.4.1",
   "com.github.jsonld-java" % "jsonld-java-jena" % "0.4.1" exclude("org.slf4j", "slf4j-log4j12"),
   "org.apache.jena" % "jena-arq" % "2.9.3",
-  "org.culturegraph" % "metafacture-core" % "4.0.0-HBZ-SNAPSHOT",
+  TODO: "org.metafacture" % "metafacture-core" % "5.6.0-HBZ-SNAPSHOT",
   "org.xbib.elasticsearch.plugin" % "elasticsearch-plugin-bundle" % "2.3.2.0",
   "com.jayway.jsonpath" % "json-path" % "2.2.0",
   "net.java.dev.jna" % "jna" % "4.1.0",

diff --git a/test/transformation/TestMorphs.java b/test/transformation/TestMorphs.java
@@ -2,8 +2,8 @@
 
 package transformation;
 
-import org.culturegraph.mf.test.MetamorphTestSuite;
-import org.culturegraph.mf.test.MetamorphTestSuite.TestDefinitions;
+TODO: import org.culturegraph.mf.test.MetamorphTestSuite;
+TODO: import org.culturegraph.mf.test.MetamorphTestSuite.TestDefinitions;
 import org.junit.runner.RunWith;
 
 @SuppressWarnings("javadoc")

diff --git a/test/transformation/TestTransformAll.java b/test/transformation/TestTransformAll.java
@@ -9,13 +9,13 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import org.culturegraph.mf.framework.DefaultObjectReceiver;
-import org.culturegraph.mf.morph.Metamorph;
-import org.culturegraph.mf.stream.converter.FormetaEncoder;
-import org.culturegraph.mf.stream.converter.xml.PicaXmlHandler;
-import org.culturegraph.mf.stream.converter.xml.XmlDecoder;
-import org.culturegraph.mf.stream.pipe.XmlElementSplitter;
-import org.culturegraph.mf.stream.source.FileOpener;
+TODO: import org.culturegraph.mf.framework.DefaultObjectReceiver;
+import org.metafacture.morph.Metamorph;
+import org.metafacture.formeta.FormetaEncoder;
+import org.metafacture.biblio.pica.PicaXmlHandler;
+import org.metafacture.xml.XmlDecoder;
+import org.metafacture.xml.XmlElementSplitter;
+import org.metafacture.io.FileOpener;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;