Merge branch 'master' into release/spring-3.0

# Conflicts: # pom.xml
arangodb · Jan 16, 2024 · ea33b5b · ea33b5b
2 parents b861161 + 4a7a80a
commit ea33b5b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [3.1-2] - 2024.01.16
+
+- updated `arangodb-spring-data` to version `4.0.1`
+- fixed returning `com.arangodb.internal.InternalArangoDBBuilder` from public API (#25)
+
 ## [3.1-1] - 2023.09.21
 
 - re-enabled bean method proxies (#23)

diff --git a/docker/start_db.sh b/docker/start_db.sh
@@ -4,7 +4,7 @@
 #   STARTER_MODE:             (single|cluster|activefailover), default single
 #   DOCKER_IMAGE:             ArangoDB docker image, default docker.io/arangodb/arangodb:latest
 #   SSL:                      (true|false), default false
-#   DATABASE_EXTENDED_NAMES:  (true|false), default false
+#   EXTENDED_NAMES:  (true|false), default false
 #   ARANGO_LICENSE_KEY:       only required for ArangoDB Enterprise
 
 # EXAMPLE:
@@ -13,9 +13,11 @@
 STARTER_MODE=${STARTER_MODE:=single}
 DOCKER_IMAGE=${DOCKER_IMAGE:=docker.io/arangodb/arangodb:latest}
 SSL=${SSL:=false}
-DATABASE_EXTENDED_NAMES=${DATABASE_EXTENDED_NAMES:=false}
+EXTENDED_NAMES=${EXTENDED_NAMES:=false}
 
 STARTER_DOCKER_IMAGE=docker.io/arangodb/arangodb-starter:latest
+GW=172.28.0.1
+docker network create arangodb --subnet 172.28.0.0/16
 
 # exit when any command fails
 set -e
@@ -32,10 +34,10 @@ AUTHORIZATION_HEADER=$(cat "$LOCATION"/jwtHeader)
 STARTER_ARGS=
 SCHEME=http
 ARANGOSH_SCHEME=http+tcp
-COORDINATORS=("172.17.0.1:8529" "172.17.0.1:8539" "172.17.0.1:8549")
+COORDINATORS=("$GW:8529" "$GW:8539" "$GW:8549")
 
 if [ "$STARTER_MODE" == "single" ]; then
-  COORDINATORS=("172.17.0.1:8529")
+  COORDINATORS=("$GW:8529")
 fi
 
 if [ "$SSL" == "true" ]; then
@@ -44,8 +46,8 @@ if [ "$SSL" == "true" ]; then
     ARANGOSH_SCHEME=http+ssl
 fi
 
-if [ "$DATABASE_EXTENDED_NAMES" == "true" ]; then
-    STARTER_ARGS="${STARTER_ARGS} --all.database.extended-names-databases=true"
+if [ "$EXTENDED_NAMES" == "true" ]; then
+    STARTER_ARGS="${STARTER_ARGS} --all.database.extended-names=true"
 fi
 
 if [ "$USE_MOUNTED_DATA" == "true" ]; then
@@ -66,9 +68,10 @@ docker run -d \
     $STARTER_ARGS \
     --docker.container=adb \
     --auth.jwt-secret=/jwtSecret \
-    --starter.address=172.17.0.1 \
+    --starter.address="${GW}" \
     --docker.image="${DOCKER_IMAGE}" \
-    --starter.local --starter.mode=${STARTER_MODE} --all.log.level=debug --all.log.output=+ --log.verbose
+    --starter.local --starter.mode=${STARTER_MODE} --all.log.level=debug --all.log.output=+ --log.verbose \
+    --all.server.descriptors-minimum=1024 --all.javascript.allow-admin-execute=true
 
 
 wait_server() {
@@ -87,12 +90,15 @@ done
 
 set +e
 for a in ${COORDINATORS[*]} ; do
+    echo ""
+    echo "Setting username and password..."
     docker run --rm ${DOCKER_IMAGE} arangosh --server.endpoint="$ARANGOSH_SCHEME://$a" --server.authentication=false --javascript.execute-string='require("org/arangodb/users").update("root", "test")'
 done
 set -e
 
 for a in ${COORDINATORS[*]} ; do
     echo ""
+    echo "Requesting endpoint version..."
     curl -u root:test --insecure --fail "$SCHEME://$a/_api/version"
 done
 

diff --git a/docs/Drivers/SpringBootStarter/GettingStarted/README.md b/docs/Drivers/SpringBootStarter/GettingStarted/README.md
@@ -6,13 +6,14 @@ Spring Boot Starter ArangoDB is compatible with all supported stable versions of
 [Product Support End-of-life Announcements](https://www.arangodb.com/eol-notice){:target="_blank"}.
 
 
-It is released in the following versions, each one compatible with the corresponding Spring Boot version:
-
-| Spring Boot Starter ArangoDB | Spring Boot |
-|------------------------------|-------------|
-| 3.1-x                        | 3.1.*       |
-| 3.0-x                        | 3.0.*       |
-| 2.7-x                        | 2.7.*       |
+It is released in the following versions, each one compatible with the corresponding versions of Spring Boot, 
+Spring Framework, Spring Data ArangoDB, ArangoDB Java Driver:
+
+| Spring Boot Starter ArangoDB | Spring Boot | Spring Framework | Spring Data ArangoDB | ArangoDB Java Driver |
+|------------------------------|-------------|------------------|----------------------|----------------------|
+| 3.1-x                        | 3.1         | 6.0              | 4.0                  | 7.1                  |
+| 3.0-x                        | 3.0         | 6.0              | 4.0                  | 7.1                  |
+| 2.7-x                        | 2.7         | 5.3              | 3.10                 | 6.25                 |
 
 
 Note that the adopted versioning scheme does not honour the semantic versioning rules, indeed minor or patch

diff --git a/pom.xml b/pom.xml
@@ -265,7 +265,7 @@
             <dependency>
                 <groupId>com.arangodb</groupId>
                 <artifactId>arangodb-spring-data</artifactId>
-                <version>4.0.0</version>
+                <version>4.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>