Skip to content

Commit 0ab2f19

Browse files
rashtaorashtao
committed
added integration-tests as module
1 parent c47ab75 commit 0ab2f19

File tree

4 files changed

+61
-147
lines changed

4 files changed

+61
-147
lines changed

‎.github/workflows/resilience.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,8 @@ jobs:
3030
run: mvn -version
3131
- name: Start Toxiproxy
3232
run: ./bin/startProxy.sh
33+
- name: Install
34+
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
3335
- name: Test
34-
run: mvn --no-transfer-progress -am -pl resilience-tests test
36+
working-directory: resilience-tests
37+
run: mvn --no-transfer-progress test

‎driver/pom.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,6 @@
5050
</plugins>
5151
</build>
5252
</profile>
53-
<profile>
54-
<id>native</id>
55-
<build>
56-
<plugins>
57-
<plugin>
58-
<groupId>org.graalvm.buildtools</groupId>
59-
<artifactId>native-maven-plugin</artifactId>
60-
<version>0.9.19</version>
61-
<extensions>true</extensions>
62-
<executions>
63-
<execution>
64-
<id>test-native</id>
65-
<goals>
66-
<goal>generateTestResourceConfig</goal>
67-
<goal>test</goal>
68-
</goals>
69-
<phase>test</phase>
70-
</execution>
71-
</executions>
72-
<configuration>
73-
<quickBuild>true</quickBuild>
74-
<skip>false</skip>
75-
<buildArgs>
76-
<buildArg>--no-fallback</buildArg>
77-
</buildArgs>
78-
<systemProperties>
79-
<SslTest>${SslTest}</SslTest>
80-
</systemProperties>
81-
</configuration>
82-
</plugin>
83-
</plugins>
84-
</build>
85-
</profile>
8653
<profile>
8754
<id>static-code-analysis</id>
8855
<build>

‎pom.xml‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<inceptionYear>2016</inceptionYear>
1010
<modules>
1111
<module>driver</module>
12-
<module>resilience-tests</module>
1312
<module>shaded</module>
1413
<module>jackson-serde</module>
1514
<module>serde-api</module>
@@ -36,6 +35,7 @@
3635
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
3736
<adb.jackson.version>2.14.1</adb.jackson.version>
3837
<moduleName/>
38+
<SslTest/>
3939
</properties>
4040

4141
<developers>
@@ -133,6 +133,11 @@
133133
<artifactId>jackson-serde</artifactId>
134134
<version>${project.version}</version>
135135
</dependency>
136+
<dependency>
137+
<groupId>com.arangodb</groupId>
138+
<artifactId>jsonb-serde</artifactId>
139+
<version>${project.version}</version>
140+
</dependency>
136141
<dependency>
137142
<groupId>com.arangodb</groupId>
138143
<artifactId>arangodb-java-driver-shaded</artifactId>
@@ -158,6 +163,16 @@
158163
<artifactId>assertj-core</artifactId>
159164
<version>3.23.1</version>
160165
</dependency>
166+
<dependency>
167+
<groupId>com.tngtech.archunit</groupId>
168+
<artifactId>archunit-junit5</artifactId>
169+
<version>1.0.1</version>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.eclipse</groupId>
173+
<artifactId>yasson</artifactId>
174+
<version>3.0.2</version>
175+
</dependency>
161176
</dependencies>
162177
</dependencyManagement>
163178

