Skip to content

Commit b52b856

Browse files
committed
Version updates; adapt to RAT chnages
1 parent 6db2ce7 commit b52b856

File tree

2 files changed

+48
-59
lines changed

2 files changed

+48
-59
lines changed

build-files/rat-exclusions.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#### Apache RAT (release audit tool) exclusions
2+
## https://creadur.apache.org/rat/
3+
4+
**/hs_err_pid*.log
5+
docs/**
6+
local/**
7+
.github/**
8+
9+
**/.project
10+
**/.settings/**
11+
**/.classpath
12+
**/*.recommenders/**/*
13+
14+
**/delta.classpath*
15+
**/README.*
16+
**/*.cfg
17+
18+
**/src/main/**/*.html
19+
**/src/**/package-info.java
20+
21+
**/*.txt
22+
**/*.md
23+
24+
**/META-INF/services/*
25+
26+
**/testing/**/*
27+
**/log4j*.properties
28+
**/logging*.properties
29+
30+
**/target/**/*
31+
**/dependency-reduced-pom.xml
32+
33+
**/Tutorial/**/zoo.dynamic
34+
**/Tutorial/**/myid

pom.xml

Lines changed: 14 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
<java.version>21</java.version>
7272

7373
<ver.jena>6.0.0</ver.jena>
74-
<ver.jetty>12.1.6</ver.jetty>
74+
<ver.jetty>12.1.7</ver.jetty>
7575

7676
<!-- Ensure we get a version compatible with Jena. -->
7777
<ver.commons-io>2.21.0</ver.commons-io>
7878
<ver.junit>4.13.2</ver.junit>
79-
<ver.log4j2>2.25.3</ver.log4j2>
79+
<ver.log4j2>2.25.4</ver.log4j2>
8080
<ver.slf4j>2.0.7</ver.slf4j>
8181

82-
<ver.rocksdb>10.4.2</ver.rocksdb>
82+
<ver.rocksdb>10.10.1</ver.rocksdb>
8383

8484
<ver.awaitility>4.3.0</ver.awaitility>
8585

@@ -298,7 +298,7 @@
298298
<plugin>
299299
<groupId>org.apache.maven.plugins</groupId>
300300
<artifactId>maven-shade-plugin</artifactId>
301-
<version>3.6.1</version>
301+
<version>3.6.2</version>
302302
</plugin>
303303

304304
<plugin>
@@ -367,7 +367,7 @@
367367
<plugin>
368368
<groupId>org.apache.maven.plugins</groupId>
369369
<artifactId>maven-resources-plugin</artifactId>
370-
<version>3.4.0</version>
370+
<version>3.5.0</version>
371371
<configuration>
372372
<encoding>UTF-8</encoding>
373373
</configuration>
@@ -518,10 +518,16 @@
518518
</plugin>
519519

520520
<!-- Run the RAT Plugin -->
521-
<plugin>
521+
<!--
522+
To run from the command line:
523+
mvn apache-rat:rat \
524+
-Drat.excludeSubProjects=false \
525+
-Drat.excludesFile=build-files/rat-exclusions.txt
526+
-->
527+
<plugin>
522528
<groupId>org.apache.rat</groupId>
523529
<artifactId>apache-rat-plugin</artifactId>
524-
<version>0.17</version>
530+
<version>0.18</version>
525531
<!--
526532
Run only if maven is running from this POM,
527533
not when run in a sub-module with this as parent.
@@ -538,58 +544,7 @@
538544
</executions>
539545
<configuration>
540546
<excludeSubProjects>false</excludeSubProjects>
541-
<excludes>
542-
<exclude>**/hs_err_pid*.log</exclude>
543-
<exclude>docs/**</exclude>
544-
<exclude>local/**</exclude>
545-
<exclude>.github/**</exclude>
546-
547-
<exclude>**/.project</exclude>
548-
<exclude>**/.settings/**</exclude>
549-
<exclude>**/.classpath</exclude>
550-
<exclude>**/*.recommenders/**/*</exclude>
551-
552-
<exclude>**/delta.classpath*</exclude>
553-
<exclude>**/README.*</exclude>
554-
<exclude>**/*.cfg</exclude>
555-
556-
<!--
557-
Javadoc add-ons files are required to be simple and our javadoc configuration
558-
will ensure appropriate license and copyright statements are inserted
559-
into generated documentation anyway so no need to put license statements in these
560-
files
561-
-->
562-
<exclude>**/src/main/**/*.html</exclude>
563-
<exclude>**/src/**/package-info.java</exclude>
564-
565-
<!--
566-
Text and Markdown files are typically used only for documentation purposes
567-
and license declarations are usually spurious in these files since often they
568-
will refer to the LICENSE/NOTICE for users to find the actual licenses
569-
-->
570-
<exclude>**/*.txt</exclude>
571-
<exclude>**/*.md</exclude>
572-
573-
<!--
574-
META-INF services files can include comments but a license header would be
575-
unnecessarily clutter so we exclude these
576-
-->
577-
<exclude>**/META-INF/services/*</exclude>
578-
579-
<exclude>**/testing/**/*</exclude>
580-
<exclude>**/log4j*.properties</exclude>
581-
<exclude>**/logging*.properties</exclude>
582-
583-
<!-- Exclude anything created during the build (plugin generated files) ->-->
584-
<exclude>**/target/**/*</exclude>
585-
<!-- MSHADE-124 -->
586-
<exclude>**/dependency-reduced-pom.xml</exclude>
587-
588-
<!-- ZooKeeper files -->
589-
<exclude>**/Tutorial/**/zoo.dynamic</exclude>
590-
<exclude>**/Tutorial/**/myid</exclude>
591-
592-
</excludes>
547+
<inputExcludeFile>build-files/rat-exclusions.txt</inputExcludeFile>
593548
</configuration>
594549
</plugin>
595550

0 commit comments

Comments
 (0)