move common parsing

3 files changed, 5 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index ba4a915e255..b7f9193d868 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -5,7 +5,7 @@ import com.yahoo.config.model.ConfigModelContext.ApplicationType;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.log.internal.LevelsModSpec;
+import com.yahoo.container.logging.LevelsModSpec;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.Host;
 import com.yahoo.vespa.model.HostResource;
diff --git a/vespalog/src/main/java/com/yahoo/log/internal/LevelsModSpec.java b/container-core/src/main/java/com/yahoo/container/logging/LevelsModSpec.java
index 4e45b2a91c5..050b24562a3 100644
--- a/vespalog/src/main/java/com/yahoo/log/internal/LevelsModSpec.java
+++ b/container-core/src/main/java/com/yahoo/container/logging/LevelsModSpec.java
@@ -1,5 +1,5 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.log.internal;
+package com.yahoo.container.logging;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/vespalog/src/test/java/com/yahoo/log/internal/LevelsModSpecTest.java b/container-core/src/test/java/com/yahoo/container/logging/LevelsModSpecTest.java
index 0c4f5033133..d126f605d38 100644
--- a/vespalog/src/test/java/com/yahoo/log/internal/LevelsModSpecTest.java
+++ b/container-core/src/test/java/com/yahoo/container/logging/LevelsModSpecTest.java
@@ -1,9 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.log.internal;
+package com.yahoo.container.logging;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author arnej