Skip to content

Commit

Permalink
Update to Airlift 247 and Airbase 156
Browse files Browse the repository at this point in the history 
Includes Java update to 21 (as Airlift is compiled for 21)
and sorting of pom files (as now required by Airbase).
  • Loading branch information
@findepi @electrum
findepi authored and electrum committed May 7, 2024
1 parent 5a8d2d0 commit 79255ca
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17
java-version: 21
- name: Maven Install
run: mvn install -B -V -DskipTests -Dair.check.skip-all
- name: Maven Tests
Expand Down
88 changes: 44 additions & 44 deletions discovery-server/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand All @@ -18,10 +18,6 @@
</properties>

<dependencies>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>jmx-http-rpc</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -44,8 +40,9 @@
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<optional>true</optional>
</dependency>

<dependency>
Expand All @@ -54,43 +51,38 @@
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>

<dependency>
<groupId>org.weakref</groupId>
<artifactId>jmxutils</artifactId>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb-api</artifactId>
<groupId>io.airlift</groupId>
<artifactId>bootstrap</artifactId>
</dependency>

<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<groupId>io.airlift</groupId>
<artifactId>concurrent</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>bootstrap</artifactId>
<artifactId>configuration</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>concurrent</artifactId>
<artifactId>discovery</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>discovery</artifactId>
<artifactId>event-http</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
<artifactId>http-client</artifactId>
</dependency>

<dependency>
Expand All @@ -105,53 +97,51 @@

<dependency>
<groupId>io.airlift</groupId>
<artifactId>node</artifactId>
<artifactId>jmx</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>json</artifactId>
<artifactId>jmx-http-rpc</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>trace-token</artifactId>
<artifactId>json</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
<artifactId>log</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>http-client</artifactId>
<artifactId>node</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>configuration</artifactId>
<artifactId>trace-token</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>event-http</artifactId>
<artifactId>tracing</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>jmx</artifactId>
<artifactId>units</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>tracing</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<optional>true</optional>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<dependency>
Expand All @@ -160,26 +150,36 @@
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb-api</artifactId>
</dependency>

<dependency>
<groupId>org.weakref</groupId>
<artifactId>jmxutils</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>testing</artifactId>
<scope>test</scope>
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
52 changes: 26 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>143</version>
<version>156</version>
</parent>

<groupId>io.airlift.discovery</groupId>
Expand All @@ -31,13 +31,6 @@
</license>
</licenses>

<scm>
<connection>scm:git:git://github.com/airlift/discovery.git</connection>
<developerConnection>scm:git:[email protected]:airlift/discovery.git</developerConnection>
<url>https://github.com/airlift/discovery</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>dain</id>
Expand All @@ -51,34 +44,30 @@
</developer>
</developers>

<modules>
<module>discovery-server</module>
</modules>

<scm>
<connection>scm:git:git://github.com/airlift/discovery.git</connection>
<developerConnection>scm:git:[email protected]:airlift/discovery.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/airlift/discovery</url>
</scm>

<properties>
<air.check.skip-extended>true</air.check.skip-extended>
<air.javadoc.lint>all,-missing</air.javadoc.lint>

<project.build.targetJdk>17</project.build.targetJdk>
<project.build.targetJdk>21</project.build.targetJdk>

<dep.airlift.version>234</dep.airlift.version>
<dep.airlift.version>247</dep.airlift.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.leveldb.version>0.12</dep.leveldb.version>
</properties>

<modules>
<module>discovery-server</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb-api</artifactId>
<version>${dep.leveldb.version}</version>
</dependency>

<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${dep.leveldb.version}</version>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
Expand All @@ -91,7 +80,18 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
<version>1.6</version>
<version>1.10</version>
</dependency>

<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${dep.leveldb.version}</version>
</dependency>
<dependency>
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb-api</artifactId>
<version>${dep.leveldb.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 79255ca

Please sign in to comment.