Skip to content

Commit 9386c19

Browse files
imjalpreetZacBlanco
authored andcommitted
Upgrade airbase for Java 21
Java 17 Upgrade fix artifact naming java 21 fixes revert jitpack renaming
1 parent 1b42fd6 commit 9386c19

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

README.md

+1-1
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/pom.xml

+18-15
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
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

@@ -176,8 +176,8 @@
176176
<dep.packaging.version>0.163</dep.packaging.version>
177177

178178
<!-- 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>
179+
<dep.guice.version>5.0.1</dep.guice.version>
180+
<dep.guava.version>32.1.0-jre</dep.guava.version>
181181
<dep.slf4j.version>1.7.25</dep.slf4j.version>
182182
<dep.logback.version>1.2.3</dep.logback.version>
183183
<dep.javax-inject.version>1</dep.javax-inject.version>
@@ -188,7 +188,7 @@
188188
<dep.jmxutils.version>1.19</dep.jmxutils.version>
189189
<dep.cglib.version>3.2.5</dep.cglib.version>
190190
<dep.joda.version>2.9.9</dep.joda.version>
191-
<dep.spotbugs-annotations.version>3.1.10</dep.spotbugs-annotations.version>
191+
<dep.spotbugs-annotations.version>4.8.6</dep.spotbugs-annotations.version>
192192
<dep.testng.version>6.9.6</dep.testng.version>
193193
<dep.assertj-core.version>3.5.2</dep.assertj-core.version>
194194
<dep.assertj-guava.version>3.1.0</dep.assertj-guava.version>
@@ -197,7 +197,7 @@
197197
<dep.hamcrest.version>1.3</dep.hamcrest.version>
198198
<dep.mockito.version>1.9.5</dep.mockito.version>
199199
<dep.objenesis.version>1.3</dep.objenesis.version>
200-
<dep.slice.version>0.34</dep.slice.version>
200+
<dep.slice.version>0.38-SNAPSHOT</dep.slice.version>
201201
<dep.jmh.version>1.20</dep.jmh.version>
202202

203203
<!-- license headers -->
@@ -242,6 +242,9 @@
242242
<groupId>org.apache.maven.plugins</groupId>
243243
<artifactId>maven-deploy-plugin</artifactId>
244244
<version>3.1.1</version>
245+
<configuration>
246+
<allowIncompleteProjects>true</allowIncompleteProjects>
247+
</configuration>
245248
</plugin>
246249

247250
<plugin>
@@ -254,6 +257,9 @@
254257
<groupId>org.apache.maven.plugins</groupId>
255258
<artifactId>maven-install-plugin</artifactId>
256259
<version>3.1.1</version>
260+
<configuration>
261+
<allowIncompleteProjects>true</allowIncompleteProjects>
262+
</configuration>
257263
</plugin>
258264

259265
<plugin>
@@ -265,12 +271,12 @@
265271
<plugin>
266272
<groupId>org.apache.maven.plugins</groupId>
267273
<artifactId>maven-enforcer-plugin</artifactId>
268-
<version>3.0.0-M2</version>
274+
<version>3.5.0</version>
269275
<dependencies>
270276
<dependency>
271277
<groupId>org.codehaus.mojo</groupId>
272278
<artifactId>extra-enforcer-rules</artifactId>
273-
<version>1.1</version>
279+
<version>1.9.0</version>
274280
</dependency>
275281
</dependencies>
276282
<executions>
@@ -328,7 +334,9 @@
328334
<version>${air.maven.version}</version>
329335
</requireMavenVersion>
330336
<requireJavaVersion>
337+
<message>Only Java ${air.java.version} is supported</message>
331338
<version>${air.java.version}</version>
339+
<display>true</display>
332340
</requireJavaVersion>
333341
<enforceBytecodeVersion>
334342
<maxJdkVersion>${project.build.targetJdk}</maxJdkVersion>
@@ -667,7 +675,7 @@
667675
<plugin>
668676
<groupId>com.github.spotbugs</groupId>
669677
<artifactId>spotbugs-maven-plugin</artifactId>
670-
<version>3.1.10</version>
678+
<version>4.8.6.5</version>
671679
<configuration>
672680
<skip>${air.check.skip-spotbugs}</skip>
673681
<jvmArgs>-Xmx${air.build.jvmsize}</jvmArgs>
@@ -795,7 +803,7 @@
795803
<plugin>
796804
<groupId>org.jacoco</groupId>
797805
<artifactId>jacoco-maven-plugin</artifactId>
798-
<version>0.8.6</version>
806+
<version>0.8.12</version>
799807
<executions>
800808
<execution>
801809
<id>default</id>
@@ -1020,11 +1028,6 @@
10201028
<artifactId>guice-assistedinject</artifactId>
10211029
<version>${dep.guice.version}</version>
10221030
</dependency>
1023-
<dependency>
1024-
<groupId>com.google.inject.extensions</groupId>
1025-
<artifactId>guice-multibindings</artifactId>
1026-
<version>${dep.guice.version}</version>
1027-
</dependency>
10281031
<dependency>
10291032
<groupId>com.google.inject.extensions</groupId>
10301033
<artifactId>guice-throwingproviders</artifactId>
@@ -1304,7 +1307,7 @@
13041307
</dependency>
13051308

13061309
<dependency>
1307-
<groupId>io.airlift</groupId>
1310+
<groupId>com.facebook.airlift</groupId>
13081311
<artifactId>slice</artifactId>
13091312
<version>${dep.slice.version}</version>
13101313
</dependency>

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<plugin>
6363
<groupId>org.apache.maven.plugins</groupId>
6464
<artifactId>maven-release-plugin</artifactId>
65-
<version>2.5.3</version>
65+
<version>3.1.1</version>
6666
<configuration>
6767
<releaseProfiles>oss-release</releaseProfiles>
6868
<mavenExecutorId>forked-path</mavenExecutorId>
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>org.apache.maven.plugins</groupId>
8080
<artifactId>maven-javadoc-plugin</artifactId>
81-
<version>3.0.0</version>
81+
<version>3.10.1</version>
8282
<executions>
8383
<execution>
8484
<id>attach-javadocs</id>
@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-source-plugin</artifactId>
95-
<version>3.0.1</version>
95+
<version>3.3.1</version>
9696
<executions>
9797
<execution>
9898
<id>attach-sources</id>
@@ -106,7 +106,7 @@
106106
<plugin>
107107
<groupId>org.apache.maven.plugins</groupId>
108108
<artifactId>maven-gpg-plugin</artifactId>
109-
<version>1.6</version>
109+
<version>3.2.7</version>
110110
<configuration>
111111
<useAgent>true</useAgent>
112112
</configuration>
@@ -148,7 +148,7 @@
148148
<plugin>
149149
<groupId>org.apache.maven.plugins</groupId>
150150
<artifactId>maven-gpg-plugin</artifactId>
151-
<version>3.2.4</version>
151+
<version>3.2.7</version>
152152
<configuration>
153153
<gpgArguments>
154154
<arg>--pinentry-mode</arg>

0 commit comments

Comments
 (0)