Skip to content

Commit 87578bf

Browse files
imjalpreetZacBlanco
imjalpreet
authored and
ZacBlanco
committed
Upgrade airbase for Java 21
Java 17 Upgrade fix artifact naming java 21 fixes revert jitpack renaming remove slice from airbase There is a circular dependency here because slice uses airbase as a parent, but airbase specifies slice as a dependency
1 parent 1b42fd6 commit 87578bf

File tree

4 files changed

+100
-84
lines changed

4 files changed

+100
-84
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ Airbase provides versions for the following well-known dependencies:
329329
<tr><th>Dependency name</th><th>Group/Artifact Ids</th></tr>
330330
<tr>
331331
<td>Google Guice</td>
332-
<td><tt>com.google.inject:guice</tt><p/><tt>com.google.inject.extensions:guice-servlet</tt><p/><tt>com.google.inject.extensions:guice-assistedinject</tt><p/><tt>com.google.inject.extensions:guice-multibindings</tt><p/><tt>com.google.inject.extensions:guice-throwingproviders</tt></td>
332+
<td><tt>com.google.inject:guice</tt><p/><tt>com.google.inject.extensions:guice-servlet</tt><p/><tt>com.google.inject.extensions:guice-assistedinject</tt><p/><tt>com.google.inject.extensions:guice-throwingproviders</tt></td>
333333
</tr>
334334
<tr>
335335
<td>Google Guava</td>

‎airbase-policy/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,17 @@
1111
<artifactId>airbase-policy</artifactId>
1212

1313
<description>Policy files for Airbase</description>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-resources-plugin</artifactId>
20+
<version>${dep.maven-resources-plugin.version}</version>
21+
<configuration>
22+
<encoding>UTF-8</encoding>
23+
</configuration>
24+
</plugin>
25+
</plugins>
26+
</build>
1427
</project>

‎airbase/pom.xml‎

Lines changed: 80 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,11 @@
7979
<properties>
8080
<!-- see http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding -->
8181
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
82-
<project.build.targetJdk>1.8</project.build.targetJdk>
82+
<project.build.targetJdk>21</project.build.targetJdk>
8383
<project.report.outputEncoding>UTF-8</project.report.outputEncoding>
8484
<project.report.inputEncoding>UTF-8</project.report.inputEncoding>
8585

86+
8687
<!-- airlift build specific options are prefixed air.build. -->
8788

8889
<!-- Default jvm size for compiler, tests etc. -->
@@ -176,19 +177,19 @@
176177
<dep.packaging.version>0.163</dep.packaging.version>
177178

178179
<!-- Dependency versions that should be the same everywhere. -->
179-
<dep.guice.version>4.2.2</dep.guice.version>
180-
<dep.guava.version>26.0-jre</dep.guava.version>
181-
<dep.slf4j.version>1.7.25</dep.slf4j.version>
180+
<dep.guice.version>5.0.1</dep.guice.version>
181+
<dep.guava.version>32.1.0-jre</dep.guava.version>
182+
<dep.slf4j.version>2.0.16</dep.slf4j.version>
182183
<dep.logback.version>1.2.3</dep.logback.version>
183184
<dep.javax-inject.version>1</dep.javax-inject.version>
184185
<dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
185186
<dep.javax-servlet.version>3.1.0</dep.javax-servlet.version>
186187
<dep.bval.version>2.0.0</dep.bval.version>
187-
<dep.jackson.version>2.10.0</dep.jackson.version>
188+
<dep.jackson.version>2.11.0</dep.jackson.version>
188189
<dep.jmxutils.version>1.19</dep.jmxutils.version>
189-
<dep.cglib.version>3.2.5</dep.cglib.version>
190+
<dep.cglib.version>3.3.0</dep.cglib.version>
190191
<dep.joda.version>2.9.9</dep.joda.version>
191-
<dep.spotbugs-annotations.version>3.1.10</dep.spotbugs-annotations.version>
192+
<dep.spotbugs-annotations.version>4.8.6</dep.spotbugs-annotations.version>
192193
<dep.testng.version>6.9.6</dep.testng.version>
193194
<dep.assertj-core.version>3.5.2</dep.assertj-core.version>
194195
<dep.assertj-guava.version>3.1.0</dep.assertj-guava.version>
@@ -197,7 +198,6 @@
197198
<dep.hamcrest.version>1.3</dep.hamcrest.version>
198199
<dep.mockito.version>1.9.5</dep.mockito.version>
199200
<dep.objenesis.version>1.3</dep.objenesis.version>
200-
<dep.slice.version>0.34</dep.slice.version>
201201
<dep.jmh.version>1.20</dep.jmh.version>
202202

