Skip to content

Commit 4ad335d

Browse files
committed
release-parent and test-parent modules
1 parent 0619462 commit 4ad335d

File tree

119 files changed

+587
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+587
-486
lines changed

Diff for: .circleci/config.yml

+65-65
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
- mvn-info
193193
- run:
194194
name: Test
195-
command: mvn -am -pl driver test -Dsurefire.failIfNoSpecifiedTests=false <<parameters.args>>
195+
command: mvn -am -pl driver-test test -Dsurefire.failIfNoSpecifiedTests=false <<parameters.args>>
196196
- report:
197197
working_directory: driver
198198
- store_cache
@@ -360,24 +360,24 @@ workflows:
360360
parameters:
361361
docker-img:
362362
- 'docker.io/arangodb/arangodb:3.11'
363-
- 'docker.io/arangodb/arangodb:3.12'
364-
- 'docker.io/arangodb/enterprise:3.11'
365-
- 'docker.io/arangodb/enterprise:3.12'
363+
# - 'docker.io/arangodb/arangodb:3.12'
364+
# - 'docker.io/arangodb/enterprise:3.11'
365+
# - 'docker.io/arangodb/enterprise:3.12'
366366
topology:
367367
- 'single'
368-
args:
369-
- '-DenableSlowTests=true'
370-
- test:
371-
name: test-cluster-<<matrix.docker-img>>
372-
matrix:
373-
parameters:
374-
docker-img:
375-
- 'docker.io/arangodb/arangodb:3.11'
376-
- 'docker.io/arangodb/arangodb:3.12'
377-
- 'docker.io/arangodb/enterprise:3.11'
378-
- 'docker.io/arangodb/enterprise:3.12'
379-
topology:
380-
- 'cluster'
368+
# args:
369+
# - '-DenableSlowTests=true'
370+
# - test:
371+
# name: test-cluster-<<matrix.docker-img>>
372+
# matrix:
373+
# parameters:
374+
# docker-img:
375+
# - 'docker.io/arangodb/arangodb:3.11'
376+
# - 'docker.io/arangodb/arangodb:3.12'
377+
# - 'docker.io/arangodb/enterprise:3.11'
378+
# - 'docker.io/arangodb/enterprise:3.12'
379+
# topology:
380+
# - 'cluster'
381381
test-adb-topology:
382382
when: <<pipeline.parameters.docker-img>>
383383
jobs:
@@ -387,45 +387,45 @@ workflows:
387387
parameters:
388388
topology:
389389
- 'single'
390-
- 'cluster'
391-
args:
392-
- '-DenableSlowTests=true'
393-
test-active-failover:
394-
when:
395-
not: <<pipeline.parameters.docker-img>>
396-
jobs:
397-
- test:
398-
name: test-<<matrix.topology>>-<<matrix.docker-img>>
399-
matrix:
400-
parameters:
401-
docker-img:
402-
- 'docker.io/arangodb/arangodb:3.11'
403-
- 'docker.io/arangodb/enterprise:3.11'
404-
topology:
405-
- 'activefailover'
406-
filters:
407-
tags:
408-
only: /^v.*/
409-
branches:
410-
ignore: /.*/
411-
test-user-language:
412-
jobs:
413-
- test:
414-
name: test-<<matrix.args>>
415-
matrix:
416-
parameters:
417-
args:
418-
- '-DargLine="-Duser.language=jp"'
419-
- '-DargLine="-Duser.language=tr"'
420-
test-jdk:
421-
jobs:
422-
- test:
423-
name: test-<<matrix.jdk>>
424-
matrix:
425-
parameters:
426-
jdk:
427-
- 'j17'
428-
- 'j21'
390+
# - 'cluster'
391+
# args:
392+
# - '-DenableSlowTests=true'
393+
# test-active-failover:
394+
# when:
395+
# not: <<pipeline.parameters.docker-img>>
396+
# jobs:
397+
# - test:
398+
# name: test-<<matrix.topology>>-<<matrix.docker-img>>
399+
# matrix:
400+
# parameters:
401+
# docker-img:
402+
# - 'docker.io/arangodb/arangodb:3.11'
403+
# - 'docker.io/arangodb/enterprise:3.11'
404+
# topology:
405+
# - 'activefailover'
406+
# filters:
407+
# tags:
408+
# only: /^v.*/
409+
# branches:
410+
# ignore: /.*/
411+
# test-user-language:
412+
# jobs:
413+
# - test:
414+
# name: test-<<matrix.args>>
415+
# matrix:
416+
# parameters:
417+
# args:
418+
# - '-DargLine="-Duser.language=jp"'
419+
# - '-DargLine="-Duser.language=tr"'
420+
# test-jdk:
421+
# jobs:
422+
# - test:
423+
# name: test-<<matrix.jdk>>
424+
# matrix:
425+
# parameters:
426+
# jdk:
427+
# - 'j17'
428+
# - 'j21'
429429
test-jackson:
430430
jobs:
431431
- test:
@@ -435,12 +435,12 @@ workflows:
435435
args:
436436
- '-Dadb.jackson.version=2.17.1'
437437
- '-Dadb.jackson.version=2.16.2'
438-
- '-Dadb.jackson.version=2.15.4'
439-
- '-Dadb.jackson.version=2.14.3'
440-
- '-Dadb.jackson.version=2.13.5'
441-
- '-Dadb.jackson.version=2.12.7'
442-
- '-Dadb.jackson.version=2.11.4'
443-
- '-Dadb.jackson.version=2.10.5'
438+
# - '-Dadb.jackson.version=2.15.4'
439+
# - '-Dadb.jackson.version=2.14.3'
440+
# - '-Dadb.jackson.version=2.13.5'
441+
# - '-Dadb.jackson.version=2.12.7'
442+
# - '-Dadb.jackson.version=2.11.4'
443+
# - '-Dadb.jackson.version=2.10.5'
444444
test-ssl:
445445
jobs:
446446
- test:
@@ -489,7 +489,7 @@ workflows:
489489
matrix:
490490
parameters:
491491
graalvm-version:
492-
- '22.0.1-graalce'
492+
# - '22.0.1-graalce'
493493
- '21.0.2-graalce'
494494
project:
495495
- 'driver'
@@ -501,7 +501,7 @@ workflows:
501501
matrix:
502502
parameters:
503503
graalvm-version:
504-
- '22.0.1-graalce'
504+
# - '22.0.1-graalce'
505505
- '21.0.2-graalce'
506506
project:
507507
- 'driver'
@@ -518,7 +518,7 @@ workflows:
518518
matrix:
519519
parameters:
520520
graalvm-version:
521-
- '22.0.1-graalce'
521+
# - '22.0.1-graalce'
522522
- '21.0.2-graalce'
523523
project:
524524
- 'driver'

