This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f2589f312076b0e33a9d45f6f2576b4ba33f02fd
Merge: 7d7884787a 1ec4da2156
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Mar 3 09:20:46 2023 -0500
Merge branch '1.10' into 2.1
core/pom.xml | 17 +++++++++++------
pom.xml | 24 +++++++++++++-----------
server/monitor/pom.xml | 11 ++++++++---
server/tserver/pom.xml | 13 +++++++++----
4 files changed, 41 insertions(+), 24 deletions(-)
diff --cc core/pom.xml
index 73e6863029,163a1c062f..7a1b07b1ce
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -194,18 -136,6 +194,23 @@@
</testResources>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <configuration>
- <excludes>
-
<exclude>src/main/java/org/apache/accumulo/core/bloomfilter/*.java</exclude>
-
<exclude>src/main/java/org/apache/accumulo/core/util/HostAndPort.java</exclude>
- <exclude>src/test/resources/*.jceks</exclude>
-
<exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
- </excludes>
++ <licenseSets>
++ <licenseSet>
++
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
++ <excludes>
++
<exclude>src/main/java/org/apache/accumulo/core/bloomfilter/*.java</exclude>
++
<exclude>src/main/java/org/apache/accumulo/core/util/HostAndPort.java</exclude>
++ <exclude>src/test/resources/*.jceks</exclude>
++
<exclude>src/test/resources/org/apache/accumulo/core/file/rfile/*.rf</exclude>
++ </excludes>
++ </licenseSet>
++ </licenseSets>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --cc pom.xml
index a1fc550b43,7e1e7cd0d2..a430d2a15c
--- a/pom.xml
+++ b/pom.xml
@@@ -697,33 -617,7 +697,37 @@@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.12.0</version>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>4.1</version>
+ <configuration>
-
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
- <excludes combine.children="append">
- <exclude>**/DEPENDENCIES</exclude>
- <exclude>**/LICENSE</exclude>
- <exclude>**/NOTICE</exclude>
- <exclude>**/target/**</exclude>
- <exclude>contrib/javadoc11.patch</exclude>
- </excludes>
++ <licenseSets>
++ <licenseSet>
++
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
++ <excludes combine.children="append">
++ <exclude>**/DEPENDENCIES</exclude>
++ <exclude>**/LICENSE</exclude>
++ <exclude>**/NOTICE</exclude>
++ <exclude>**/target/**</exclude>
++ <exclude>contrib/javadoc11.patch</exclude>
++ </excludes>
++ </licenseSet>
++ </licenseSets>
+ <mapping combine.children="append">
+ <!-- general mappings; module-specific mappings appear in their
respective pom -->
+ <Makefile>SCRIPT_STYLE</Makefile>
+ <c>SLASHSTAR_STYLE</c>
+ <cc>SLASHSTAR_STYLE</cc>
+ <css>SLASHSTAR_STYLE</css>
+ <h>SLASHSTAR_STYLE</h>
+ <java>SLASHSTAR_STYLE</java>
+ <proto>SLASHSTAR_STYLE</proto>
+ <thrift>SLASHSTAR_STYLE</thrift>
+ </mapping>
+ </configuration>
</plugin>
<plugin>
<groupId>org.gaul</groupId>
diff --cc server/monitor/pom.xml
index 82f3e23a36,523ab1b815..ca17126745
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -194,15 -129,6 +194,20 @@@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <configuration>
- <excludes>
-
<exclude>src/main/resources/org/apache/accumulo/monitor/resources/external/**/*</exclude>
- </excludes>
++ <licenseSets>
++ <licenseSet>
++
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
++ <excludes>
++
<exclude>src/main/resources/org/apache/accumulo/monitor/resources/external/**/*</exclude>
++ </excludes>
++ </licenseSet>
++ </licenseSets>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --cc server/tserver/pom.xml
index 4745e8e1b5,18028634a9..a661df1373
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@@ -154,16 -136,6 +154,21 @@@
</compilerArgs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <configuration>
- <excludes>
- <exclude>src/test/resources/*.walog</exclude>
- <exclude>src/test/resources/walog-from-14/*</exclude>
- </excludes>
++ <licenseSets>
++ <licenseSet>
++
<header>${session.executionRootDirectory}/contrib/license-header.txt</header>
++ <excludes>
++ <exclude>src/test/resources/*.walog</exclude>
++ <exclude>src/test/resources/walog-from-14/*</exclude>
++ </excludes>
++ </licenseSet>
++ </licenseSets>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