@@ -173,8 +188,6 @@
173188
<arg>-Xlint:deprecation</arg>
174189
</compilerArgs>
175190
<showWarnings>true</showWarnings>
176-
<source>1.8</source>
177-
<target>1.8</target>
178191
</configuration>
179192
</plugin>
180193
<plugin>
@@ -274,6 +287,7 @@
274287
<Automatic-Module-Name>${moduleName}</Automatic-Module-Name>
275288
</manifestEntries>
276289
</archive>
290+
<skipIfEmpty>true</skipIfEmpty>
277291
</configuration>
278292
</plugin>
279293
<plugin>
@@ -363,6 +377,39 @@
363377
<module>jsonb-serde</module>
364378
</modules>
365379
</profile>
380+
<profile>
381+
<id>native</id>
382+
<build>
383+
<plugins>
384+
<plugin>
385+
<groupId>org.graalvm.buildtools</groupId>
386+
<artifactId>native-maven-plugin</artifactId>
387+
<version>0.9.19</version>
388+
<extensions>true</extensions>
389+
<executions>
390+
<execution>
391+
<id>test-native</id>
392+
<goals>
393+
<goal>generateTestResourceConfig</goal>
394+
<goal>test</goal>
395+
</goals>
396+
<phase>test</phase>
397+
</execution>
398+
</executions>
399+
<configuration>
400+
<quickBuild>true</quickBuild>
401+
<skip>false</skip>
402+
<buildArgs>
403+
<buildArg>--no-fallback</buildArg>
404+
</buildArgs>
405+
<systemProperties>
406+
<SslTest>${SslTest}</SslTest>
407+
</systemProperties>
408+
</configuration>
409+
</plugin>
410+
</plugins>
411+
</build>
412+
</profile>
366413
</profiles>
367414

368415
</project>

‎shaded-integration-tests/pom.xml‎

Lines changed: 7 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -4,92 +4,25 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.arangodb</groupId>
8-
<artifactId>integration-tests</artifactId>
9-
<version>7.0.0-SNAPSHOT</version>
7+
<parent>
8+
<groupId>com.arangodb</groupId>
9+
<artifactId>arangodb-java-driver-parent</artifactId>
10+
<version>7.0.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>shaded-integration-tests</artifactId>
1014

1115
<properties>
1216
<maven.compiler.target>17</maven.compiler.target>
1317
<maven.compiler.source>17</maven.compiler.source>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<adb.jackson.version>2.14.1</adb.jackson.version>
1618
</properties>
1719