Diff for: core/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
6+
67
<parent>
8+
<relativePath>../release-parent</relativePath>
79
<groupId>com.arangodb</groupId>
8-
<artifactId>arangodb-java-driver-parent</artifactId>
10+
<artifactId>release-parent</artifactId>
911
<version>7.8.0-SNAPSHOT</version>
1012
</parent>
1113

@@ -14,7 +16,6 @@
1416
<description>Core module for ArangoDB Java Driver</description>
1517

1618
<properties>
17-
<maven.deploy.skip>false</maven.deploy.skip>
1819
<moduleName>com.arangodb.core</moduleName>
1920
</properties>
2021

Diff for: driver-test/pom.xml

+152
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<relativePath>../test-parent</relativePath>
9+
<groupId>com.arangodb</groupId>
10+
<artifactId>test-parent</artifactId>
11+
<version>7.8.0-SNAPSHOT</version>
12+
</parent>
13+
14+
<name>driver-test</name>
15+
<artifactId>driver-test</artifactId>
16+
<description>ArangoDB Java Driver Tests</description>
17+
18+
<properties>
19+
<SslTest>false</SslTest>
20+
<sonar.test.exclusions>src/test/**/*</sonar.test.exclusions>
21+
</properties>
22+
23+
<profiles>
24+
<profile>
25+
<id>static-code-analysis</id>
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<groupId>org.jacoco</groupId>
30+
<artifactId>jacoco-maven-plugin</artifactId>
31+
<version>0.8.9</version>
32+
<executions>
33+
<execution>
34+
<goals>
35+
<goal>prepare-agent</goal>
36+
</goals>
37+
</execution>
38+
<execution>
39+
<id>report</id>
40+
<phase>prepare-package</phase>
41+
<goals>
42+
<goal>report</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
</plugins>
48+
</build>
49+
</profile>
50+
<profile>
51+
<id>arch-test</id>
52+
<activation>
53+
<activeByDefault>true</activeByDefault>
54+
</activation>
55+
<dependencies>
56+
<dependency>
57+
<groupId>com.tngtech.archunit</groupId>
58+
<artifactId>archunit-junit5</artifactId>
59+
<scope>test</scope>
60+
</dependency>
61+
</dependencies>
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.codehaus.mojo</groupId>
66+
<artifactId>build-helper-maven-plugin</artifactId>
67+
<version>3.3.0</version>
68+
<executions>
69+
<execution>
70+
<phase>generate-test-sources</phase>
71+
<goals>
72+
<goal>add-test-source</goal>
73+
</goals>
74+
<configuration>
75+
<sources>
76+
<source>${project.basedir}/src/arch-test/java</source>
77+
</sources>
78+
</configuration>
79+
</execution>
80+
</executions>
81+
</plugin>
82+
</plugins>
83+
</build>
84+
</profile>
85+
</profiles>
86+
87+
<dependencies>
88+
<dependency>
89+
<groupId>com.arangodb</groupId>
90+
<artifactId>arangodb-java-driver</artifactId>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.arangodb</groupId>
95+
<artifactId>jackson-serde-vpack</artifactId>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.arangodb</groupId>
100+
<artifactId>vst-protocol</artifactId>
101+
<scope>test</scope>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.reflections</groupId>
105+
<artifactId>reflections</artifactId>
106+
<version>0.10.2</version>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.graalvm.sdk</groupId>
111+
<artifactId>graal-sdk</artifactId>
112+
<version>${graalvm.version}</version>
113+
<scope>test</scope>
114+
</dependency>
115+
<dependency>
116+
<groupId>org.graalvm.js</groupId>
117+
<artifactId>js-language</artifactId>
118+
<version>${graalvm.version}</version>
119+
<scope>test</scope>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.graalvm.polyglot</groupId>
123+
<artifactId>polyglot</artifactId>
124+
<version>${graalvm.version}</version>
125+
<scope>test</scope>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.graalvm.polyglot</groupId>
129+
<artifactId>js</artifactId>
130+
<version>${graalvm.version}</version>
131+
<type>pom</type>
132+
<scope>test</scope>
133+
<exclusions>
134+
<exclusion>
135+
<groupId>org.graalvm.truffle</groupId>
136+
<artifactId>truffle-runtime</artifactId>
137+
</exclusion>
138+
<exclusion>
139+
<groupId>org.graalvm.truffle</groupId>
140+
<artifactId>truffle-enterprise</artifactId>
141+
</exclusion>
142+
</exclusions>
143+
</dependency>
144+
<dependency>
145+
<groupId>io.smallrye.config</groupId>
146+
<artifactId>smallrye-config-core</artifactId>
147+
<version>2.13.3</version>
148+
<scope>test</scope>
149+
</dependency>
150+
</dependencies>
151+
152+
</project>

0 commit comments

Comments
 (0)