Fix bom indentation, 4 spaces -> 2 (#11676)

Motivation:
Cherry-pick of d6383bf2478267eb62b1f71807c2a3c34794d1b0 added extra
indentation, which fails checkstyle.
This commit is contained in:
Scott Mitchell 2021-09-10 11:33:34 -07:00 committed by GitHub
parent 62a23f9e29
commit efd576e43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,307 +15,307 @@
~ under the License. ~ under the 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 https://maven.apache.org/maven-v4_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 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId> <artifactId>netty-parent</artifactId>
<version>5.0.0.Final-SNAPSHOT</version> <version>5.0.0.Final-SNAPSHOT</version>
</parent> </parent>
<artifactId>netty-bom</artifactId> <artifactId>netty-bom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Netty/BOM</name> <name>Netty/BOM</name>
<description>Netty (Bill of Materials)</description> <description>Netty (Bill of Materials)</description>
<url>https://netty.io/</url>
<organization>
<name>The Netty Project</name>
<url>https://netty.io/</url> <url>https://netty.io/</url>
</organization>
<organization> <licenses>
<name>The Netty Project</name> <license>
<url>https://netty.io/</url> <name>Apache License, Version 2.0</name>
</organization> <url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<inceptionYear>2008</inceptionYear>
<licenses> <scm>
<license> <url>https://github.com/netty/netty</url>
<name>Apache License, Version 2.0</name> <connection>scm:git:git://github.com/netty/netty.git</connection>
<url>https://www.apache.org/licenses/LICENSE-2.0</url> <developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection>
</license> <tag>HEAD</tag>
</licenses> </scm>
<inceptionYear>2008</inceptionYear>
<scm> <developers>
<url>https://github.com/netty/netty</url> <developer>
<connection>scm:git:git://github.com/netty/netty.git</connection> <id>netty.io</id>
<developerConnection>scm:git:ssh://git@github.com/netty/netty.git</developerConnection> <name>The Netty Project Contributors</name>
<tag>HEAD</tag> <email>netty@googlegroups.com</email>
</scm> <url>https://netty.io/</url>
<organization>The Netty Project</organization>
<organizationUrl>https://netty.io/</organizationUrl>
</developer>
</developers>
<developers> <dependencyManagement>
<developer> <dependencies>
<id>netty.io</id> <!-- All release modules -->
<name>The Netty Project Contributors</name> <dependency>
<email>netty@googlegroups.com</email> <groupId>io.netty</groupId>
<url>https://netty.io/</url> <artifactId>netty-buffer</artifactId>
<organization>The Netty Project</organization> <version>${project.version}</version>
<organizationUrl>https://netty.io/</organizationUrl> </dependency>
</developer> <dependency>
</developers> <groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<dependencyManagement> <version>${project.version}</version>
<dependencies> </dependency>
<!-- All release modules --> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-dns</artifactId>
<artifactId>netty-buffer</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-haproxy</artifactId>
<artifactId>netty-codec</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId>
<artifactId>netty-codec-dns</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-http2</artifactId>
<artifactId>netty-codec-haproxy</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-memcache</artifactId>
<artifactId>netty-codec-http</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-mqtt</artifactId>
<artifactId>netty-codec-http2</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-redis</artifactId>
<artifactId>netty-codec-memcache</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-smtp</artifactId>
<artifactId>netty-codec-mqtt</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-socks</artifactId>
<artifactId>netty-codec-redis</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-stomp</artifactId>
<artifactId>netty-codec-smtp</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-codec-xml</artifactId>
<artifactId>netty-codec-socks</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-common</artifactId>
<artifactId>netty-codec-stomp</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-dev-tools</artifactId>
<artifactId>netty-codec-xml</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-handler</artifactId>
<artifactId>netty-common</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-handler-proxy</artifactId>
<artifactId>netty-dev-tools</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-resolver</artifactId>
<artifactId>netty-handler</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-resolver-dns</artifactId>
<artifactId>netty-handler-proxy</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-transport</artifactId>
<artifactId>netty-resolver</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-transport-sctp</artifactId>
<artifactId>netty-resolver-dns</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-example</artifactId>
<artifactId>netty-transport</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-all</artifactId>
<artifactId>netty-transport-sctp</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<artifactId>netty-example</artifactId> <version>${project.version}</version>
<version>${project.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>io.netty</groupId>
<groupId>io.netty</groupId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<artifactId>netty-all</artifactId> <version>${project.version}</version>
<version>${project.version}</version> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> <classifier>osx-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-resolver-dns-native-macos</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-transport-native-unix-common</artifactId>
<classifier>osx-x86_64</classifier> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>osx-aarch_64</classifier> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-unix-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> <classifier>linux-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-native-unix-common</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-transport-native-unix-common</artifactId>
<classifier>linux-aarch_64</classifier> <version>${project.version}</version>
</dependency> <classifier>osx-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-native-unix-common</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-transport-native-unix-common</artifactId>
<classifier>linux-x86_64</classifier> <version>${project.version}</version>
</dependency> <classifier>osx-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-native-unix-common</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-transport-native-epoll</artifactId>
<classifier>osx-x86_64</classifier> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>osx-aarch_64</classifier> <classifier>linux-aarch_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> <classifier>linux-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-native-epoll</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-transport-native-kqueue</artifactId>
<classifier>linux-aarch_64</classifier> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-kqueue</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>linux-x86_64</classifier> <classifier>osx-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId> <artifactId>netty-transport-native-kqueue</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> <classifier>osx-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <!-- Add netty-tcnative* as well as users need to ensure they use the correct version -->
<artifactId>netty-transport-native-kqueue</artifactId> <dependency>
<version>${project.version}</version> <groupId>io.netty</groupId>
<classifier>osx-x86_64</classifier> <artifactId>netty-tcnative</artifactId>
</dependency> <version>${tcnative.version}</version>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-transport-native-kqueue</artifactId> <groupId>io.netty</groupId>
<version>${project.version}</version> <artifactId>netty-tcnative</artifactId>
<classifier>osx-aarch_64</classifier> <version>${tcnative.version}</version>
</dependency> <classifier>linux-x86_64</classifier>
<!-- Add netty-tcnative* as well as users need to ensure they use the correct version --> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId> <artifactId>netty-tcnative</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
</dependency> <classifier>linux-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-tcnative</artifactId> <groupId>io.netty</groupId>
<version>${tcnative.version}</version> <artifactId>netty-tcnative</artifactId>
<classifier>linux-x86_64</classifier> <version>${tcnative.version}</version>
</dependency> <classifier>osx-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-tcnative</artifactId> <groupId>io.netty</groupId>
<version>${tcnative.version}</version> <artifactId>netty-tcnative-boringssl-static</artifactId>
<classifier>linux-aarch_64</classifier> <version>${tcnative.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative</artifactId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
<classifier>osx-x86_64</classifier> <classifier>linux-x86_64</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version> <version>${tcnative.version}</version>
</dependency> <classifier>linux-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-tcnative-boringssl-static</artifactId> <groupId>io.netty</groupId>
<version>${tcnative.version}</version> <artifactId>netty-tcnative-boringssl-static</artifactId>
<classifier>linux-x86_64</classifier> <version>${tcnative.version}</version>
</dependency> <classifier>osx-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-tcnative-boringssl-static</artifactId> <groupId>io.netty</groupId>
<version>${tcnative.version}</version> <artifactId>netty-tcnative-boringssl-static</artifactId>
<classifier>linux-aarch_64</classifier> <version>${tcnative.version}</version>
</dependency> <classifier>osx-aarch_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> <dependency>
<artifactId>netty-tcnative-boringssl-static</artifactId> <groupId>io.netty</groupId>
<version>${tcnative.version}</version> <artifactId>netty-tcnative-boringssl-static</artifactId>
<classifier>osx-x86_64</classifier> <version>${tcnative.version}</version>
</dependency> <classifier>windows-x86_64</classifier>
<dependency> </dependency>
<groupId>io.netty</groupId> </dependencies>
<artifactId>netty-tcnative-boringssl-static</artifactId> </dependencyManagement>
<version>${tcnative.version}</version>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${tcnative.version}</version>
<classifier>windows-x86_64</classifier>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>