203203
<!-- license headers -->
@@ -211,6 +211,8 @@
211211

212212
<!-- nexus-staging-maven-plugin version -->
213213
<dep.nexus-staging-plugin.version>1.6.8</dep.nexus-staging-plugin.version>
214+
<dep.maven-resources-plugin.version>3.3.1</dep.maven-resources-plugin.version>
215+
<dep.plugin.pmd-runtime.version>7.7.0</dep.plugin.pmd-runtime.version>
214216
</properties>
215217

216218
<build>
@@ -242,6 +244,9 @@
242244
<groupId>org.apache.maven.plugins</groupId>
243245
<artifactId>maven-deploy-plugin</artifactId>
244246
<version>3.1.1</version>
247+
<configuration>
248+
<allowIncompleteProjects>true</allowIncompleteProjects>
249+
</configuration>
245250
</plugin>
246251

247252
<plugin>
@@ -254,6 +259,9 @@
254259
<groupId>org.apache.maven.plugins</groupId>
255260
<artifactId>maven-install-plugin</artifactId>
256261
<version>3.1.1</version>
262+
<configuration>
263+
<allowIncompleteProjects>true</allowIncompleteProjects>
264+
</configuration>
257265
</plugin>
258266

259267
<plugin>
@@ -265,12 +273,12 @@
265273
<plugin>
266274
<groupId>org.apache.maven.plugins</groupId>
267275
<artifactId>maven-enforcer-plugin</artifactId>
268-
<version>3.0.0-M2</version>
276+
<version>3.5.0</version>
269277
<dependencies>
270278
<dependency>
271279
<groupId>org.codehaus.mojo</groupId>
272280
<artifactId>extra-enforcer-rules</artifactId>
273-
<version>1.1</version>
281+
<version>1.9.0</version>
274282
</dependency>
275283
</dependencies>
276284
<executions>
@@ -345,16 +353,7 @@
345353
<plugin>
346354
<groupId>org.apache.maven.plugins</groupId>
347355
<artifactId>maven-dependency-plugin</artifactId>
348-
<version>3.1.1</version>
349-
<dependencies>
350-
<!-- TODO: remove after updating to 3.1.2 -->
351-
<!-- see https://issues.apache.org/jira/browse/MDEP-613 -->
352-
<dependency>
353-
<groupId>org.apache.maven.shared</groupId>
354-
<artifactId>maven-dependency-analyzer</artifactId>
355-
<version>1.11.1</version>
356-
</dependency>
357-
</dependencies>
356+
<version>3.8.1</version>
358357
<configuration>
359358
<skip>${air.check.skip-dependency}</skip>
360359
<failOnWarning>${air.check.fail-dependency}</failOnWarning>
@@ -385,18 +384,15 @@
385384
<maxmem>${air.build.jvmsize}</maxmem>
386385
<showWarnings>true</showWarnings>
387386
<fork>true</fork>
388-
<compilerArgs>
389-
<!-- Revert to <parameters>true</parameters> once IntelliJ 183.888 is widespread -->
390-
<arg>-parameters</arg>
391-
</compilerArgs>
387+
<parameters>true</parameters>
392388
</configuration>
393389
</plugin>
394390

