Merged 'pmml-h2o-testing' modoule into the main module

See commit 702356c
jpmml · Jan 7, 2022 · d4e0276 · d4e0276
1 parent d156251
commit d4e0276
Show file tree

Hide file tree

Showing 78 changed files with 5 additions and 67 deletions.
diff --git a/pmml-h2o-testing/pom.xml b/pmml-h2o-testing/pom.xml
diff --git a/pmml-h2o/pom.xml b/pmml-h2o/pom.xml
@@ -28,6 +28,10 @@
 			<groupId>org.jpmml</groupId>
 			<artifactId>pmml-converter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jpmml</groupId>
+			<artifactId>pmml-converter-testing</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.jpmml</groupId>

diff --git a/...n/java/org/jpmml/h2o/testing/H2OTest.java → ...n/java/org/jpmml/h2o/testing/H2OTest.java b/...n/java/org/jpmml/h2o/testing/H2OTest.java → ...n/java/org/jpmml/h2o/testing/H2OTest.java
diff --git a/...a/org/jpmml/h2o/testing/H2OTestBatch.java → ...a/org/jpmml/h2o/testing/H2OTestBatch.java b/...a/org/jpmml/h2o/testing/H2OTestBatch.java → ...a/org/jpmml/h2o/testing/H2OTestBatch.java
diff --git a/...2o/testing/DrfMojoModelConverterTest.java → ...2o/testing/DrfMojoModelConverterTest.java b/...2o/testing/DrfMojoModelConverterTest.java → ...2o/testing/DrfMojoModelConverterTest.java
diff --git a/...2o/testing/GbmMojoModelConverterTest.java → ...2o/testing/GbmMojoModelConverterTest.java b/...2o/testing/GbmMojoModelConverterTest.java → ...2o/testing/GbmMojoModelConverterTest.java
diff --git a/...2o/testing/GlmMojoModelConverterTest.java → ...2o/testing/GlmMojoModelConverterTest.java b/...2o/testing/GlmMojoModelConverterTest.java → ...2o/testing/GlmMojoModelConverterTest.java
diff --git a/...GlmMultinomialMojoModelConverterTest.java → ...GlmMultinomialMojoModelConverterTest.java b/...GlmMultinomialMojoModelConverterTest.java → ...GlmMultinomialMojoModelConverterTest.java
diff --git a/...solationForestMojoModelConverterTest.java → ...solationForestMojoModelConverterTest.java b/...solationForestMojoModelConverterTest.java → ...solationForestMojoModelConverterTest.java
diff --git a/...tackedEnsembleMojoModelConverterTest.java → ...tackedEnsembleMojoModelConverterTest.java b/...tackedEnsembleMojoModelConverterTest.java → ...tackedEnsembleMojoModelConverterTest.java
diff --git a/...esting/XGBoostMojoModelConverterTest.java → ...esting/XGBoostMojoModelConverterTest.java b/...esting/XGBoostMojoModelConverterTest.java → ...esting/XGBoostMojoModelConverterTest.java
diff --git a/...-testing/src/test/resources/csv/Audit.csv → pmml-h2o/src/test/resources/csv/Audit.csv b/...-testing/src/test/resources/csv/Audit.csv → pmml-h2o/src/test/resources/csv/Audit.csv
diff --git a/...esting/src/test/resources/csv/AuditNA.csv → pmml-h2o/src/test/resources/csv/AuditNA.csv b/...esting/src/test/resources/csv/AuditNA.csv → pmml-h2o/src/test/resources/csv/AuditNA.csv
diff --git a/...o-testing/src/test/resources/csv/Auto.csv → pmml-h2o/src/test/resources/csv/Auto.csv b/...o-testing/src/test/resources/csv/Auto.csv → pmml-h2o/src/test/resources/csv/Auto.csv
diff --git a/...testing/src/test/resources/csv/AutoNA.csv → pmml-h2o/src/test/resources/csv/AutoNA.csv b/...testing/src/test/resources/csv/AutoNA.csv → pmml-h2o/src/test/resources/csv/AutoNA.csv
diff --git a/...sting/src/test/resources/csv/GBMAudit.csv → pmml-h2o/src/test/resources/csv/GBMAudit.csv b/...sting/src/test/resources/csv/GBMAudit.csv → pmml-h2o/src/test/resources/csv/GBMAudit.csv
diff --git a/...ing/src/test/resources/csv/GBMAuditNA.csv → ...h2o/src/test/resources/csv/GBMAuditNA.csv b/...ing/src/test/resources/csv/GBMAuditNA.csv → ...h2o/src/test/resources/csv/GBMAuditNA.csv
diff --git a/...esting/src/test/resources/csv/GBMAuto.csv → pmml-h2o/src/test/resources/csv/GBMAuto.csv b/...esting/src/test/resources/csv/GBMAuto.csv → pmml-h2o/src/test/resources/csv/GBMAuto.csv
diff --git a/...ting/src/test/resources/csv/GBMAutoNA.csv → ...-h2o/src/test/resources/csv/GBMAutoNA.csv b/...ting/src/test/resources/csv/GBMAutoNA.csv → ...-h2o/src/test/resources/csv/GBMAutoNA.csv
diff --git a/...rc/test/resources/csv/GBMGammaVisitNA.csv → ...rc/test/resources/csv/GBMGammaVisitNA.csv b/...rc/test/resources/csv/GBMGammaVisitNA.csv → ...rc/test/resources/csv/GBMGammaVisitNA.csv
diff --git a/...esting/src/test/resources/csv/GBMIris.csv → pmml-h2o/src/test/resources/csv/GBMIris.csv b/...esting/src/test/resources/csv/GBMIris.csv → pmml-h2o/src/test/resources/csv/GBMIris.csv
diff --git a/...rc/test/resources/csv/GBMPoissonVisit.csv → ...rc/test/resources/csv/GBMPoissonVisit.csv b/...rc/test/resources/csv/GBMPoissonVisit.csv → ...rc/test/resources/csv/GBMPoissonVisit.csv
diff --git a/.../test/resources/csv/GBMPoissonVisitNA.csv → .../test/resources/csv/GBMPoissonVisitNA.csv b/.../test/resources/csv/GBMPoissonVisitNA.csv → .../test/resources/csv/GBMPoissonVisitNA.csv
diff --git a/...rc/test/resources/csv/GBMTweedieVisit.csv → ...rc/test/resources/csv/GBMTweedieVisit.csv b/...rc/test/resources/csv/GBMTweedieVisit.csv → ...rc/test/resources/csv/GBMTweedieVisit.csv
diff --git a/...sting/src/test/resources/csv/GLMAudit.csv → pmml-h2o/src/test/resources/csv/GLMAudit.csv b/...sting/src/test/resources/csv/GLMAudit.csv → pmml-h2o/src/test/resources/csv/GLMAudit.csv
diff --git a/...ing/src/test/resources/csv/GLMAuditNA.csv → ...h2o/src/test/resources/csv/GLMAuditNA.csv b/...ing/src/test/resources/csv/GLMAuditNA.csv → ...h2o/src/test/resources/csv/GLMAuditNA.csv
diff --git a/...esting/src/test/resources/csv/GLMAuto.csv → pmml-h2o/src/test/resources/csv/GLMAuto.csv b/...esting/src/test/resources/csv/GLMAuto.csv → pmml-h2o/src/test/resources/csv/GLMAuto.csv
diff --git a/...ting/src/test/resources/csv/GLMAutoNA.csv → ...-h2o/src/test/resources/csv/GLMAutoNA.csv b/...ting/src/test/resources/csv/GLMAutoNA.csv → ...-h2o/src/test/resources/csv/GLMAutoNA.csv
diff --git a/...esting/src/test/resources/csv/GLMIris.csv → pmml-h2o/src/test/resources/csv/GLMIris.csv b/...esting/src/test/resources/csv/GLMIris.csv → pmml-h2o/src/test/resources/csv/GLMIris.csv
diff --git a/...esting/src/test/resources/csv/Housing.csv → pmml-h2o/src/test/resources/csv/Housing.csv b/...esting/src/test/resources/csv/Housing.csv → pmml-h2o/src/test/resources/csv/Housing.csv
diff --git a/...o-testing/src/test/resources/csv/Iris.csv → pmml-h2o/src/test/resources/csv/Iris.csv b/...o-testing/src/test/resources/csv/Iris.csv → pmml-h2o/src/test/resources/csv/Iris.csv
diff --git a/.../resources/csv/IsolationForestHousing.csv → .../resources/csv/IsolationForestHousing.csv b/.../resources/csv/IsolationForestHousing.csv → .../resources/csv/IsolationForestHousing.csv
diff --git a/.../test/resources/csv/RandomForestAudit.csv → .../test/resources/csv/RandomForestAudit.csv b/.../test/resources/csv/RandomForestAudit.csv → .../test/resources/csv/RandomForestAudit.csv
diff --git a/...est/resources/csv/RandomForestAuditNA.csv → ...est/resources/csv/RandomForestAuditNA.csv b/...est/resources/csv/RandomForestAuditNA.csv → ...est/resources/csv/RandomForestAuditNA.csv
diff --git a/...c/test/resources/csv/RandomForestAuto.csv → ...c/test/resources/csv/RandomForestAuto.csv b/...c/test/resources/csv/RandomForestAuto.csv → ...c/test/resources/csv/RandomForestAuto.csv
diff --git a/...test/resources/csv/RandomForestAutoNA.csv → ...test/resources/csv/RandomForestAutoNA.csv b/...test/resources/csv/RandomForestAutoNA.csv → ...test/resources/csv/RandomForestAutoNA.csv
diff --git a/...c/test/resources/csv/RandomForestIris.csv → ...c/test/resources/csv/RandomForestIris.csv b/...c/test/resources/csv/RandomForestIris.csv → ...c/test/resources/csv/RandomForestIris.csv
diff --git a/.../resources/csv/StackedEnsembleAuditNA.csv → .../resources/csv/StackedEnsembleAuditNA.csv b/.../resources/csv/StackedEnsembleAuditNA.csv → .../resources/csv/StackedEnsembleAuditNA.csv
diff --git a/...t/resources/csv/StackedEnsembleAutoNA.csv → ...t/resources/csv/StackedEnsembleAutoNA.csv b/...t/resources/csv/StackedEnsembleAutoNA.csv → ...t/resources/csv/StackedEnsembleAutoNA.csv
diff --git a/...est/resources/csv/StackedEnsembleIris.csv → ...est/resources/csv/StackedEnsembleIris.csv b/...est/resources/csv/StackedEnsembleIris.csv → ...est/resources/csv/StackedEnsembleIris.csv
diff --git a/...-testing/src/test/resources/csv/Visit.csv → pmml-h2o/src/test/resources/csv/Visit.csv b/...-testing/src/test/resources/csv/Visit.csv → pmml-h2o/src/test/resources/csv/Visit.csv
diff --git a/...esting/src/test/resources/csv/VisitNA.csv → pmml-h2o/src/test/resources/csv/VisitNA.csv b/...esting/src/test/resources/csv/VisitNA.csv → pmml-h2o/src/test/resources/csv/VisitNA.csv
diff --git a/...g/src/test/resources/csv/XGBoostAudit.csv → ...o/src/test/resources/csv/XGBoostAudit.csv b/...g/src/test/resources/csv/XGBoostAudit.csv → ...o/src/test/resources/csv/XGBoostAudit.csv
diff --git a/...src/test/resources/csv/XGBoostAuditNA.csv → ...src/test/resources/csv/XGBoostAuditNA.csv b/...src/test/resources/csv/XGBoostAuditNA.csv → ...src/test/resources/csv/XGBoostAuditNA.csv
diff --git a/...ng/src/test/resources/csv/XGBoostAuto.csv → ...2o/src/test/resources/csv/XGBoostAuto.csv b/...ng/src/test/resources/csv/XGBoostAuto.csv → ...2o/src/test/resources/csv/XGBoostAuto.csv
diff --git a/.../src/test/resources/csv/XGBoostAutoNA.csv → .../src/test/resources/csv/XGBoostAutoNA.csv b/.../src/test/resources/csv/XGBoostAutoNA.csv → .../src/test/resources/csv/XGBoostAutoNA.csv
diff --git a/...ng/src/test/resources/csv/XGBoostIris.csv → ...2o/src/test/resources/csv/XGBoostIris.csv b/...ng/src/test/resources/csv/XGBoostIris.csv → ...2o/src/test/resources/csv/XGBoostIris.csv
diff --git a/...ing/src/test/resources/logging.properties → ...h2o/src/test/resources/logging.properties b/...ing/src/test/resources/logging.properties → ...h2o/src/test/resources/logging.properties
diff --git a/pmml-h2o-testing/src/test/resources/main.py → pmml-h2o/src/test/resources/main.py b/pmml-h2o-testing/src/test/resources/main.py → pmml-h2o/src/test/resources/main.py
diff --git a/...ting/src/test/resources/mojo/GBMAudit.zip → ...-h2o/src/test/resources/mojo/GBMAudit.zip b/...ting/src/test/resources/mojo/GBMAudit.zip → ...-h2o/src/test/resources/mojo/GBMAudit.zip
diff --git a/...ng/src/test/resources/mojo/GBMAuditNA.zip → ...2o/src/test/resources/mojo/GBMAuditNA.zip b/...ng/src/test/resources/mojo/GBMAuditNA.zip → ...2o/src/test/resources/mojo/GBMAuditNA.zip
diff --git a/...sting/src/test/resources/mojo/GBMAuto.zip → pmml-h2o/src/test/resources/mojo/GBMAuto.zip b/...sting/src/test/resources/mojo/GBMAuto.zip → pmml-h2o/src/test/resources/mojo/GBMAuto.zip
diff --git a/...ing/src/test/resources/mojo/GBMAutoNA.zip → ...h2o/src/test/resources/mojo/GBMAutoNA.zip b/...ing/src/test/resources/mojo/GBMAutoNA.zip → ...h2o/src/test/resources/mojo/GBMAutoNA.zip
diff --git a/...c/test/resources/mojo/GBMGammaVisitNA.zip → ...c/test/resources/mojo/GBMGammaVisitNA.zip b/...c/test/resources/mojo/GBMGammaVisitNA.zip → ...c/test/resources/mojo/GBMGammaVisitNA.zip
diff --git a/...sting/src/test/resources/mojo/GBMIris.zip → pmml-h2o/src/test/resources/mojo/GBMIris.zip b/...sting/src/test/resources/mojo/GBMIris.zip → pmml-h2o/src/test/resources/mojo/GBMIris.zip
diff --git a/...c/test/resources/mojo/GBMPoissonVisit.zip → ...c/test/resources/mojo/GBMPoissonVisit.zip b/...c/test/resources/mojo/GBMPoissonVisit.zip → ...c/test/resources/mojo/GBMPoissonVisit.zip
diff --git a/...test/resources/mojo/GBMPoissonVisitNA.zip → ...test/resources/mojo/GBMPoissonVisitNA.zip b/...test/resources/mojo/GBMPoissonVisitNA.zip → ...test/resources/mojo/GBMPoissonVisitNA.zip
diff --git a/...c/test/resources/mojo/GBMTweedieVisit.zip → ...c/test/resources/mojo/GBMTweedieVisit.zip b/...c/test/resources/mojo/GBMTweedieVisit.zip → ...c/test/resources/mojo/GBMTweedieVisit.zip
diff --git a/...ting/src/test/resources/mojo/GLMAudit.zip → ...-h2o/src/test/resources/mojo/GLMAudit.zip b/...ting/src/test/resources/mojo/GLMAudit.zip → ...-h2o/src/test/resources/mojo/GLMAudit.zip
diff --git a/...ng/src/test/resources/mojo/GLMAuditNA.zip → ...2o/src/test/resources/mojo/GLMAuditNA.zip b/...ng/src/test/resources/mojo/GLMAuditNA.zip → ...2o/src/test/resources/mojo/GLMAuditNA.zip
diff --git a/...sting/src/test/resources/mojo/GLMAuto.zip → pmml-h2o/src/test/resources/mojo/GLMAuto.zip b/...sting/src/test/resources/mojo/GLMAuto.zip → pmml-h2o/src/test/resources/mojo/GLMAuto.zip
diff --git a/...ing/src/test/resources/mojo/GLMAutoNA.zip → ...h2o/src/test/resources/mojo/GLMAutoNA.zip b/...ing/src/test/resources/mojo/GLMAutoNA.zip → ...h2o/src/test/resources/mojo/GLMAutoNA.zip
diff --git a/...sting/src/test/resources/mojo/GLMIris.zip → pmml-h2o/src/test/resources/mojo/GLMIris.zip b/...sting/src/test/resources/mojo/GLMIris.zip → pmml-h2o/src/test/resources/mojo/GLMIris.zip
diff --git a/...resources/mojo/IsolationForestHousing.zip → ...resources/mojo/IsolationForestHousing.zip b/...resources/mojo/IsolationForestHousing.zip → ...resources/mojo/IsolationForestHousing.zip
diff --git a/...test/resources/mojo/RandomForestAudit.zip → ...test/resources/mojo/RandomForestAudit.zip b/...test/resources/mojo/RandomForestAudit.zip → ...test/resources/mojo/RandomForestAudit.zip
diff --git a/...st/resources/mojo/RandomForestAuditNA.zip → ...st/resources/mojo/RandomForestAuditNA.zip b/...st/resources/mojo/RandomForestAuditNA.zip → ...st/resources/mojo/RandomForestAuditNA.zip
diff --git a/.../test/resources/mojo/RandomForestAuto.zip → .../test/resources/mojo/RandomForestAuto.zip b/.../test/resources/mojo/RandomForestAuto.zip → .../test/resources/mojo/RandomForestAuto.zip
diff --git a/...est/resources/mojo/RandomForestAutoNA.zip → ...est/resources/mojo/RandomForestAutoNA.zip b/...est/resources/mojo/RandomForestAutoNA.zip → ...est/resources/mojo/RandomForestAutoNA.zip
diff --git a/.../test/resources/mojo/RandomForestIris.zip → .../test/resources/mojo/RandomForestIris.zip b/.../test/resources/mojo/RandomForestIris.zip → .../test/resources/mojo/RandomForestIris.zip
diff --git a/...resources/mojo/StackedEnsembleAuditNA.zip → ...resources/mojo/StackedEnsembleAuditNA.zip b/...resources/mojo/StackedEnsembleAuditNA.zip → ...resources/mojo/StackedEnsembleAuditNA.zip
diff --git a/.../resources/mojo/StackedEnsembleAutoNA.zip → .../resources/mojo/StackedEnsembleAutoNA.zip b/.../resources/mojo/StackedEnsembleAutoNA.zip → .../resources/mojo/StackedEnsembleAutoNA.zip
diff --git a/...st/resources/mojo/StackedEnsembleIris.zip → ...st/resources/mojo/StackedEnsembleIris.zip b/...st/resources/mojo/StackedEnsembleIris.zip → ...st/resources/mojo/StackedEnsembleIris.zip
diff --git a/.../src/test/resources/mojo/XGBoostAudit.zip → .../src/test/resources/mojo/XGBoostAudit.zip b/.../src/test/resources/mojo/XGBoostAudit.zip → .../src/test/resources/mojo/XGBoostAudit.zip
diff --git a/...rc/test/resources/mojo/XGBoostAuditNA.zip → ...rc/test/resources/mojo/XGBoostAuditNA.zip b/...rc/test/resources/mojo/XGBoostAuditNA.zip → ...rc/test/resources/mojo/XGBoostAuditNA.zip
diff --git a/...g/src/test/resources/mojo/XGBoostAuto.zip → ...o/src/test/resources/mojo/XGBoostAuto.zip b/...g/src/test/resources/mojo/XGBoostAuto.zip → ...o/src/test/resources/mojo/XGBoostAuto.zip
diff --git a/...src/test/resources/mojo/XGBoostAutoNA.zip → ...src/test/resources/mojo/XGBoostAutoNA.zip b/...src/test/resources/mojo/XGBoostAutoNA.zip → ...src/test/resources/mojo/XGBoostAutoNA.zip
diff --git a/...g/src/test/resources/mojo/XGBoostIris.zip → ...o/src/test/resources/mojo/XGBoostIris.zip b/...g/src/test/resources/mojo/XGBoostIris.zip → ...o/src/test/resources/mojo/XGBoostIris.zip
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,6 @@
 	<modules>
 		<module>pmml-h2o</module>
 		<module>pmml-h2o-example</module>
-		<module>pmml-h2o-testing</module>
 	</modules>
 
 	<scm>
@@ -61,11 +60,6 @@
 				<artifactId>pmml-h2o-example</artifactId>
 				<version>1.2-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.jpmml</groupId>
-				<artifactId>pmml-h2o-testing</artifactId>
-				<version>1.2-SNAPSHOT</version>
-			</dependency>
 
 			<dependency>
 				<groupId>org.jpmml</groupId>
@@ -76,6 +70,7 @@
 				<groupId>org.jpmml</groupId>
 				<artifactId>pmml-converter-testing</artifactId>
 				<version>1.5.1</version>
+				<scope>provided</scope>
 			</dependency>
 
 			<dependency>