Skip to content

Commit d9acd4d

Browse files
youngsofunyoungsofun
committed
refactor: rm parent airbase
1 parent 6ff20c3 commit d9acd4d

File tree

4 files changed

+126
-32
lines changed

4 files changed

+126
-32
lines changed

‎.github/workflows/test_compatibility.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
env:
3939
DATABEND_QUERY_VERSION: ${{ matrix.server }}
4040

41-
- name: Bulid Test Jar
41+
- name: Build Test Jar
4242
run: mvn clean package -DskipTests
4343
env:
4444
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎databend-client/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<name>databend-client</name>
1616
<packaging>jar</packaging>
1717

18-
<properties>
19-
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
20-
<project.build.targetJdk>8</project.build.targetJdk>
21-
</properties>
2218
<dependencies>
2319
<dependency>
2420
<groupId>com.fasterxml.jackson.core</groupId>

‎databend-jdbc/pom.xml‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<name>databend-jdbc</name>
1515
<packaging>jar</packaging>
1616

17-
<properties>
18-
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
19-
<project.build.targetJdk>8</project.build.targetJdk>
20-
</properties>
2117
<dependencies>
2218
<dependency>
2319
<groupId>com.databend</groupId>
@@ -124,5 +120,24 @@
124120
</excludes>
125121
</resource>
126122
</resources>
123+
<plugins>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-jar-plugin</artifactId>
127+
<version>3.3.0</version>
128+
<executions>
129+
<execution>
130+
<id>attach-tests</id>
131+
<phase>package</phase>
132+
<goals>
133+
<goal>test-jar</goal>
134+
</goals>
135+
</execution>
136+
</executions>
137+
<configuration>
138+
<skipIfEmpty>true</skipIfEmpty>
139+
</configuration>
140+
</plugin>
141+
</plugins>
127142
</build>
128143
</project>

‎pom.xml‎

Lines changed: 106 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<!-- https://github.com/airlift/airbase/blob/130/airbase/pom.xml -->
7-
<groupId>io.airlift</groupId>
8-
<artifactId>airbase</artifactId>
9-
<version>130</version>
10-
</parent>
115
<groupId>com.databend</groupId>
126
<artifactId>databend-base</artifactId>
137
<version>0.4.2</version>
@@ -38,21 +32,18 @@
3832
</repository>
3933
</distributionManagement>
4034
<properties>
41-
<air.main.basedir>${project.basedir}</air.main.basedir>
42-
<air.modernizer.java-version>8</air.modernizer.java-version>
43-
44-
<air.check.skip-all>true</air.check.skip-all>
45-
46-
<dep.airlift.version>219</dep.airlift.version>
47-
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
35+
<maven.compiler.release>8</maven.compiler.release>
36+
<maven.compiler.source>1.8</maven.compiler.source>
37+
<maven.compiler.target>1.8</maven.compiler.target>
38+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4839
<dep.jackson.version>2.19.2</dep.jackson.version>
40+
<dep.jsr305.version>3.0.2</dep.jsr305.version>
4941
<dep.guava.version>32.0.1-jre</dep.guava.version>
5042
<dep.slf4j.version>1.7.6</dep.slf4j.version>
51-
<!-- not in airbase -->
5243
<dep.okio.version>3.1.0</dep.okio.version>
53-
<!-- not in airbase -->
5444
<dep.okhttp.version>5.0.0-alpha.11</dep.okhttp.version>
55-
<air.javadoc.lint>-missing</air.javadoc.lint>
45+
<dep.testng.version>6.10</dep.testng.version>
46+
<plugin.gpg.version>3.2.8</plugin.gpg.version>
5647
<checkstyle.config.location>${maven.multiModuleProjectDirectory}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
5748
</properties>
5849

@@ -75,6 +66,42 @@
7566
<version>2.4.0</version>
7667
</dependency>
7768

69+
<dependency>
70+
<groupId>com.fasterxml.jackson.core</groupId>
71+
<artifactId>jackson-annotations</artifactId>
72+
<version>${dep.jackson.version}</version>
73+
</dependency>
74+
75+
<dependency>
76+
<groupId>com.fasterxml.jackson.core</groupId>
77+
<artifactId>jackson-core</artifactId>
78+
<version>${dep.jackson.version}</version>
79+
</dependency>
80+
81+
<dependency>
82+
<groupId>com.fasterxml.jackson.core</groupId>
83+
<artifactId>jackson-databind</artifactId>
84+
<version>${dep.jackson.version}</version>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>com.fasterxml.jackson.datatype</groupId>
89+
<artifactId>jackson-datatype-jdk8</artifactId>
90+
<version>${dep.jackson.version}</version>
91+
</dependency>
92+
93+
<dependency>
94+
<groupId>com.google.code.findbugs</groupId>
95+
<artifactId>jsr305</artifactId>
96+
<version>${dep.jsr305.version}</version>
97+
</dependency>
98+
99+
<dependency>
100+
<groupId>com.google.guava</groupId>
101+
<artifactId>guava</artifactId>
102+
<version>${dep.guava.version}</version>
103+
</dependency>
104+
78105
<dependency>
79106
<groupId>com.squareup.okio</groupId>
80107
<artifactId>okio</artifactId>
@@ -117,6 +144,12 @@
117144
<version>1.7.10</version>
118145
</dependency>
119146