395391
<!-- Resource plugins should always use UTF-8 -->
396392
<plugin>
397393
<groupId>org.apache.maven.plugins</groupId>
398394
<artifactId>maven-resources-plugin</artifactId>
399-
<version>2.6</version>
395+
<version>${dep.maven-resources-plugin.version}</version>
400396
<configuration>
401397
<encoding>${project.build.sourceEncoding}</encoding>
402398
</configuration>
@@ -667,7 +663,7 @@
667663
<plugin>
668664
<groupId>com.github.spotbugs</groupId>
669665
<artifactId>spotbugs-maven-plugin</artifactId>
670-
<version>3.1.10</version>
666+
<version>4.8.6.5</version>
671667
<configuration>
672668
<skip>${air.check.skip-spotbugs}</skip>
673669
<jvmArgs>-Xmx${air.build.jvmsize}</jvmArgs>
@@ -687,12 +683,11 @@
687683
<plugin>
688684
<groupId>org.apache.maven.plugins</groupId>
689685
<artifactId>maven-pmd-plugin</artifactId>
690-
<version>3.11.0</version>
686+
<version>3.26.0</version>
691687
<configuration>
692688
<skip>${air.check.skip-pmd}</skip>
693689
<failOnViolation>${air.check.fail-pmd}</failOnViolation>
694690
<targetJdk>${project.build.targetJdk}</targetJdk>
695-
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
696691
<minimumTokens>100</minimumTokens>
697692
<excludes>
698693
<exclude>**/*Bean.java</exclude>
@@ -702,9 +697,10 @@
702697
<excludeRoot>target/generated-sources/stubs</excludeRoot>
703698
</excludeRoots>
704699
<rulesets>
705-
<ruleset>/rulesets/java/basic.xml</ruleset>
706-
<ruleset>/rulesets/java/clone.xml</ruleset>
707-
<ruleset>/rulesets/java/finalizers.xml</ruleset>
700+
<ruleset>/category/java/performance.xml</ruleset>
701+
<!-- These generate hundreds of errors across the codebase -->
702+
<!-- <ruleset>/category/java/bestpractices.xml</ruleset> -->
703+
<!-- <ruleset>/category/java/errorprone.xml</ruleset> -->
708704
</rulesets>
709705
</configuration>
710706
<executions>
@@ -736,7 +732,6 @@
736732
<skip>${air.check.skip-license}</skip>
737733
<skipExistingHeaders>true</skipExistingHeaders>
738734
<failIfMissing>${air.check.fail-license}</failIfMissing>
739-
<header>${air.license.header-file}</header>
740735
<mapping>
741736
<java>SLASHSTAR_STYLE</java>
742737
<g>SLASHSTAR_STYLE</g>
@@ -745,41 +740,46 @@
745740
<properties>
746741
<inceptionYear>${project.inceptionYear}</inceptionYear>
747742
</properties>
748-
<headerSections>
749-
<headerSection>
750-
<key>COPYRIGHT_SECTION</key>
751-
<defaultValue>${air.license.default-value}</defaultValue>
752-
<ensureMatch>${air.license.ensure-match}</ensureMatch>
753-
<multiLineMatch>false</multiLineMatch>
754-
</headerSection>
755-
</headerSections>
756743
<strictCheck>true</strictCheck>
757744
<aggregate>true</aggregate>
758745
<useDefaultExcludes>true</useDefaultExcludes>
759746
<encoding>${project.build.sourceEncoding}</encoding>
760-
<excludes>
761-
<exclude>.*/**</exclude>
762-
<exclude>**/*.md</exclude>
763-
<exclude>**/*.sh</exclude>
764-
<exclude>**/*.txt</exclude>
765-
<exclude>**/*.thrift</exclude>
766-
<exclude>**/*.sql</exclude>
767-
<exclude>**/*.releaseBackup</exclude>
768-
<exclude>**/*.st</exclude>
769-
<exclude>**/*.raw</exclude>
770-
<exclude>**/*.ser</exclude>
771-
<exclude>**/*.html</exclude>
772-
<exclude>**/*.rst</exclude>
773-
<exclude>**/*.xml</exclude>
774-
<exclude>**/*.csv</exclude>
775-
<exclude>**/*.tsv</exclude>
776-
<exclude>**/*.properties</exclude>
777-
<exclude>**/src/license/**</exclude>
778-
<exclude>**/src/*/resources/**</exclude>
779-
</excludes>
780-
<includes>
781-
<include>src/**</include>
782-
</includes>
747+
<licenseSets>
748+
<licenseSet>
749+
<header>${air.license.header-file}</header>
750+
<headerSections>
751+
<headerSection>
752+
<key>COPYRIGHT_SECTION</key>
753+
<defaultValue>${air.license.default-value}</defaultValue>
754+
<ensureMatch>${air.license.ensure-match}</ensureMatch>
755+
<multiLineMatch>false</multiLineMatch>
756+
</headerSection>
757+
</headerSections>
758+
<excludes>
759+
<exclude>.*/**</exclude>
760+
<exclude>**/*.md</exclude>
761+
<exclude>**/*.sh</exclude>
762+
<exclude>**/*.txt</exclude>
763+
<exclude>**/*.thrift</exclude>
764+
<exclude>**/*.sql</exclude>
765+
<exclude>**/*.releaseBackup</exclude>
766+
<exclude>**/*.st</exclude>
767+
<exclude>**/*.raw</exclude>
768+
<exclude>**/*.ser</exclude>
769+
<exclude>**/*.html</exclude>
770+
<exclude>**/*.rst</exclude>
771+
<exclude>**/*.xml</exclude>
772+
<exclude>**/*.csv</exclude>
773+
<exclude>**/*.tsv</exclude>
774+
<exclude>**/*.properties</exclude>
775+
<exclude>**/src/license/**</exclude>
776+
<exclude>**/src/*/resources/**</exclude>
777+
</excludes>
778+
<includes>
779+
<include>src/**</include>
780+
</includes>
781+
</licenseSet>
782+
</licenseSets>
783783
</configuration>
784784
<executions>
785785
<execution>
@@ -795,7 +795,7 @@
795795
<plugin>
796796
<groupId>org.jacoco</groupId>
797797
<artifactId>jacoco-maven-plugin</artifactId>
798-
<version>0.8.6</version>
798+
<version>0.8.12</version>
799799
<executions>
800800
<execution>
801801
<id>default</id>
@@ -819,7 +819,7 @@
819819
<plugin>
820820
<groupId>org.gaul</groupId>
821821
<artifactId>modernizer-maven-plugin</artifactId>
822-
<version>1.7.1</version>
822+
<version>2.9.0</version>
823823
<configuration>
824824
<skip>${air.check.skip-modernizer}</skip>
825825
<failOnViolations>${air.check.fail-modernizer}</failOnViolations>
@@ -838,12 +838,12 @@
838838
<plugin>
839839
<groupId>org.apache.maven.plugins</groupId>
840840
<artifactId>maven-checkstyle-plugin</artifactId>
841-
<version>3.0.0</version>
841+
<version>3.6.0</version>
842842
<dependencies>
843843
<dependency>
844844
<groupId>com.puppycrawl.tools</groupId>
845845
<artifactId>checkstyle</artifactId>
846-
<version>8.16</version>
846+
<version>10.19.0</version>
847847
</dependency>
848848
<!-- This version must match the Airbase version. It will be updated by -->
849849
<!-- the Maven Release plugin. The "project.version" property cannot be -->
@@ -1020,11 +1020,6 @@
10201020
<artifactId>guice-assistedinject</artifactId>
10211021
<version>${dep.guice.version}</version>
10221022
</dependency>
1023-
<dependency>
1024-
<groupId>com.google.inject.extensions</groupId>
1025-
<artifactId>guice-multibindings</artifactId>
1026-
<version>${dep.guice.version}</version>
1027-
</dependency>
10281023
<dependency>
10291024
<groupId>com.google.inject.extensions</groupId>
10301025
<artifactId>guice-throwingproviders</artifactId>
@@ -1163,6 +1158,12 @@
11631158
<groupId>com.fasterxml.jackson.datatype</groupId>
11641159
<artifactId>jackson-datatype-guava</artifactId>
11651160
<version>${dep.jackson.version}</version>
1161+
<exclusions>
1162+
<exclusion>
1163+
<groupId>com.google.guava</groupId>
1164+
<artifactId>guava</artifactId>
1165+
</exclusion>
1166+
</exclusions>
11661167
</dependency>
11671168

11681169
<dependency>
@@ -1239,6 +1240,13 @@
12391240
<version>${dep.jmh.version}</version>
12401241
</dependency>
12411242

1243+
<!-- Modernizer warnings -->
1244+
<dependency>
1245+
<groupId>org.gaul</groupId>
1246+
<artifactId>modernizer-maven-annotations</artifactId>
1247+
<version>2.9.0</version>
1248+
</dependency>
1249+
12421250
<!-- Testing -->
12431251
<dependency>
12441252
<groupId>org.testng</groupId>
@@ -1302,12 +1310,6 @@
13021310
<artifactId>objenesis</artifactId>
13031311
<version>${dep.objenesis.version}</version>
13041312
</dependency>
1305-
1306-
<dependency>
1307-
<groupId>io.airlift</groupId>
1308-
<artifactId>slice</artifactId>
1309-
<version>${dep.slice.version}</version>
1310-
</dependency>
13111313
</dependencies>
13121314
</dependencyManagement>
13131315

0 commit comments

Comments
 (0)