18-
<dependencies>
19-
<dependency>
20-
<groupId>ch.qos.logback</groupId>
21-
<artifactId>logback-classic</artifactId>
22-
<version>1.4.5</version>
23-
<scope>test</scope>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.junit.platform</groupId>
27-
<artifactId>junit-platform-launcher</artifactId>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.junit.jupiter</groupId>
32-
<artifactId>junit-jupiter-api</artifactId>
33-
<scope>test</scope>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.junit.jupiter</groupId>
37-
<artifactId>junit-jupiter-engine</artifactId>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.junit.jupiter</groupId>
42-
<artifactId>junit-jupiter-params</artifactId>
43-
<scope>test</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.assertj</groupId>
47-
<artifactId>assertj-core</artifactId>
48-
<version>3.23.1</version>
49-
<scope>test</scope>
50-
</dependency>
51-
</dependencies>
52-
53-
<dependencyManagement>
54-
<dependencies>
55-
<dependency>
56-
<groupId>com.fasterxml.jackson</groupId>
57-
<artifactId>jackson-bom</artifactId>
58-
<version>${adb.jackson.version}</version>
59-
<scope>import</scope>
60-
<type>pom</type>
61-
</dependency>
62-
<dependency>
63-
<groupId>io.vertx</groupId>
64-
<artifactId>vertx-stack-depchain</artifactId>
65-
<version>4.3.5</version>
66-
<type>pom</type>
67-
<scope>import</scope>
68-
</dependency>
69-
<dependency>
70-
<groupId>io.netty</groupId>
71-
<artifactId>netty-bom</artifactId>
72-
<version>4.1.85.Final</version>
73-
<type>pom</type>
74-
<scope>import</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.junit</groupId>
78-
<artifactId>junit-bom</artifactId>
79-
<version>5.9.1</version>
80-
<type>pom</type>
81-
<scope>import</scope>
82-
</dependency>
83-
</dependencies>
84-
</dependencyManagement>
85-
8620
<build>
8721
<testSourceDirectory>${testSourceDirectory}</testSourceDirectory>
8822
<plugins>
8923
<plugin>
9024
<groupId>org.apache.maven.plugins</groupId>
9125
<artifactId>maven-surefire-plugin</artifactId>
92-
<version>3.0.0-M7</version>
9326
<configuration>
9427
<systemPropertyVariables>
9528
<serde>${serde}</serde>
@@ -113,19 +46,16 @@
11346
<dependency>
11447
<groupId>com.arangodb</groupId>
11548
<artifactId>arangodb-java-driver-shaded</artifactId>
116-
<version>7.0.0-SNAPSHOT</version>
11749
<scope>test</scope>
11850
</dependency>
11951
<dependency>
12052
<groupId>com.arangodb</groupId>
12153
<artifactId>jackson-dataformat-velocypack</artifactId>
122-
<version>3.1.0</version>
12354
<scope>test</scope>
12455
</dependency>
12556
<dependency>
12657
<groupId>com.tngtech.archunit</groupId>
12758
<artifactId>archunit-junit5</artifactId>
128-
<version>1.0.1</version>
12959
<scope>test</scope>
13060
</dependency>
13161
</dependencies>
@@ -140,7 +70,6 @@
14070
<dependency>
14171
<groupId>com.arangodb</groupId>
14272
<artifactId>arangodb-java-driver-shaded</artifactId>
143-
<version>7.0.0-SNAPSHOT</version>
14473
<scope>test</scope>
14574
<exclusions>
14675
<exclusion>
@@ -152,18 +81,15 @@
15281
<dependency>
15382
<groupId>com.arangodb</groupId>
15483
<artifactId>jsonb-serde</artifactId>
155-
<version>7.0.0-SNAPSHOT</version>
15684
<scope>test</scope>
15785
</dependency>
15886
<dependency>
15987
<groupId>org.eclipse</groupId>
16088
<artifactId>yasson</artifactId>
161-
<version>3.0.2</version>
16289
</dependency>
16390
<dependency>
16491
<groupId>com.tngtech.archunit</groupId>
16592
<artifactId>archunit-junit5</artifactId>
166-
<version>1.0.1</version>
16793
<scope>test</scope>
16894
</dependency>
16995
</dependencies>
@@ -178,43 +104,14 @@
178104
<dependency>
179105
<groupId>com.arangodb</groupId>
180106
<artifactId>arangodb-java-driver-shaded</artifactId>
181-
<version>7.0.0-SNAPSHOT</version>
182107
<scope>test</scope>
183108
</dependency>
184109
<dependency>
185110
<groupId>com.arangodb</groupId>
186111
<artifactId>jackson-dataformat-velocypack</artifactId>
187-
<version>3.1.0</version>
188112
<scope>test</scope>
189113
</dependency>
190114
</dependencies>
191-
<build>
192-
<plugins>
193-
<plugin>
194-
<groupId>org.graalvm.buildtools</groupId>
195-
<artifactId>native-maven-plugin</artifactId>
196-
<version>0.9.19</version>
197-
<extensions>true</extensions>
198-
<executions>
199-
<execution>
200-
<id>test-native</id>
201-
<goals>
202-
<goal>generateTestResourceConfig</goal>
203-
<goal>test</goal>
204-
</goals>
205-
<phase>test</phase>
206-
</execution>
207-
</executions>
208-
<configuration>
209-
<quickBuild>true</quickBuild>
210-
<skip>false</skip>
211-
<buildArgs>
212-
<buildArg>--no-fallback</buildArg>
213-
</buildArgs>
214-
</configuration>
215-
</plugin>
216-
</plugins>
217-
</build>
218115
</profile>
219116
</profiles>
220117
</project>

0 commit comments

Comments
 (0)