Revert "Gjoranv/split parent"

1 files changed, 22 insertions, 23 deletions

diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 3b5377ee5d8..61495384744 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -9,7 +9,6 @@
         <groupId>com.yahoo.vespa</groupId>
         <artifactId>parent</artifactId>
         <version>6-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>container-dependencies-enforcer</artifactId>
@@ -82,36 +81,36 @@
                                                 <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided</include>
                                                 <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided</include>
 
-                                                <include>com.google.code.findbugs:annotations:[${findbugs.version}]:jar:provided</include>
-                                                <include>com.google.code.findbugs:jsr305:[${findbugs.version}]:jar:provided</include>
-                                                <include>com.google.guava:guava:[${guava.version}]:jar:provided</include>
-                                                <include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include>
-                                                <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include>
-                                                <include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include>
+                                                <include>com.google.code.findbugs:annotations:[1.3.9]:jar:provided</include>
+                                                <include>com.google.code.findbugs:jsr305:[1.3.9]:jar:provided</include>
+                                                <include>com.google.guava:guava:[18.0]:jar:provided</include>
+                                                <include>com.google.inject.extensions:guice-assistedinject:[3.0]:jar:provided</include>
+                                                <include>com.google.inject.extensions:guice-multibindings:[3.0]:jar:provided</include>
+                                                <include>com.google.inject:guice:[3.0]:jar:provided:no_aop</include>
                                                 <include>commons-codec:commons-codec:[1.4]:jar:provided</include>
                                                 <include>commons-daemon:commons-daemon:[1.0.3]:jar:provided</include>
                                                 <include>commons-logging:commons-logging:[1.1.1]:jar:provided</include>
-                                                <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include>
+                                                <include>javax.annotation:javax.annotation-api:[1.2]:jar:provided</include>
                                                 <include>javax.inject:javax.inject:[1]:jar:provided</include>
                                                 <include>javax.servlet:javax.servlet-api:[3.1.0]:jar:provided</include>
-                                                <include>javax.validation:validation-api:[${javax.validation-api.version}]:jar:provided</include>
+                                                <include>javax.validation:validation-api:[1.1.0.Final]:jar:provided</include>
                                                 <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include>
                                                 <include>net.jcip:jcip-annotations:[1.0]:jar:provided</include>
                                                 <include>net.jpountz.lz4:lz4:[1.3.0]:jar:provided</include>
-                                                <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include>
+                                                <include>org.apache.felix:org.apache.felix.framework:[4.2.1]:jar:provided</include>
                                                 <include>org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided</include>
-                                                <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
+                                                <include>org.apache.felix:org.apache.felix.main:[4.2.1]:jar:provided</include>
                                                 <include>org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided</include>
                                                 <include>org.apache.httpcomponents:httpcore:[4.3.3]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include>
                                                 <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2.external:aopalliance-repackaged:[${hk2.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2.external:javax.inject:[${hk2.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2:hk2-api:[${hk2.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2:hk2-locator:[${hk2.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided</include>
-                                                <include>org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided</include>
+                                                <include>org.glassfish.hk2.external:aopalliance-repackaged:[2.5.0-b05]:jar:provided</include>
+                                                <include>org.glassfish.hk2.external:javax.inject:[2.5.0-b05]:jar:provided</include>
+                                                <include>org.glassfish.hk2:hk2-api:[2.5.0-b05]:jar:provided</include>
+                                                <include>org.glassfish.hk2:hk2-locator:[2.5.0-b05]:jar:provided</include>
+                                                <include>org.glassfish.hk2:hk2-utils:[2.5.0-b05]:jar:provided</include>
+                                                <include>org.glassfish.hk2:osgi-resource-locator:[1.0.1]:jar:provided</include>
                                                 <include>org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided</include>
                                                 <include>org.glassfish.jersey.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided</include>
                                                 <include>org.glassfish.jersey.containers:jersey-container-servlet:[${jersey2.version}]:jar:provided</include>
@@ -123,13 +122,13 @@
                                                 <include>org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided</include>
                                                 <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include>
                                                 <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include>
-                                                <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include>
+                                                <include>org.javassist:javassist:[3.20.0-GA]:jar:provided</include>
                                                 <include>org.json:json:[20090211]:jar:provided</include>
-                                                <include>org.jvnet.mimepull:mimepull:[${mimepull.version}]:jar:provided</include>
-                                                <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include>
-                                                <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include>
-                                                <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include>
-                                                <include>org.slf4j:slf4j-jdk14:[${slf4j.version}]:jar:provided</include>
+                                                <include>org.jvnet.mimepull:mimepull:[1.9.6]:jar:provided</include>
+                                                <include>org.slf4j:jcl-over-slf4j:[1.7.5]:jar:provided</include>
+                                                <include>org.slf4j:log4j-over-slf4j:[1.7.5]:jar:provided</include>
+                                                <include>org.slf4j:slf4j-api:[1.7.5]:jar:provided</include>
+                                                <include>org.slf4j:slf4j-jdk14:[1.7.5]:jar:provided</include>
                                                 <include>xml-apis:xml-apis:[1.4.01]:jar:provided</include>
                                             </includes>
                                         </bannedDependencies>