8000 [DE-833] restructure maven modules by rashtao · Pull Request #563 · arangodb/arangodb-java-driver · GitHub
[go: up one dir, main page]

Skip to content

[DE-833] restructure maven modules #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 64 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4ad335d
release-parent and test-parent modules
rashtao Jul 11, 2024
9ef4a16
wip
rashtao Jul 15, 2024
838481f
wip
rashtao Jul 15, 2024
93e962f
wip
rashtao Jul 15, 2024
76f087d
wip
rashtao Jul 15, 2024
0505ed4
wip
rashtao Jul 15, 2024
57dc135
wip
rashtao Jul 15, 2024
ad2ad47
wip
rashtao Jul 15, 2024
2bcd72a
wip
rashtao Jul 15, 2024
c5520d5
noTests profile
rashtao Jul 16, 2024
5808d75
resilience tests
rashtao Jul 16, 2024
18245f5
native tests
rashtao Jul 16, 2024
b9f6829
wip
rashtao Jul 16, 2024
a6bfa0b
wip
rashtao Jul 16, 2024
8bb047e
wip
rashtao Jul 16, 2024
cf86fd4
wip
rashtao Jul 16, 2024
cee7473
fix native tests
rashtao Jul 16, 2024
9afbaf8
shaded tests
rashtao Jul 17, 2024
ddc032c
shaded native tests
rashtao Jul 17, 2024
33bc37d
moved native tests helper
rashtao Jul 18, 2024
05d8c9a
tests-shaded classifier
rashtao Jul 18, 2024
4638fc8
non-functional-tests
rashtao Jul 18, 2024
2380a5e
shaded non-functional-tests
rashtao Jul 20, 2024
bb7ff9d
shaded non-functional-tests
rashtao Jul 20, 2024
caee21e
shaded test-ssl
rashtao Jul 20, 2024
6c 8000 00f4c
shaded test-ssl
rashtao Jul 20, 2024
6bc41ca
shaded resilience tests
rashtao Jul 20, 2024
b0017e3
shaded resilience tests
rashtao Jul 24, 2024
820c090
ssl resilience tests
rashtao Jul 24, 2024
df7b6a2
updated javadoc plugin
rashtao Jul 24, 2024
5f0c235
moved shaded profile to test-parent
rashtao Jul 24, 2024
3750b89
moved shaded profile to test-parent
rashtao Jul 24, 2024
7d1baa7
moved shaded profile to test-parent
rashtao Jul 24, 2024
a98b0ce
moved shaded profile to test-parent
rashtao Jul 24, 2024
f3ac169
moved shaded profile to test-parent
rashtao Jul 25, 2024
30f9e01
run non-functional tests with GraalVM
rashtao Jul 25, 2024
1c41a91
renamed resilience-tests module
rashtao Jul 25, 2024
3d693a9
removed test-functional-run module
rashtao Jul 25, 2024
d5ff5c1
removed test-native module
rashtao Jul 25, 2024
c955303
removed test-ssl module
rashtao Jul 25, 2024
7160147
CI: restructure
rashtao Jul 25, 2024
c2aa86d
moved plugins versions to parent
rashtao Jul 25, 2024
4af7325
CI: fix native tests
rashtao Jul 25, 2024
db4f13e
programmatic jwt tests
rashtao Jul 25, 2024
16c9fb6
maven build cache
rashtao Jul 25, 2024
87b2b0a
run tests with maven-failsafe-plugin
rashtao Jul 25, 2024
fa957b9
updated CI jobs
rashtao Jul 25, 2024
8ac1f77
removed noTests profile
rashtao Jul 25, 2024
d07d8a6
removed noTests profile
rashtao Jul 25, 2024
17a7015
fix native tests
rashtao Jul 25, 2024
09beba5
fix activefailover tests
rashtao Jul 26, 2024
a3c4c90
fix deploy
rashtao Jul 26, 2024
9bf3097
fix test config hosts
rashtao Jul 26, 2024
c14f367
re-enabled JsonBSerdeTest
rashtao Jul 26, 2024
7eec542
re-enabled shaded arch tests
rashtao Jul 26, 2024
2a82050
re-enabled slow tests
rashtao Jul 26, 2024
f3be939
test fixes
rashtao Jul 26, 2024
88e50a3
increased deploy timeout
rashtao Jul 26, 2024
b2c535f
CI: upd workflow filters
rashtao Jul 26, 2024
18ab8a5
CI: upd workflow filters
rashtao Jul 26, 2024
96c92a8
upd dev-README.md
rashtao Jul 26, 2024
80ad565
fixed build cache and JaCoCo
rashtao Jul 26, 2024
98e8039
re-enabled spotbugs
rashtao Jul 26, 2024
577ad7f
static-code-analysis profile
rashtao Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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>
&l 10000 t;/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>
10000 </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