Skip to content

Commit

Permalink
[DE-833] restructure maven modules (#563)
Browse files Browse the repository at this point in the history
  • Loading branch information
rashtao authored Jul 26, 2024
1 parent 0619462 commit b163770
Show file tree
Hide file tree
Showing 221 changed files with 1,685 additions and 2,013 deletions.
353 changes: 151 additions & 202 deletions .circleci/config.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ target

test-results-native
.flattened-pom.xml
/resilience-tests/bin/toxiproxy-server-linux-amd64
/test-resilience/bin/toxiproxy-server-linux-amd64

dependency-reduced-pom.xml
/bin/
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.2.0</version>
</extension>
</extensions>
32 changes: 32 additions & 0 deletions .mvn/maven-build-cache-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0 https://maven.apache.org/xsd/build-cache-config-1.2.0.xsd">

<input>
<global>
<excludes>
<exclude>.flattened-pom.xml</exclude>
<exclude>dependency-reduced-pom.xml</exclude>
</excludes>
</global>
</input>

<executionControl>
<runAlways>
<plugins>
<plugin groupId="org.apache.maven.plugins" artifactId="maven-failsafe-plugin"/>
<plugin groupId="org.jacoco" artifactId="jacoco-maven-plugin"/>
</plugins>
</runAlways>
</executionControl>

<configuration>
<attachedOutputs>
<dirNames>
<dirName>classes</dirName>
</dirNames>
</attachedOutputs>
</configuration>

</cache>
28 changes: 4 additions & 24 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../release-parent</relativePath>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver-parent</artifactId>
<artifactId>release-parent</artifactId>
<version>7.8.0-SNAPSHOT</version>
</parent>

Expand All @@ -14,8 +16,8 @@
<description>Core module for ArangoDB Java Driver</description>

<properties>
<maven.deploy.skip>false</maven.deploy.skip>
<moduleName>com.arangodb.core</moduleName>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>

<dependencies>
Expand Down Expand Up @@ -51,7 +53,6 @@
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -75,7 +76,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -90,26 +90,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<excludePackageNames>
com.arangodb.internal,
com.arangodb.internal.*
</excludePackageNames>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
71 changes: 8 additions & 63 deletions dev-README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# dev-README


## Start DB
Single:
```
Expand All @@ -10,84 +9,30 @@ Cluster:
```
STARTER_MODE=cluster ./docker/start_db.sh
```
Active Failover:
```
STARTER_MODE=activefailover ./docker/start_db.sh
```


## GH Actions
Check results [here](https://github.com/arangodb/arangodb-java-driver/actions).


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


## check dependencies updates
```shell
mvn versions:display-dependency-updates
mvn versions:display-plugin-updates
```


## Code Analysis
Analyze (Spotbugs and JaCoCo):
```
mvn prepare-package -Pstatic-code-analysis
mvn -Dgpg.skip=true -Dmaven.javadoc.skip=true -am -pl test-functional verify
mvn -Dgpg.skip=true -Dmaven.javadoc.skip=true -Dmaven.test.skip verify
```
Report: [link](driver/target/site/jacoco/index.html)

Reports:
- [core](core/target/site/jacoco/index.html)
- [jackson-serde-json](jackson-serde-json/target/site/jacoco/index.html)
- [jackson-serde-vpack](jackson-serde-vpack/target/site/jacoco/index.html)
- [http-protocol](http-protocol/target/site/jacoco/index.html)
- [vst-protocol](vst-protocol/target/site/jacoco/index.html)

## update native image reflection configuration

To generate reflection configuration run [NativeImageHelper](./driver/src/test/java/helper/NativeImageHelper.java) and
copy the generated json to
[reflect-config.json](./driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config.json).


## test
```shell
mvn test
```


## test native
```shell
mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
cd driver
mvn -Pnative -P'!arch-test' test
```


## test native shaded
```shell
mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
cd integration-tests
mvn -Pnative -P'!arch-test' test
```


## test ssl
```shell
mvn test -Dsurefire.failIfNoSpecifiedTests=false -Dtest=com.arangodb.ArangoSslTest -DSslTest=true
```


## integration tests
```shell
mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
cd integration-tests
mvn -Pinternal-serde test
mvn -Pjackson-serde test
mvn -Pjsonb-serde test
mvn -Pplain test
```


## resilience tests
```shell
mvn install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
cd resilience-tests
mvn test
```
Loading

0 comments on commit b163770

Please sign in to comment.