This is an automated email from the ASF dual-hosted git repository. grossws pushed a commit to branch build-refactoring in repository https://gitbox.apache.org/repos/asf/tika.git
commit a52a2d4ce82abc4e90e07bb36d9aee623f4997ef Author: Konstantin Gribov <[email protected]> AuthorDate: Sat Nov 19 23:39:06 2022 +0300 TIKA-3934 Move enforcer plugin configuration to the `tika` (reactor) --- pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ tika-parent/pom.xml | 38 -------------------------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 02df9b853..d88d1be6a 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,12 @@ <module>tika-detectors</module> </modules> + <properties> + <!-- versions for enforcer plugin configured in org.apache:apache grandparent POM --> + <minimalMavenBuildVersion>3.5</minimalMavenBuildVersion> + <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -274,6 +280,40 @@ least three +1 Tika PMC votes are cast. </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> <!-- can't update to 3.1.0, see MENFORCER-393 --> + <executions> + <execution> + <id>enforce-dependency-convergence</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <dependencyConvergence /> + </rules> + </configuration> + </execution> + <execution> + <id>ban-bad-log4j-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.apache.logging.log4j:log4j-core:(,2.17.1)</exclude> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 2da8d8112..b766c2224 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -1120,44 +1120,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M3</version> <!-- can't update to 3.1.0, see MENFORCER-393 --> - <executions> - <execution> - <id>enforce-maven</id> - <configuration> - <rules> - <dependencyConvergence /> - <requireMavenVersion> - <version>3.5</version> - </requireMavenVersion> - </rules> - </configuration> - <goals> - <goal>enforce</goal> - </goals> - </execution> - <execution> - <id>ban-bad-log4j-versions</id> - <phase>validate</phase> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <bannedDependencies> - <excludes> - <exclude>org.apache.logging.log4j:log4j-core:(,2.17.1)</exclude> - </excludes> - </bannedDependencies> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> <plugin> <!-- mvn validate --> <groupId>org.apache.maven.plugins</groupId>
