Skip to content

Commit b513968

Browse files
committed
Merge remote-tracking branch 'sm/bumpAirbase'
2 parents c9e34d1 + e2650c2 commit b513968

File tree

3 files changed

+45
-22
lines changed

3 files changed

+45
-22
lines changed

.github/workflows/maven.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33

44
name: Java CI with Maven
55

6-
on: [push, pull_request]
6+
on: [ push, pull_request ]
77

88
jobs:
99
build:
1010

1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
15-
with:
16-
show-progress: false
17-
# needed for the git-commit-id-plugin to work
18-
fetch-depth: 0
19-
- name: Set up JDK 8
20-
uses: actions/setup-java@v3
21-
with:
22-
java-version: '8'
23-
distribution: 'temurin'
24-
- name: Maven Install
25-
run: mvn install -B -V -DskipTests -Dair.check.skip-all
26-
- name: Maven Tests
27-
run: mvn install -B -P ci
14+
- uses: actions/checkout@v4
15+
with:
16+
show-progress: false
17+
# needed for the git-commit-id-plugin to work
18+
fetch-depth: 0
19+
- name: Set up JDK 8
20+
uses: actions/setup-java@v3
21+
with:
22+
java-version: '8'
23+
distribution: 'temurin'
24+
- name: Maven Install
25+
run: mvn install -B -V -DskipTests -Dair.check.skip-all
26+
- name: Maven Tests
27+
run: mvn install -B -P ci

drift-codec-utils/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<groupId>org.gaul</groupId>
8181
<artifactId>modernizer-maven-plugin</artifactId>
8282
<configuration>
83+
<skip>true</skip>
8384
<exclusionPatterns>
8485
<exclusionPattern>org/joda/time/.*</exclusionPattern>
8586
</exclusionPatterns>

pom.xml

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.facebook.airlift</groupId>
77
<artifactId>airbase</artifactId>
8-
<version>95</version>
8+
<version>107</version>
99
</parent>
1010

1111
<groupId>com.facebook.drift</groupId>
@@ -154,12 +154,6 @@
154154
<version>${dep.airlift.version}</version>
155155
</dependency>
156156

157-
<dependency>
158-
<groupId>io.airlift</groupId>
159-
<artifactId>units</artifactId>
160-
<version>${dep.airlift.version}</version>
161-
</dependency>
162-
163157
<dependency>
164158
<groupId>io.airlift</groupId>
165159
<artifactId>parameternames</artifactId>
@@ -321,12 +315,40 @@
321315
<artifactId>joda-time</artifactId>
322316
<version>2.9.9</version>
323317
</dependency>
318+
319+
<dependency>
320+
<groupId>javax.validation</groupId>
321+
<artifactId>validation-api</artifactId>
322+
<version>2.0.1.Final</version>
323+
</dependency>
324+
325+
<dependency>
326+
<groupId>com.google.inject</groupId>
327+
<artifactId>guice</artifactId>
328+
<version>4.2.2</version>
329+
</dependency>
324330
</dependencies>
325331
</dependencyManagement>
326332

327333
<build>
328334
<pluginManagement>
329335
<plugins>
336+
<plugin>
337+
<groupId>org.gaul</groupId>
338+
<artifactId>modernizer-maven-plugin</artifactId>
339+
<version>3.1.0</version>
340+
<configuration>
341+
<skip>true</skip>
342+
</configuration>
343+
</plugin>
344+
<plugin>
345+
<groupId>org.apache.maven.plugins</groupId>
346+
<artifactId>maven-dependency-plugin</artifactId>
347+
<version>3.8.1</version>
348+
<configuration>
349+
<skip>true</skip>
350+
</configuration>
351+
</plugin>
330352
<plugin>
331353
<groupId>org.apache.maven.plugins</groupId>
332354
<artifactId>maven-plugin-plugin</artifactId>

0 commit comments

Comments
 (0)