From 8ed10ab5039c1d5a4648af463af8deb9ca012621 Mon Sep 17 00:00:00 2001
From: Markus Gylling <markus.gylling@gmail.com>
Date: Sat, 26 Feb 2022 16:38:31 +0100
Subject: [PATCH] simplify maven, fix webapp index page flex

---
 inspector-oneroster/pom.xml                            | 10 ++--------
 .../oneedtech/inspect/oneroster/OneRoster11Tests.java  |  6 +++---
 .../java/org/oneedtech/inspect/oneroster/Samples.java  |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/inspector-oneroster/pom.xml b/inspector-oneroster/pom.xml
index 13ba132..0f5f359 100644
--- a/inspector-oneroster/pom.xml
+++ b/inspector-oneroster/pom.xml
@@ -5,7 +5,8 @@
 	<parent>
 		<groupId>org.1edtech</groupId>
 		<artifactId>inspector</artifactId>
-		<version>${revision}</version>
+	    <!-- <version>${revision}</version>  -->
+	    <version>0.6.1</version>
 	</parent>
 	<artifactId>inspector-oneroster</artifactId>
 
@@ -32,13 +33,6 @@
 				</exclusion>
 			</exclusions>			
 		</dependency>
-		<dependency>
-			<groupId>org.1edtech</groupId>
-			<artifactId>inspector-core</artifactId>
-			<classifier>tests</classifier>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
diff --git a/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/OneRoster11Tests.java b/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/OneRoster11Tests.java
index 3b34e06..ad0c497 100644
--- a/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/OneRoster11Tests.java
+++ b/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/OneRoster11Tests.java
@@ -9,8 +9,8 @@ import static org.oneedtech.inspect.oneroster.OneRoster11Inspector.TransactionKe
 import static org.oneedtech.inspect.oneroster.Samples.OR11.AS678;
 import static org.oneedtech.inspect.oneroster.Samples.OR11.AS678I;
 import static org.oneedtech.inspect.oneroster.Samples.OR11.D198;
-import static org.oneedtech.inspect.testutil.Assertions.*;
-import static org.oneedtech.inspect.testutil.Sample.fieldsToList;
+import static org.oneedtech.inspect.test.Assertions.*;
+import static org.oneedtech.inspect.test.Sample.fieldsToList;
 import static org.oneedtech.inspect.util.net.HttpMethod.GET;
 
 import java.util.Collection;
@@ -31,7 +31,7 @@ import org.oneedtech.inspect.core.probe.json.JsonPropertyPredicateProbe;
 import org.oneedtech.inspect.core.probe.json.JsonPropertyPresentProbe;
 import org.oneedtech.inspect.core.report.Report;
 import org.oneedtech.inspect.core.report.ReportItems;
-import org.oneedtech.inspect.testutil.Sample;
+import org.oneedtech.inspect.test.Sample;
 import org.oneedtech.inspect.util.resource.Resource;
 import org.oneedtech.inspect.util.resource.StringResource;
 
diff --git a/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/Samples.java b/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/Samples.java
index 0e5ab71..6cc6dcd 100644
--- a/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/Samples.java
+++ b/inspector-oneroster/src/test/java/org/oneedtech/inspect/oneroster/Samples.java
@@ -8,7 +8,7 @@ import static org.oneedtech.inspect.oneroster.OneRoster11Inspector.TransactionKe
 import static org.oneedtech.inspect.oneroster.OneRoster11Inspector.TransactionKeys.ORGS_GET_200;
 import static org.oneedtech.inspect.oneroster.OneRoster11Inspector.TransactionKeys.USERS_GET_200;
 
-import org.oneedtech.inspect.testutil.Sample;
+import org.oneedtech.inspect.test.Sample;
 
 public class Samples {