Do not enforce container deps on maven 3.0.5

1 files changed, 103 insertions, 98 deletions

diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 6aff62248d0..4720135b609 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -24,103 +24,108 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>enforce-container-deps</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                 <property>
+                     <!-- Dependency resolution is broken for old maven used in our CentOS docker containers -->
+                    <name>maven.version</name>
+                    <value>!3.0.5</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>3.0.0-M1</version>
+                        <executions>
+                            <execution>
+                                <!-- To allow running 'mvn enforcer:enforce' from the command line -->
+                                <id>default-cli</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <bannedDependencies>
+                                            <excludes>
+                                                <!-- Only allow explicitly listed deps in provided scope -->
+                                                <exclude>*:*:*:jar:provided:*</exclude>
+                                            </excludes>
+                                            <includes>
+                                                <include>com.yahoo.vespa</include>
+                                                <include>aopalliance:aopalliance:1.0:jar:provided</include>
+                                                <include>com.fasterxml.jackson.core:jackson-annotations:2.8.3:jar:provided</include>
+                                                <include>com.fasterxml.jackson.core:jackson-core:2.8.3:jar:provided</include>
+                                                <include>com.fasterxml.jackson.core:jackson-databind:2.8.3:jar:provided</include>
+                                                <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.3:jar:provided</include>
+                                                <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.5.4:jar:provided</include>
+                                                <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.5.4:jar:provided</include>
+                                                <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.5.4:jar:provided</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: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:1.1.0.Final:jar:provided</include>
+                                                <include>javax.ws.rs:javax.ws.rs-api:2.0.1: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: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: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:9.4.6.v20170531:jar:provided</include>
+                                                <include>org.eclipse.jetty:jetty-io:9.4.6.v20170531:jar:provided</include>
+                                                <include>org.eclipse.jetty:jetty-util:9.4.6.v20170531: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:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.containers:jersey-container-servlet-core:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.containers:jersey-container-servlet:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.core:jersey-client:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.core:jersey-common:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.core:jersey-server:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.ext:jersey-entity-filtering:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.ext:jersey-proxy-client:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.media:jersey-media-jaxb:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.media:jersey-media-json-jackson:2.23.2:jar:provided</include>
+                                                <include>org.glassfish.jersey.media:jersey-media-multipart:2.23.2: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:1.9.6:jar:provided</include>
+                                                <include>org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1: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>
+                                    </rules>
+                                    <fail>true</fail>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <!-- To allow running 'mvn enforcer:enforce' from the command line -->
-                        <id>default-cli</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <excludes>
-                                        <!-- Only allow explicitly listed deps in provided scope -->
-                                        <exclude>*:*:*:jar:provided:*</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>com.yahoo.vespa</include>
-                                        <include>aopalliance:aopalliance:1.0:jar:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-annotations:2.8.3:jar:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-core:2.8.3:jar:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-databind:2.8.3:jar:provided</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.3:jar:provided</include>
-                                        <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.5.4:jar:provided</include>
-                                        <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.5.4:jar:provided</include>
-                                        <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.5.4:jar:provided</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: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:1.1.0.Final:jar:provided</include>
-                                        <include>javax.ws.rs:javax.ws.rs-api:2.0.1: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: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: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:9.4.6.v20170531:jar:provided</include>
-                                        <include>org.eclipse.jetty:jetty-io:9.4.6.v20170531:jar:provided</include>
-                                        <include>org.eclipse.jetty:jetty-util:9.4.6.v20170531: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:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.containers:jersey-container-servlet-core:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.containers:jersey-container-servlet:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.core:jersey-client:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.core:jersey-common:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.core:jersey-server:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.ext:jersey-entity-filtering:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.ext:jersey-proxy-client:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.media:jersey-media-jaxb:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.media:jersey-media-json-jackson:2.23.2:jar:provided</include>
-                                        <include>org.glassfish.jersey.media:jersey-media-multipart:2.23.2: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:1.9.6:jar:provided</include>
-                                        <include>org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1: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>
-
-                                        <!-- TODO: Remove the deps below when all environments use maven >= 3.3 -->
-                                        <include>org.scala-lang:scala-library:2.11.4:jar:provided</include>
-                                        <include>commons-lang:commons-lang:2.6:jar:provided</include>
-                                        <include>org.apache.commons:commons-exec:1.3:jar:provided</include>
-                                        <include>org.antlr:antlr-runtime:3.5.2:jar:provided</include>
-                                        <include>log4j:log4j:1.2.16:jar:provided</include>
-                                        <include>commons-collections:commons-collections:3.2.1:jar:provided</include>
-                                    </includes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>