Skip to content

Commit

Permalink
Cleanup Enforcer Configurations (Azure#9884)
Browse files Browse the repository at this point in the history 
* Changed pom.client.xml enforcer configuration to allow easier overriding in childrem POMs

* Removed accidentally added file

* Cleaned up line breaks from autoformatting, updated XML configuration to break at 160 characters
  • Loading branch information
@alzimmermsft
alzimmermsft authored Apr 15, 2020
1 parent 0750d7e commit efb7303
Show file tree
Hide file tree
Showing 14 changed files with 228 additions and 419 deletions.
1 change: 1 addition & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ indent_size = 2
[*.xml]
indent_size = 2
continuation_indent_size = 4
max_line_length = 160

# From https://maven.apache.org/developers/conventions/code.html
[*.java]
Expand Down
40 changes: 12 additions & 28 deletions common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,35 +47,19 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>com.fasterxml.jackson.core:jackson-databind:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>com.fasterxml.jackson.core:jackson-databind:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- special allowance for perf-test-core as it is not a shipping library: -->
<include>com.beust:jcommander:[1.58]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<!-- special allowance for perf-test-core as it is not a shipping library: -->
<include>com.beust:jcommander:[1.58]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
41 changes: 13 additions & 28 deletions sdk/core/azure-core-amqp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
~ Copyright (c) Microsoft Corporation. All rights reserved.
~ Licensed under the MIT License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -109,33 +110,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>com.microsoft.azure:qpid-proton-j-extensions:[1.2.2]</include> <!-- {x-include-update;com.microsoft.azure:qpid-proton-j-extensions;external_dependency} -->
<include>org.apache.qpid:proton-j:[0.33.2]</include> <!-- {x-include-update;org.apache.qpid:proton-j;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>com.microsoft.azure:qpid-proton-j-extensions:[1.2.2]</include> <!-- {x-include-update;com.microsoft.azure:qpid-proton-j-extensions;external_dependency} -->
<include>org.apache.qpid:proton-j:[0.33.2]</include> <!-- {x-include-update;org.apache.qpid:proton-j;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
50 changes: 17 additions & 33 deletions sdk/core/azure-core-http-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,39 +174,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>io.netty:netty-buffer:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.5.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>io.netty:netty-buffer:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.45.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[0.9.5.RELEASE]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
36 changes: 10 additions & 26 deletions sdk/core/azure-core-http-okhttp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,32 +136,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>com.squareup.okhttp3:okhttp:[4.2.2]</include> <!-- {x-include-update;com.squareup.okhttp3:okhttp;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>com.squareup.okhttp3:okhttp:[4.2.2]</include> <!-- {x-include-update;com.squareup.okhttp3:okhttp;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
41 changes: 12 additions & 29 deletions sdk/core/azure-core-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</scm>



<dependencies>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -105,34 +104,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>io.projectreactor:reactor-test:[3.3.3.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-test;external_dependency} -->
<!-- special allowance for azure-core-test as it is not a shipping library: -->
<include>org.junit.jupiter:junit-jupiter-api:[5.4.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>io.projectreactor:reactor-test:[3.3.3.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-test;external_dependency} -->
<!-- special allowance for azure-core-test as it is not a shipping library: -->
<include>org.junit.jupiter:junit-jupiter-api:[5.4.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
36 changes: 10 additions & 26 deletions sdk/core/azure-core-tracing-opentelemetry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,32 +76,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>com.azure:*</include>
<include>io.opentelemetry:opentelemetry-api:[0.2.4]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.azure:*</include>
<include>io.opentelemetry:opentelemetry-api:[0.2.4]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
44 changes: 14 additions & 30 deletions sdk/core/azure-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,36 +168,20 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<searchTransitive>false</searchTransitive>
<excludes>
<!-- We exclude everything that is runtime-time, compile-time, or provided scoped (i.e. we allow
dependencies when they are used for test scope or otherwise) -->
<exclude>*:*:*:*:runtime</exclude>
<exclude>*:*:*:*:compile</exclude>
<exclude>*:*:*:*:provided</exclude>
</excludes>
<includes>
<include>io.netty:netty-tcnative-boringssl-static:[2.0.27.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.3.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
<include>com.google.code.findbugs:jsr305:[3.0.2]</include> <!-- {x-include-update;com.google.code.findbugs:jsr305;external_dependency} -->
<include>org.slf4j:slf4j-api:[1.7.28]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-tcnative-boringssl-static:[2.0.27.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.3.3.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.10.1]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
<include>com.google.code.findbugs:jsr305:[3.0.2]</include> <!-- {x-include-update;com.google.code.findbugs:jsr305;external_dependency} -->
<include>org.slf4j:slf4j-api:[1.7.28]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit efb7303

Please sign in to comment.