Skip to content

Commit b163770

Browse files
rashtaorashtao
authored
[DE-833] restructure maven modules (#563)
1 parent 0619462 commit b163770

File tree

221 files changed

+1685
-2013
lines changed

Some content is hidden

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

221 files changed

+1685
-2013
lines changed

‎.circleci/config.yml‎

Lines changed: 151 additions & 202 deletions
Large diffs are not rendered by default.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target
88

99
test-results-native
1010
.flattened-pom.xml
11-
/resilience-tests/bin/toxiproxy-server-linux-amd64
11+
/test-resilience/bin/toxiproxy-server-linux-amd64
1212

1313
dependency-reduced-pom.xml
1414
/bin/

‎.mvn/extensions.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<extensions>
3+
<extension>
4+
<groupId>org.apache.maven.extensions</groupId>
5+
<artifactId>maven-build-cache-extension</artifactId>
6+
<version>1.2.0</version>
7+
</extension>
8+
</extensions>

‎.mvn/maven-build-cache-config.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0 https://maven.apache.org/xsd/build-cache-config-1.2.0.xsd">
5+
6+
<input>
7+
<global>
8+
<excludes>
9+
<exclude>.flattened-pom.xml</exclude>
10+
<exclude>dependency-reduced-pom.xml</exclude>
11+
</excludes>
12+
</global>
13+
</input>
14+
15+
<executionControl>
16+
<runAlways>
17+
<plugins>
18+
<plugin groupId="org.apache.maven.plugins" artifactId="maven-failsafe-plugin"/>
19+
<plugin groupId="org.jacoco" artifactId="jacoco-maven-plugin"/>
20+
</plugins>
21+
</runAlways>
22+
</executionControl>
23+
24+
<configuration>
25+
<attachedOutputs>
26+
<dirNames>
27+
<dirName>classes</dirName>
28+
</dirNames>
29+
</attachedOutputs>
30+
</configuration>
31+
32+
</cache>

‎core/pom.xml‎

Lines changed: 4 additions & 24 deletions
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,8 +16,8 @@
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>
20+
<maven.deploy.skip>false</maven.deploy.skip>
1921
</properties>
2022

2123
<dependencies>
@@ -51,7 +53,6 @@
5153
<plugin>
5254
<groupId>com.google.code.maven-replacer-plugin</groupId>
5355
<artifactId>replacer</artifactId>
54-
<version>1.5.3</version>
5556
<executions>
5657
<execution>
5758
<phase>generate-sources</phase>
@@ -75,7 +76,6 @@
7576
<plugin>
7677
<groupId>org.codehaus.mojo</groupId>
7778
<artifactId>build-helper-maven-plugin</artifactId>
78-
<version>3.3.0</version>
7979
<executions>
8080
<execution>
8181
<phase>generate-sources</phase>
@@ -90,26 +90,6 @@
9090
</execution>
9191
</executions>
9292
</plugin>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-javadoc-plugin</artifactId>
96-
<version>3.5.0</version>
97-
<executions>
98-
<execution>
99-
<id>attach-javadocs</id>
100-
<goals>
101-
<goal>jar</goal>
102-
</goals>
103-
<configuration>
104-
<excludePackageNames>
105-
com.arangodb.internal,
106-
com.arangodb.internal.*
107-
</excludePackageNames>
108-
<doclint>none</doclint>
109-
</configuration>
110-
</execution>
111-
</executions>
112-
</plugin>
11393
</plugins>
11494
</build>
11595

‎dev-README.md‎

Lines changed: 8 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# dev-README
22

3-
43
## Start DB
54
Single:
65
```
@@ -10,84 +9,30 @@ Cluster:
109
```
1110
STARTER_MODE=cluster ./docker/start_db.sh
1211
```
13-
Active Failover:
14-
```
15-
STARTER_MODE=activefailover ./docker/start_db.sh
16-
```
17-
18-
19-
## GH Actions
20-
Check results [here](https://github.com/arangodb/arangodb-java-driver/actions).
21-
2212

2313
## SonarCloud
2414
Check results [here](https://sonarcloud.io/project/overview?id=arangodb_arangodb-java-driver).
2515

26-
2716
## check dependencies updates
2817
```shell
2918
mvn versions:display-dependency-updates
3019
mvn versions:display-plugin-updates
3120
```
3221

33-
3422
## Code Analysis
3523
Analyze (Spotbugs and JaCoCo):
3624
```
37-
mvn prepare-package -Pstatic-code-analysis
25+
mvn -Dgpg.skip=true -Dmaven.javadoc.skip=true -am -pl test-functional verify
26+
mvn -Dgpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.skip verify
3827
```
39-
Report: [link](driver/target/site/jacoco/index.html)
40-
28+
Reports:
29+
- [core](core/target/site/jacoco/index.html)
30+
- [jackson-serde-json](jackson-serde-json/target/site/jacoco/index.html)
31+
- [jackson-serde-vpack](jackson-serde-vpack/target/site/jacoco/index.html)
32+
- [http-protocol](http-protocol/target/site/jacoco/index.html)
33+
- [vst-protocol](vst-protocol/target/site/jacoco/index.html)
4134

4235
## update native image reflection configuration
43-
4436
To generate reflection configuration run [NativeImageHelper](./driver/src/test/java/helper/NativeImageHelper.java) and
4537
copy the generated json to
4638
[reflect-config.json](./driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config.json).
47-
48-
49-
## test
50-
```shell
51-
mvn test
52-
```
53-
54-
55-
## test native
56-
```shell
57-
mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
58-
cd driver
59-
mvn -Pnative -P'!arch-test' test
60-
```
61-
62-
63-
## test native shaded
64-
```shell
65-
mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
66-
cd integration-tests
67-
mvn -Pnative -P'!arch-test' test
68-
```
69-
70-
71-
## test ssl
72-
```shell
73-
mvn test -Dsurefire.failIfNoSpecifiedTests=false -Dtest=com.arangodb.ArangoSslTest -DSslTest=true
74-
```
75-
76-
77-
## integration tests
78-
```shell
79-
mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
80-
cd integration-tests
81-
mvn -Pinternal-serde test
82-
mvn -Pjackson-serde test
83-
mvn -Pjsonb-serde test
84-
mvn -Pplain test
85-
```
86-
87-
88-
## resilience tests
89-
```shell
90-
mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
91-
cd resilience-tests
92-
mvn test
93-
```

0 commit comments

Comments
 (0)