HADOOP-17753. Keep restrict-imports-enforcer-rule for Guava Lists in top level hadoop-main pom (#3087)
This commit is contained in:
Viraj Jasani
GitHub
parent
9a17f97133
commit
4ef27a596f
|
|
@ -32,43 +32,6 @@
|
||||||
<hadoop.component>cloud-storage</hadoop.component>
|
<hadoop.component>cloud-storage</hadoop.component>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
|
|
||||||
|
|
@ -96,38 +96,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -92,38 +92,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
||||||
|
|
@ -647,38 +647,6 @@
|
||||||
</filesets>
|
</filesets>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -260,38 +260,6 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -178,38 +178,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
|
<excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -343,38 +343,6 @@
|
||||||
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
|
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -170,43 +170,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>dist</id>
|
<id>dist</id>
|
||||||
|
|
|
||||||
|
|
@ -305,38 +305,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
</filesets>
|
</filesets>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
|
||||||
|
|
@ -437,38 +437,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
</filesets>
|
</filesets>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -177,38 +177,6 @@
|
||||||
</properties>
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
|
||||||
|
|
@ -155,38 +155,6 @@
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.maven.plugin.resourcegz;
|
package org.apache.hadoop.maven.plugin.resourcegz;
|
||||||
|
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.maven.plugin.AbstractMojo;
|
import org.apache.maven.plugin.AbstractMojo;
|
||||||
import org.apache.maven.plugin.MojoExecutionException;
|
import org.apache.maven.plugin.MojoExecutionException;
|
||||||
|
|
@ -27,6 +26,7 @@ import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
|
|
@ -65,7 +65,7 @@ public class ResourceGzMojo extends AbstractMojo {
|
||||||
try {
|
try {
|
||||||
Path inputDir = new File(inputDirectory).toPath();
|
Path inputDir = new File(inputDirectory).toPath();
|
||||||
File outputDir = new File(outputDirectory);
|
File outputDir = new File(outputDirectory);
|
||||||
List<String> exts = Lists.newArrayList(extensions.split(","));
|
List<String> exts = Arrays.asList(extensions.split(","));
|
||||||
exts.replaceAll(String::trim);
|
exts.replaceAll(String::trim);
|
||||||
GZConsumer cons = new GZConsumer(inputDir.toFile(), outputDir);
|
GZConsumer cons = new GZConsumer(inputDir.toFile(), outputDir);
|
||||||
Files.walk(inputDir).filter(path -> {
|
Files.walk(inputDir).filter(path -> {
|
||||||
|
|
|
||||||
|
|
@ -467,38 +467,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,44 +99,11 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
The following is to suppress a m2e warning in eclipse
|
The following is to suppress a m2e warning in eclipse
|
||||||
(m2e doesn't know how to handle maven-enforcer:enforce, so we have to tell m2e to ignore it)
|
(m2e doesn't know how to handle maven-enforcer:enforce, so we have to tell m2e to ignore it)
|
||||||
|
|
|
||||||
|
|
@ -223,38 +223,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -137,38 +137,6 @@
|
||||||
</environmentVariables>
|
</environmentVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,38 +88,6 @@
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,38 +70,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,38 +78,6 @@
|
||||||
<excludePackageNames>org.apache.hadoop.yarn.proto:org.apache.hadoop.yarn.federation.proto:org.apache.hadoop.yarn.service</excludePackageNames>
|
<excludePackageNames>org.apache.hadoop.yarn.proto:org.apache.hadoop.yarn.federation.proto:org.apache.hadoop.yarn.service</excludePackageNames>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.skuzzle.enforcer</groupId>
|
|
||||||
<artifactId>restrict-imports-enforcer-rule</artifactId>
|
|
||||||
<version>${restrict-imports.enforcer.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>banned-illegal-imports</id>
|
|
||||||
<phase>process-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
|
||||||
<includeTestCode>true</includeTestCode>
|
|
||||||
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
|
||||||
<bannedImports>
|
|
||||||
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
|
||||||
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
|
||||||
</bannedImports>
|
|
||||||
</restrictImports>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
|
||||||
8
pom.xml
8
pom.xml
|
|
@ -192,6 +192,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
|
||||||
<bannedImport>com.google.common.collect.Sets</bannedImport>
|
<bannedImport>com.google.common.collect.Sets</bannedImport>
|
||||||
</bannedImports>
|
</bannedImports>
|
||||||
</restrictImports>
|
</restrictImports>
|
||||||
|
<restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
|
||||||
|
<includeTestCode>true</includeTestCode>
|
||||||
|
<reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason>
|
||||||
|
<bannedImports>
|
||||||
|
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport>
|
||||||
|
<bannedImport>com.google.common.collect.Lists</bannedImport>
|
||||||
|
</bannedImports>
|
||||||
|
</restrictImports>
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue