fixed circular maven dependencies

Author: br-iosb

dataformat-core/pom.xml

@@ -17,11 +17,6 @@
             <artifactId>model</artifactId>
             <version>${model.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.admin-shell.aas</groupId>
-            <artifactId>validator</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

validator/pom.xml

@@ -17,6 +17,13 @@
             <artifactId>dataformat-rdf</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>io.admin-shell.aas</groupId>
+            <artifactId>dataformat-core</artifactId>
+            <version>${revision}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-shacl</artifactId>

…/dataformat/core/ValidateModelsTest.java …/dataformat/core/ValidateModelsTest.javadataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/ValidateModelsTest.java renamed to validator/src/test/java/io/adminshell/aas/v3/dataformat/core/ValidateModelsTest.java dataformat-core/src/test/java/io/adminshell/aas/v3/dataformat/core/ValidateModelsTest.java renamed to validator/src/test/java/io/adminshell/aas/v3/dataformat/core/ValidateModelsTest.java

@@ -1,55 +1,54 @@
-/*
- * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.adminshell.aas.v3.dataformat.core;
-
-import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
-import io.adminshell.aas.v3.model.validator.ShaclValidator;
-import io.adminshell.aas.v3.model.validator.ValidationException;
-import java.io.IOException;
-import org.apache.jena.shacl.ValidationReport;
-import org.apache.jena.shacl.lib.ShLib;
-import org.junit.Assert;
-import static org.junit.Assert.assertTrue;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ValidateModelsTest {
-
-    private static final Logger log = LoggerFactory.getLogger(ValidateModelsTest.class);
-
-    @BeforeClass
-    private void init() {
-        ShaclValidator.getInstance().initialize();
-    }
-
-    @Test
-    public void validateAASFull() throws ValidationException, IOException {
-        validate(AASFull.ENVIRONMENT);
-    }
-
-    @Test
-    public void validateAASSimple() throws ValidationException, IOException {
-        validate(AASSimple.ENVIRONMENT);
-    }
-
-    private void validate(AssetAdministrationShellEnvironment aasEnv) throws ValidationException, IOException {
-        ValidationReport report = ShaclValidator.getInstance().validateGetReport(aasEnv);
-        ShLib.printReport(report);
-        assertTrue(report.conforms());
-    }
-}
+/*
+ * Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.adminshell.aas.v3.dataformat.core;
+
+import io.adminshell.aas.v3.model.AssetAdministrationShellEnvironment;
+import io.adminshell.aas.v3.model.validator.ShaclValidator;
+import io.adminshell.aas.v3.model.validator.ValidationException;
+import java.io.IOException;
+import org.apache.jena.shacl.ValidationReport;
+import org.apache.jena.shacl.lib.ShLib;
+import static org.junit.Assert.assertTrue;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ValidateModelsTest {
+
+    private static final Logger log = LoggerFactory.getLogger(ValidateModelsTest.class);
+
+    @BeforeClass
+    public static void init() {
+        ShaclValidator.getInstance().initialize();
+    }
+
+    @Test
+    public void validateAASFull() throws ValidationException, IOException {
+        validate(AASFull.ENVIRONMENT);
+    }
+
+    @Test
+    public void validateAASSimple() throws ValidationException, IOException {
+        validate(AASSimple.ENVIRONMENT);
+    }
+
+    private void validate(AssetAdministrationShellEnvironment aasEnv) throws ValidationException, IOException {
+        ValidationReport report = ShaclValidator.getInstance().validateGetReport(aasEnv);
+        ShLib.printReport(report);
+        assertTrue(report.conforms());
+    }
+}