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
The following commit(s) were added to refs/heads/2.1 by this push:
new 70c2c78334 Make various build improvements (#5890)
70c2c78334 is described below
commit 70c2c78334a29a7cb543775cee291e66475ff0d2
Author: Christopher Tubbs <[email protected]>
AuthorDate: Thu Sep 18 20:43:59 2025 -0400
Make various build improvements (#5890)
* Update GitHub Actions to use temurin (same as main branch)
* Update log4j, and remove unneeded bnd dependencies that were only
there due to a bug in log4j-bom that was fixed
* Standardize build properties used within the accumulo build
(`accumulo.build.*`) and simplify some names
* Update parent POM
* Inline the ASF license header
* Remove unneeded maven.compiler properties that are derived from the
maven.compiler.target property (in the ASF parent POM) and
autoVersionSubmodules in release plugin (set in the parent)
* Add minimal maven build version (same as main branch)
* Update jetty to newer version (same as main branch)
* Update lmax disruptor (can now use 4.0.0 with log4j 2.25)
* Bump various plugin versions
* Hold back modernizer on 2.1 branch to 2.9.0 to avoid disruptive
changes to that branch (main branch can use newer)
* Enable automatic module names for 2.1
* Remove accumulo.skip property from skipQA profile (it does nothing)
* Allow errorprone profile to be activated by a property, that also
de-activates a new profile that triggers the log4j annotation
processor that doesn't work with the errorprone profile
---
.github/workflows/maven-full-its.yaml | 4 +-
.github/workflows/maven-on-demand.yaml | 2 +-
.github/workflows/maven.yaml | 6 +-
core/pom.xml | 8 +-
.../apache/accumulo/core/FilteredConstants.java | 2 +-
pom.xml | 140 +++++++++++++++------
server/monitor/pom.xml | 8 +-
server/tserver/pom.xml | 2 +-
src/build/license-header.txt | 16 ---
9 files changed, 109 insertions(+), 79 deletions(-)
diff --git a/.github/workflows/maven-full-its.yaml
b/.github/workflows/maven-full-its.yaml
index 4d7145d368..4f75f306d0 100644
--- a/.github/workflows/maven-full-its.yaml
+++ b/.github/workflows/maven-full-its.yaml
@@ -51,7 +51,7 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
- distribution: adopt
+ distribution: temurin
java-version: 17
cache: 'maven'
- name: Show the first log message
@@ -88,7 +88,7 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
- distribution: adopt
+ distribution: temurin
java-version: 17
cache: 'maven'
- name: Override DNS to fix IP address for hostname
diff --git a/.github/workflows/maven-on-demand.yaml
b/.github/workflows/maven-on-demand.yaml
index 244cacc88c..0d82f39844 100644
--- a/.github/workflows/maven-on-demand.yaml
+++ b/.github/workflows/maven-on-demand.yaml
@@ -68,7 +68,7 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
- distribution: adopt
+ distribution: temurin
java-version: 17
cache: 'maven'
- name: Show the first log message
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 9901901609..a07ea51e9f 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -41,7 +41,7 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
- distribution: adopt
+ distribution: temurin
java-version: 17
cache: 'maven'
- name: Show the first log message
@@ -68,7 +68,7 @@ jobs:
- {name: 'unit-tests', javaver: 17, args: 'verify -PskipQA
-DskipTests=false'}
- {name: 'qa-checks', javaver: 17, args: 'verify javadoc:jar
-Psec-bugs -DskipTests -Dspotbugs.timeout=3600000'}
- {name: 'compat', javaver: 17, args: 'package -DskipTests
-Dversion.hadoop=3.0.3 -Dversion.zookeeper=3.5.10'}
- - {name: 'errorprone', javaver: 17, args: 'verify
-Perrorprone,skipQA'}
+ - {name: 'errorprone', javaver: 17, args: 'verify -Derrorprone
-PskipQA'}
fail-fast: false
runs-on: ubuntu-latest
steps:
@@ -76,7 +76,7 @@ jobs:
- name: Set up JDK ${{ matrix.profile.javaver }}
uses: actions/setup-java@v4
with:
- distribution: adopt
+ distribution: temurin
java-version: ${{ matrix.profile.javaver }}
cache: 'maven'
- name: Override DNS to fix IP address for hostname
diff --git a/core/pom.xml b/core/pom.xml
index d2ddeccbde..9710b0afc0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -142,12 +142,6 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
- <dependency>
- <!-- used by log4j-api; needed here for compile time linting only; we
don't actually use it -->
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bnd.annotation</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<!-- used indirectly at compile scope by log4j-1.2-api; also needed for
tests -->
<groupId>org.apache.logging.log4j</groupId>
@@ -210,7 +204,7 @@
<configuration>
<licenseSets>
<licenseSet>
- <header>${rootlocation}/src/build/license-header.txt</header>
+ <inlineHeader>${accumulo.build.license.header}</inlineHeader>
<excludes>
<exclude>src/main/java/org/apache/accumulo/core/bloomfilter/*.java</exclude>
<exclude>src/main/java/org/apache/accumulo/core/util/HostAndPort.java</exclude>
diff --git
a/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
b/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
index f130c3cba7..f8c23c1799 100644
---
a/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
+++
b/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
@@ -19,5 +19,5 @@
package org.apache.accumulo.core;
public class FilteredConstants {
- public static final String VERSION = "${accumulo.release.version}";
+ public static final String VERSION = "${accumulo.build.release.version}";
}
diff --git a/pom.xml b/pom.xml
index cc9384defc..e7ed0e963f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>31</version>
+ <version>35</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
@@ -112,12 +112,32 @@
<url>https://github.com/apache/accumulo/actions</url>
</ciManagement>
<properties>
-
<accumulo.javadoc.since.versions>2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.1.4,2.1.5</accumulo.javadoc.since.versions>
+ <!-- properties used by the accumulo build in our own POM files -->
+ <accumulo.build.extraTestArgs>--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.management/java.lang.management=ALL-UNNAMED --add-opens
java.management/sun.management=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED --add-opens ja [...]
+
<accumulo.build.javadoc.since>2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.1.4,2.1.5</accumulo.build.javadoc.since>
+ <accumulo.build.license.header><![CDATA[
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+]]></accumulo.build.license.header>
<!-- used for filtering the java source with the current version -->
- <accumulo.release.version>${project.version}</accumulo.release.version>
+
<accumulo.build.release.version>${project.version}</accumulo.build.release.version>
+ <accumulo.build.unitTestMemSize>-Xmx1G</accumulo.build.unitTestMemSize>
<!-- avoid error shutting down built-in ForkJoinPool.commonPool() during
exec:java tasks -->
<exec.cleanupDaemonThreads>false</exec.cleanupDaemonThreads>
- <extraTestArgs>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED --add-opens
java.management/java.lang.management=ALL-UNNAMED --add-opens
java.management/sun.management=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.ut [...]
<failsafe.excludedGroups />
<failsafe.failIfNoSpecifiedTests>false</failsafe.failIfNoSpecifiedTests>
<failsafe.forkCount>1</failsafe.forkCount>
@@ -125,8 +145,6 @@
<failsafe.reuseForks>false</failsafe.reuseForks>
<!-- prevent introduction of new compiler warnings -->
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
- <maven.compiler.release>11</maven.compiler.release>
- <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.javadoc.failOnWarnings>true</maven.javadoc.failOnWarnings>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
@@ -136,6 +154,7 @@
<!-- versions-maven-plugin ignore patterns for snapshots, alpha, beta,
milestones, and release candidates -->
<maven.version.ignore>.+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+</maven.version.ignore>
<minimalJavaBuildVersion>17</minimalJavaBuildVersion>
+ <minimalMavenBuildVersion>3.9</minimalMavenBuildVersion>
<!-- timestamp for reproducible outputs, updated on release by the release
plugin -->
<project.build.outputTimestamp>2025-08-13T01:30:03Z</project.build.outputTimestamp>
<rat.consoleOutput>true</rat.consoleOutput>
@@ -145,14 +164,13 @@
<surefire.forkCount>1C</surefire.forkCount>
<surefire.groups />
<surefire.reuseForks>true</surefire.reuseForks>
- <unitTestMemSize>-Xmx1G</unitTestMemSize>
<!-- dependency and plugin versions managed with properties -->
<version.auto-service>1.1.1</version.auto-service>
<version.bouncycastle>1.80</version.bouncycastle>
<version.curator>5.8.0</version.curator>
- <version.errorprone>2.35.0</version.errorprone>
+ <version.errorprone>2.41.0</version.errorprone>
<version.hadoop>3.3.6</version.hadoop>
- <version.log4j>2.24.3</version.log4j>
+ <version.log4j>2.25.1</version.log4j>
<version.opentelemetry>1.48.0</version.opentelemetry>
<version.powermock>2.0.9</version.powermock>
<version.slf4j>2.0.17</version.slf4j>
@@ -207,7 +225,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
- <version>11.0.19</version>
+ <version>11.0.23</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -300,8 +318,7 @@
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
- <!-- log4j doesn't support 4 yet; see
https://github.com/apache/logging-log4j2/issues/1829 -->
- <version>3.4.4</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -700,21 +717,22 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.16.2</version>
+ <version>2.19.0</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.3</version>
+ <version>5.0.0</version>
<configuration>
<licenseSets>
<licenseSet>
- <header>${rootlocation}/src/build/license-header.txt</header>
+ <inlineHeader>${accumulo.build.license.header}</inlineHeader>
<excludes combine.children="append">
<exclude>**/DEPENDENCIES</exclude>
<exclude>**/LICENSE</exclude>
<exclude>**/NOTICE</exclude>
<exclude>**/target/**</exclude>
+ <exclude>**/*.rf</exclude>
</excludes>
</licenseSet>
</licenseSets>
@@ -734,7 +752,8 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>2.7.0</version>
+ <!-- newer versions suggest changes not worth the effort in 2.1 -->
+ <version>2.9.0</version>
<configuration>
<javaVersion>${maven.compiler.target}</javaVersion>
</configuration>
@@ -742,12 +761,13 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.9.3.0</version>
+ <version>4.9.5.0</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<failOnError>true</failOnError>
<includeTests>true</includeTests>
+ <maxHeap>1024</maxHeap>
<maxRank>16</maxRank>
<omitVisitors>ConstructorThrow,SharedVariableAtomicityDetector</omitVisitors>
<jvmArgs>-Dcom.overstock.findbugs.ignore=com.google.common.util.concurrent.RateLimiter,com.google.common.hash.Hasher,com.google.common.hash.HashCode,com.google.common.hash.HashFunction,com.google.common.hash.Hashing,com.google.common.cache.Cache,com.google.common.io.CountingOutputStream,com.google.common.io.ByteStreams,com.google.common.cache.LoadingCache,com.google.common.base.Stopwatch,com.google.common.cache.RemovalNotification,com.google.common.util.concurrent.Uninterrupt
[...]
@@ -763,7 +783,7 @@
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>4.0.0</version>
<configuration>
<createBackupFile>false</createBackupFile>
<expandEmptyElements>false</expandEmptyElements>
@@ -780,7 +800,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>1.0.1</version>
+ <version>1.1.1</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -805,11 +825,6 @@
<artifactId>auto-service</artifactId>
<version>${version.auto-service}</version>
</path>
- <path>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${version.log4j}</version>
- </path>
</annotationProcessorPaths>
</configuration>
</plugin>
@@ -819,8 +834,7 @@
<configuration>
<archive>
<manifestEntries>
- <!-- Automatic modules do not work with the javadoc plugin -
see MJAVADOC-707 -->
- <!--
Automatic-Module-Name>${accumulo.module.name}</Automatic-Module-Name -->
+
<Automatic-Module-Name>${accumulo.build.module.name}</Automatic-Module-Name>
<Implementation-Build>${mvngit.commit.id}</Implementation-Build>
<Sealed>true</Sealed>
</manifestEntries>
@@ -837,8 +851,8 @@
<quiet>true</quiet>
<additionalJOption>-J-Xmx512m</additionalJOption>
<additionalOptions>
- <additionalOption>--since
"${accumulo.javadoc.since.versions}"</additionalOption>
- <additionalOption>--since-label "New API since
${accumulo.javadoc.since.versions.first}"</additionalOption>
+ <additionalOption>--since
"${accumulo.build.javadoc.since}"</additionalOption>
+ <additionalOption>--since-label "New API since
${accumulo.build.javadoc.since.first}"</additionalOption>
</additionalOptions>
<doclint>all,-missing</doclint>
<legacyMode>true</legacyMode>
@@ -849,7 +863,6 @@
<artifactId>maven-release-plugin</artifactId>
<configuration>
<arguments>-P !autoformat,verifyformat,thrift
-DskipTests</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean package</preparationGoals>
<tagNameFormat>rel/@{project.version}</tagNameFormat>
@@ -870,7 +883,7 @@
<systemPropertyVariables combine.children="append">
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
- <argLine>${unitTestMemSize} ${extraTestArgs}</argLine>
+ <argLine>${accumulo.build.unitTestMemSize}
${accumulo.build.extraTestArgs}</argLine>
</configuration>
</plugin>
<plugin>
@@ -884,19 +897,19 @@
<systemPropertyVariables combine.children="append">
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
- <argLine>${extraTestArgs}</argLine>
+ <argLine>${accumulo.build.extraTestArgs}</argLine>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
@@ -933,6 +946,7 @@
<exclude>.vscode/**</exclude>
<exclude>.factorypath</exclude>
<exclude>.github/**</exclude>
+ <exclude>**/*.rf</exclude>
</excludes>
</configuration>
</plugin>
@@ -944,7 +958,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.9.0</version>
+ <version>1.12.0</version>
<configuration>
<removeUnused>true</removeUnused>
<groups>java.,javax.,jakarta.,org.,com.</groups>
@@ -1002,8 +1016,6 @@
<unused>org.apache.logging.log4j:log4j-1.2-api:jar:*</unused>
<unused>org.apache.logging.log4j:log4j-slf4j2-impl:jar:*</unused>
<unused>org.apache.logging.log4j:log4j-web:jar:*</unused>
- <!-- ignore log4j dep used for annotations and needed for
compile time linting -->
- <unused>biz.aQute.bnd:biz.aQute.bnd.annotation:jar:*</unused>
<!-- This should be removed upon completion of migrating junit
4 to 5 -->
<unused>org.junit.vintage:junit-vintage-engine:jar:*</unused>
<unused>org.junit.jupiter:junit-jupiter-engine:jar:*</unused>
@@ -1030,7 +1042,7 @@
<goal>regex-property</goal>
</goals>
<configuration>
- <name>accumulo.module.name</name>
+ <name>accumulo.build.module.name</name>
<regex>-</regex>
<replacement>.</replacement>
<value>org-apache-${project.artifactId}</value>
@@ -1042,10 +1054,10 @@
<goal>regex-property</goal>
</goals>
<configuration>
- <name>accumulo.javadoc.since.versions.first</name>
+ <name>accumulo.build.javadoc.since.first</name>
<regex>,.*</regex>
<replacement />
- <value>${accumulo.javadoc.since.versions}</value>
+ <value>${accumulo.build.javadoc.since}</value>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
@@ -1205,7 +1217,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>10.12.6</version>
+ <version>11.0.1</version>
</dependency>
</dependencies>
<executions>
@@ -1302,7 +1314,6 @@
</property>
</activation>
<properties>
- <accumulo.skip>true</accumulo.skip>
<apilyzer.skip>true</apilyzer.skip>
<checkstyle.skip>true</checkstyle.skip>
<formatter.skip>true</formatter.skip>
@@ -1682,11 +1693,57 @@
<surefire.reuseForks>${reuseForks}</surefire.reuseForks>
</properties>
</profile>
+ <profile>
+ <!--
+ Explicitly add the log4j annotation processor to generate the
Log4jPlugins.dat file for the
+ AccumuloMonitorAppender, but only when not using the errorprone
profile. This is necessary
+ because log4j added a GraalVMProcessor that we don't need and won't
run without failing the
+ build, so we need to itemize all the processors we do want to run.
Except, I couldn't get
+ errorprone to work when I tried to itemize its processors, so
errorprone needs to rely on
+ the normal autodiscovery process. Since that would pick up the
unwanted GraalVMProcessor,
+ this profile exists to avoid adding log4j-core to the processors when
using errorprone.
+ This prevents using the AccumuloMonitorAppender when using the
errorprone profile.
+ Activate the errorprone profile and de-activate this one
simultaneously by using:
+ `mvn -Derrorprone` or `mvn -Perrorprone,!generate-log4j-plugin-data`
+ -->
+ <id>generate-log4j-plugin-data</id>
+ <activation>
+ <property>
+ <name>!errorprone</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${version.log4j}</version>
+ </path>
+ </annotationProcessorPaths>
+ <annotationProcessors>
+
<annotationProcessor>com.google.auto.service.processor.AutoServiceProcessor</annotationProcessor>
+
<annotationProcessor>org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor</annotationProcessor>
+ </annotationProcessors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<!-- This profile uses the Google ErrorProne tool to perform static code
analysis at
compile time. Auto-generated code is not checked.
See: https://errorprone.info/bugpatterns for list of available bug
patterns.-->
<id>errorprone</id>
+ <activation>
+ <property>
+ <name>errorprone</name>
+ </property>
+ </activation>
<properties>
<!-- forking is required for -J options to take effect -->
<maven.compiler.fork>true</maven.compiler.fork>
@@ -1699,6 +1756,7 @@
<configuration>
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
+ <arg>--should-stop=ifError=FLOW</arg>
<arg>
-Xplugin:ErrorProne \
-XepExcludedPaths:.*/(proto|thrift|generated-sources|src/test)/.* \
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 6df23389ce..a8a4dbdb3f 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -156,12 +156,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <!-- used by log4j-api; needed here for compile time linting only; we
don't actually use it -->
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bnd.annotation</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-runtime</artifactId>
@@ -222,7 +216,7 @@
<configuration>
<licenseSets>
<licenseSet>
- <header>${rootlocation}/src/build/license-header.txt</header>
+ <inlineHeader>${accumulo.build.license.header}</inlineHeader>
<excludes>
<exclude>src/main/resources/org/apache/accumulo/monitor/resources/external/**/*</exclude>
</excludes>
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 2711779f4f..40622e37a1 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -154,7 +154,7 @@
<configuration>
<licenseSets>
<licenseSet>
- <header>${rootlocation}/src/build/license-header.txt</header>
+ <inlineHeader>${accumulo.build.license.header}</inlineHeader>
<excludes>
<exclude>src/test/resources/*.walog</exclude>
<exclude>src/test/resources/walog-from-14/*</exclude>
diff --git a/src/build/license-header.txt b/src/build/license-header.txt
deleted file mode 100644
index f808223cba..0000000000
--- a/src/build/license-header.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