147+
<dependency>
148+
<groupId>org.testng</groupId>
149+
<artifactId>testng</artifactId>
150+
<version>${dep.testng.version}</version>
151+
</dependency>
152+
120153
</dependencies>
121154

122155
</dependencyManagement>
@@ -126,7 +159,7 @@
126159
<plugin>
127160
<groupId>org.apache.maven.plugins</groupId>
128161
<artifactId>maven-shade-plugin</artifactId>
129-
<version>3.5.1</version>
162+
<version>3.6.1</version>
130163
<executions>
131164
<execution>
132165
<phase>package</phase>
@@ -179,15 +212,15 @@
179212
<plugin>
180213
<groupId>org.apache.maven.plugins</groupId>
181214
<artifactId>maven-surefire-plugin</artifactId>
182-
<version>2.19</version>
215+
<version>3.2.5</version>
183216
<configuration>
184217
<skipAfterFailureCount>1</skipAfterFailureCount>
185218
</configuration>
186219
</plugin>
187220
<plugin>
188221
<groupId>org.apache.maven.plugins</groupId>
189222
<artifactId>maven-source-plugin</artifactId>
190-
<version>2.2.1</version>
223+
<version>3.3.0</version>
191224
<executions>
192225
<execution>
193226
<id>attach-sources</id>
@@ -200,7 +233,7 @@
200233
<plugin>
201234
<groupId>org.apache.maven.plugins</groupId>
202235
<artifactId>maven-javadoc-plugin</artifactId>
203-
<version>2.9.1</version>
236+
<version>3.6.3</version>
204237
<configuration>
205238
<additionalparam>-Xdoclint:none</additionalparam>
206239
</configuration>
@@ -216,14 +249,15 @@
216249
<plugin>
217250
<groupId>org.apache.maven.plugins</groupId>
218251
<artifactId>maven-gpg-plugin</artifactId>
252+
<version>${plugin.gpg.version}</version>
219253
<configuration>
220254
<skip>true</skip>
221255
</configuration>
222256
</plugin>
223257
<plugin>
224258
<groupId>org.apache.maven.plugins</groupId>
225259
<artifactId>maven-checkstyle-plugin</artifactId>
226-
<version>3.3.0</version>
260+
<version>3.5.0</version>
227261
<configuration>
228262
<configLocation>${checkstyle.config.location}</configLocation>
229263
<consoleOutput>true</consoleOutput>
@@ -247,14 +281,63 @@
247281
<plugin>
248282
<groupId>org.apache.maven.plugins</groupId>
249283
<artifactId>maven-shade-plugin</artifactId>
250-
<version>3.5.1</version>
284+
<version>3.6.1</version>
285+
</plugin>
286+
<plugin>
287+
<groupId>org.apache.maven.plugins</groupId>
288+
<artifactId>maven-release-plugin</artifactId>
289+
<version>3.0.1</version>
290+
<configuration>
291+
<releaseProfiles>release</releaseProfiles>
292+
<useReleaseProfile>false</useReleaseProfile>
293+
<goals>deploy</goals>
294+
<autoVersionSubmodules>true</autoVersionSubmodules>
295+
<pushChanges>false</pushChanges>
296+
<mavenExecutorId>forked-path</mavenExecutorId>
297+
<localCheckout>true</localCheckout>
298+
<preparationGoals>clean install</preparationGoals>
299+
<tagNameFormat>@{project.version}</tagNameFormat>
300+
</configuration>
251301
</plugin>
252302
<plugin>
253303
<groupId>org.apache.maven.plugins</groupId>
254304
<artifactId>maven-checkstyle-plugin</artifactId>
255-
<version>3.3.0</version>
305+
<version>3.5.0</version>
256306
</plugin>
257307
</plugins>
258308
</pluginManagement>
259309
</build>
310+
311+
<profiles>
312+
<profile>
313+
<id>release</id>
314+
<properties>
315+
<skipTests>true</skipTests>
316+
</properties>
317+
<build>
318+
<plugins>
319+
<plugin>
320+
<groupId>org.apache.maven.plugins</groupId>
321+
<artifactId>maven-javadoc-plugin</artifactId>
322+
</plugin>
323+
<plugin>
324+
<groupId>org.apache.maven.plugins</groupId>
325+
<artifactId>maven-gpg-plugin</artifactId>
326+
<configuration>
327+
<skip>false</skip>
328+
</configuration>
329+
<executions>
330+
<execution>
331+
<id>sign-artifacts</id>
332+
<phase>verify</phase>
333+
<goals>
334+
<goal>sign</goal>
335+
</goals>
336+
</execution>
337+
</executions>
338+
</plugin>
339+
</plugins>
340+
</build>
341+
</profile>
342+
</profiles>
260343
</project>

0 commit comments

Comments
 (0)