Skip to content
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

update tests to reflect changes to change password message #341

Open
wants to merge 539 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
539 commits
Select commit Hold shift + click to select a range
22ee74a
Merge pull request #192 from neo4j/set-configs-based-on-edition
bfeshti Sep 12, 2019
838c023
rebased on master
jennyowen Sep 12, 2019
8a4b3cc
env NEO4J_dbms_directories_logs was being overwritten by folder writa…
jennyowen Sep 12, 2019
d1a0b1d
Changed unsupported.dbms.udc.source to docker
Sep 13, 2019
49031c2
Merge pull request #195 from neo4j/change-unsupported.dbms.udc.source…
bfeshti Sep 13, 2019
fcdfdf0
neo4jlabs-plugins.json was been included in local docker image build …
jennyowen Sep 25, 2019
d0e1a25
Merge pull request #196 from neo4j/fix-makefile
jennyowen Sep 25, 2019
fbb40ee
changing the versions.json urls to use github.io (github pages) urls
eastlondoner Sep 27, 2019
8f8924a
improved Neo4j version parser and muted PluginInstallation test when …
jennyowen Oct 2, 2019
5dcf7ee
removed all reference to environment variable NEO4J_VERSION in favour…
jennyowen Oct 3, 2019
694f925
makefile now creates devenv file
jennyowen Oct 3, 2019
1c1df2d
Tried to improve container closing so that tests don't leave so many …
jennyowen Oct 4, 2019
06048d0
Merge pull request #197 from eastlondoner/master
eastlondoner Oct 4, 2019
f8178db
disabled plugin test for 4.0
jennyowen Oct 7, 2019
488b0fb
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Oct 7, 2019
c08fb1c
improved development instructions
jennyowen Oct 7, 2019
c4d848e
updated main readme
jennyowen Oct 7, 2019
b4c0b36
merged public repository into private
jennyowen Oct 30, 2019
93935cc
patched changes to 3.5 entrypoint onto 3.6 entrypoint
jennyowen Oct 30, 2019
1c64629
added `require-password-change` flag to `set-initial-password`
jennyowen Oct 31, 2019
bb60e76
fixed weird inconsistencies between docker entrypoints
jennyowen Nov 1, 2019
9044dc4
Rename tx-logs to transactions
klaren Nov 1, 2019
5fad554
tx-logs folder was renamed
jennyowen Nov 5, 2019
c375ea1
removed some unused test conf files
jennyowen Nov 8, 2019
2996846
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Nov 8, 2019
5b71dfd
fixed jvm.additional overriden by docker-entrypoint
Nov 15, 2019
10014c4
removed old jvm.additional overriding config
Nov 15, 2019
6d9e8f2
updated set intitial password to new requires password reset argument…
jennyowen Nov 21, 2019
5c8cb8a
Merge branch 'master' of github.com:neo4j/docker-neo4j into mergepubl…
jennyowen Nov 21, 2019
09bc490
edited pom to make it easier to switch between java 8 and 11
jennyowen Nov 21, 2019
57f0ed2
enabled require-password-reset feature in 4.0
jennyowen Nov 21, 2019
7e95b5c
removing private files
jennyowen Nov 22, 2019
8de0b0a
Reverted previous changes and added a more reliable way to fix jvm.ad…
Nov 25, 2019
1e47370
fixed indentation and added some helpful comments
Nov 25, 2019
bc476cb
Merge pull request #205 from neo4j/fix-jvm.additional-not-overriden
bfeshti Nov 25, 2019
154b9d2
Added 4.1 docker-image-src
Nov 25, 2019
54d1bd4
Merge pull request #209 from neo4j/add-4.1-docker-image-src
bfeshti Nov 25, 2019
f40b214
refactored to use try with resources to clean up containers
jennyowen Nov 25, 2019
f58bf3a
refactored new test to use try with resources
jennyowen Nov 25, 2019
3efe2f1
increased timeouts and cleaned some obsolete imports
jennyowen Nov 26, 2019
ee631e7
given mounted folders more descriptive names
jennyowen Dec 2, 2019
476bbd9
fixed upgrade from before file permissions in 3.5 fix and added tests.
jennyowen Dec 3, 2019
817d59d
patched 3.5 changes to other docker entrypoints
jennyowen Dec 4, 2019
110bc9c
ignore upgrade test in 4.0 until I can close the old version containe…
jennyowen Dec 4, 2019
9dc76dd
fixed annoying stderr warnings for 4.0
jennyowen Dec 4, 2019
6197aa3
patched 4.0 fixes to 4.1
jennyowen Dec 4, 2019
d8f74ae
Replaced curl with wget in the entryoint
Dec 10, 2019
b7dad0f
Merge branch 'master' into fix-curl-vulnerability
Dec 10, 2019
e50093a
Final touch of replacing curl
Dec 10, 2019
e35ddb8
Merge pull request #216 from neo4j/fix-curl-vulnerability
bfeshti Dec 10, 2019
de6d73a
add seperate build targets for community and enterprise
Dec 10, 2019
8903096
add neo4j community bintray repository to pom so that neo4j java depe…
Dec 10, 2019
a9e4153
allow setting an env var to skip the plugin test if it causes problems
Dec 10, 2019
c75b2b2
Merge pull request #206 from eastlondoner/run-plugins-tests
eastlondoner Dec 11, 2019
8aac9d0
add the ability to easily run a particular junit test or tests matchi…
Dec 11, 2019
05e39e8
tidying up java test code
Dec 11, 2019
946059d
apply default configurations for plugins when installing a plugin (if…
Dec 11, 2019
a5fd50a
Improve handling of NEO4J_ config setting env variables
Dec 12, 2019
b5a0164
Merge pull request #217 from eastlondoner/configure-plugins-automatic…
eastlondoner Dec 12, 2019
ce9a7e9
use the latest neo4j driver
Dec 11, 2019
1905283
Merge pull request #220 from eastlondoner/tidying
eastlondoner Dec 12, 2019
53076ab
Merge pull request #218 from eastlondoner/make-individual-test
eastlondoner Dec 12, 2019
deed771
Merge pull request #219 from eastlondoner/use-latest-neo4j-driver
eastlondoner Dec 12, 2019
96797c6
Merge pull request #221 from eastlondoner/improve-config-handling
eastlondoner Dec 12, 2019
707b9cb
unset NEO4J_AUTH was setting no password rather than default password…
jennyowen Jan 22, 2020
53ba5c5
Update neo4jlabs-plugins.json
jbarrasa Jan 30, 2020
b192927
Update neo4jlabs-plugins.json
jbarrasa Feb 4, 2020
5ac55f4
Merge pull request #227 from jbarrasa/master
eastlondoner Feb 4, 2020
a9c12d5
updated test dependencies in pom
jennyowen Mar 2, 2020
47075e1
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Mar 2, 2020
05ec38e
Revert "updated test dependencies in pom"
jennyowen Mar 2, 2020
9e86faa
updated pom dependendies
jennyowen Mar 3, 2020
ddcda66
removed udc.source from 4.0.x
Mar 4, 2020
ce5cb12
Fixed a typo
Mar 4, 2020
cf4063d
Moved assumption on top of the test
Mar 5, 2020
7e6d4b6
Merge pull request #234 from neo4j/Remove_udc.source_from_4.0.x
bfeshti Mar 5, 2020
8714fbc
removed user=root flag from chmod of home folder
jennyowen Mar 9, 2020
f8783c5
Merge branch 'master' into confpermissions
jennyowen Mar 9, 2020
27ddc04
added link to Neo4j Community
jennyowen Mar 16, 2020
057ecf5
updated support guidance on README
jennyowen Mar 16, 2020
8eb77c9
changed listen address overrides because they seem unnecessary and ma…
jennyowen Mar 25, 2020
3dcdf60
patched changes to 4.0 conf overrides to 4.1
jennyowen Mar 25, 2020
28191a4
refactored code after review from hugo, patched changes back to 3.4.
jennyowen Apr 1, 2020
eba50a9
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Apr 1, 2020
20e64f4
fixed issue #243
jennyowen Apr 15, 2020
4edbfb1
adding graph-data-science to NEO4JLABS_PLUGINS
Apr 16, 2020
663161f
Merge pull request #245 from eastlondoner/gds-plugin
eastlondoner Apr 17, 2020
52c2c74
TestMounting was incorrectly passing some data mounting tests, fixed.
jennyowen May 6, 2020
baec1f1
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen May 6, 2020
d5c97b6
improved readwrite checks on mounted folders
jennyowen May 21, 2020
bdf86b5
copied new docker source files for 4.2
jennyowen Jun 2, 2020
b0acb4f
moved set password command to after configuration to fix a bug in aura
jennyowen Jun 3, 2020
4c002cf
explicitly set neo4j uid and gid to 7474
jennyowen Jun 9, 2020
03bc788
Revert "explicitly set neo4j uid and gid to 7474"
jennyowen Jun 15, 2020
b65ad72
Revert "Revert "explicitly set neo4j uid and gid to 7474""
jennyowen Jun 16, 2020
994bf19
started test for database dump
jennyowen Mar 12, 2020
b09dd44
made tests that mount 2 or more folders keep the temp folders togethe…
jennyowen Mar 12, 2020
3d75707
added some notes to dump load test
jennyowen Mar 13, 2020
9e5927a
added host FS operation to create test folder under TEST_TMP_FOLDER w…
jennyowen Jun 16, 2020
3f8cc0a
removed dump and load test
jennyowen Jun 16, 2020
3d059c5
Merge branch 'hardcode-uid-gid'
jennyowen Jun 18, 2020
fb989d6
fixed authentication bug in 4.1
jennyowen Jun 26, 2020
c1d4889
fixed authentication bug in 4.1
jennyowen Jun 26, 2020
981c878
refactored make files to create arm64 build
jennyowen Jul 7, 2020
d9aefd7
patched Dockerfile changes to 4.1 and 4.2
jennyowen Jul 8, 2020
fe410ec
Merge branch 'arm-support'
jennyowen Jul 8, 2020
6f5d362
added back packaging make targets to copy release image to output folder
jennyowen Jul 8, 2020
94ed955
added readme section about arm64 images
jennyowen Jul 16, 2020
cc64a60
Update README.md
jennyowen Jul 16, 2020
e3e06a8
fixed package-arm make target
jennyowen Jul 20, 2020
c364cc2
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Jul 20, 2020
04d5df6
proper tagging of packages arm64 build
jennyowen Jul 21, 2020
19667f3
added test for mounting named volume
jennyowen Jul 22, 2020
15355fb
refactored named volume code
jennyowen Jul 23, 2020
896ac82
NamedVolume didn't work if you mounted 2 volumes, it only mounts the …
jennyowen Jul 28, 2020
28a1fbf
added more upgrade tests and mounting tests for named volumes
jennyowen Jul 30, 2020
618ea23
patched docker entrypoint fixes to 4.1 and 4.2
jennyowen Jul 30, 2020
41393ff
patched docker entrypoint fixes to 4.1 and 4.2
jennyowen Jul 30, 2020
770e297
Merge branch 'namedvolumes' of github.com:neo4j/docker-neo4j into nam…
jennyowen Jul 30, 2020
b5f5106
patched permissions checks to 3.5 docker entrypoint
jennyowen Jul 30, 2020
f431f75
fixed patching error in entrypoint scripts
jennyowen Aug 6, 2020
72d5f72
now chown neo4j.conf
jennyowen Sep 15, 2020
e7aba0e
patched neo4j.conf ownership change to 4.0 and 4.2
jennyowen Sep 15, 2020
638e560
changed startup check strategy to try and fix flakiness in configurat…
jennyowen Oct 15, 2020
7afa379
fixed licensing test
jennyowen Oct 16, 2020
9ae6fe0
enabled extended configuration setting and added basic unit tests
jennyowen Oct 23, 2020
afd988a
changed extended conf test to use setting in community and enterprise
jennyowen Oct 23, 2020
0ff5625
created new docker source for 4.3
jennyowen Oct 26, 2020
4e826ad
Relaxed expectation on config log print
Roxling Oct 29, 2020
20792cf
Merge pull request #279 from Roxling/relaxed-config-log
Roxling Oct 29, 2020
b202339
bump testcontainers version
Dec 14, 2020
5ec4a6b
Merge pull request #282 from eastlondoner/update-test-containers
eastlondoner Dec 14, 2020
74fbfe2
add Bloom plugin
GlacialBoy Jan 18, 2021
30302c0
add Bloom plugin
GlacialBoy Jan 18, 2021
3d42514
check read permission for licenses folder
GlacialBoy Jan 18, 2021
49fe2ad
Merge pull request #283 from neo4j/cla/addbloomplugin
GlacialBoy Jan 19, 2021
4148271
fixed ARM64 build script
jennyowen Feb 8, 2021
1d29325
dbms.routing.advertised_address default added for 4.3
jennyowen Feb 5, 2021
771e700
Merge branch 'new-default-confs'
jennyowen Feb 9, 2021
b2b7720
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Feb 9, 2021
17e6c7e
added instructions for building arm images
jennyowen Feb 18, 2021
8fb9a8d
removed old unused repo from pom
jennyowen Apr 27, 2021
5877dcb
add --expand-commands flag to neo4j-admin commands (#294)
eastlondoner May 20, 2021
315b333
temporarily revert tests for command expansion bugs because those bug…
eastlondoner May 20, 2021
340f758
added new 4.4 folder
glindroth May 24, 2021
b3f3a26
use new 'neo4j dry-run' mechanism to start neo4j process in 4.3 (#295)
eastlondoner Jun 2, 2021
e0c2d43
Revert "use new 'neo4j dry-run' mechanism to start neo4j process in 4…
glindroth Jun 3, 2021
a518e2d
Revert "Revert "use new 'neo4j dry-run' mechanism to start neo4j proc…
glindroth Jun 4, 2021
b774b69
updated 4.2 to stop overwriting enterprise configuration settings
jennyowen Jun 9, 2021
a3f89af
patched 4.2 entrypoint changes to other branches
jennyowen Jun 9, 2021
a5f3d5b
updated 4.4 entrypoint to have latest 4.3 changes
jennyowen Jun 9, 2021
6ff1612
patched 3.5 entrypoint to fix configuration overrides. Updated licens…
jennyowen Jun 9, 2021
7986a74
fixed conf test failure in 4.3+
jennyowen Jun 9, 2021
8170386
added apoc-core
renetapopova Jul 9, 2021
f9b6989
fix
renetapopova Jul 9, 2021
468b450
defined install plugin from location
renetapopova Jul 9, 2021
abe0989
reworked my PR
renetapopova Jul 13, 2021
57630ba
fixes the json
renetapopova Jul 13, 2021
7318b01
fixed the unbound parameter
renetapopova Jul 13, 2021
1f085d1
fixed the location in json
renetapopova Jul 13, 2021
f2eed34
another fix in json
renetapopova Jul 13, 2021
e8cb7cb
test bundled plugins
Jul 19, 2021
cf342b2
fix bash string check
Jul 19, 2021
cb00f07
tweak bash
Jul 19, 2021
b8c827c
what I should have done
Jul 19, 2021
be421c1
add debug output to test
Jul 19, 2021
cd24506
apoc versioning not as expected
Jul 19, 2021
daad125
Merge pull request #302 from renetapopova/apoc-core
renetapopova Jul 20, 2021
857a388
added makefile target for testing arm images
jennyowen Sep 13, 2021
f088026
updated makefile to tag arm images with `neo4j` rather than experimen…
jennyowen Sep 17, 2021
66b8bec
fixed race condition in extended conf test
jennyowen Sep 20, 2021
e5c2e8f
new make targets for arm releasing
jennyowen Sep 20, 2021
86d6b6e
Merge branch 'arm-support'
jennyowen Sep 20, 2021
207ff0a
updated TestContainers dependencies to get ARM support
jennyowen Sep 21, 2021
2041181
Make targets for neo4j-admin image
jennyowen Oct 19, 2021
ef47c5a
refactored test folders
jennyowen Oct 19, 2021
05f88fd
fix: upgrade org.slf4j:slf4j-api from 1.7.30 to 1.7.32
snyk-bot Oct 20, 2021
c7296af
fix: upgrade org.slf4j:slf4j-log4j12 from 1.7.30 to 1.7.32
snyk-bot Oct 20, 2021
b8612b8
Merge pull request #308 from neo4j/snyk-upgrade-87d83deb096cad2c92e72…
jennyowen Oct 20, 2021
115d757
Merge pull request #309 from neo4j/snyk-upgrade-4429ab96f6cde5176882e…
jennyowen Oct 20, 2021
8642791
some initial tests for neo4j-admin image
jennyowen Oct 21, 2021
e5de058
dump load tests for non-default user
jennyowen Oct 21, 2021
1d48def
authetication and multiuser tests for dump/load
jennyowen Oct 21, 2021
daf16d9
backup and restore test, refactored database IO helper
jennyowen Oct 22, 2021
e30f423
ensure admin image doesn't run neo4j server
jennyowen Oct 22, 2021
c647d02
copied neo4j-admin source to other neo4j versions
jennyowen Oct 22, 2021
9c58288
added mvn test parameters for neo4j-admin image
jennyowen Oct 22, 2021
ac7145b
database io refactors broke upgrade tests, fixed
jennyowen Oct 22, 2021
f168f61
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Oct 22, 2021
5fbb6d0
fix: upgrade org.slf4j:slf4j-api from 1.7.30 to 1.7.32
snyk-bot Oct 20, 2021
c00b941
fix: upgrade org.slf4j:slf4j-log4j12 from 1.7.30 to 1.7.32
snyk-bot Oct 20, 2021
0d0a1d6
added maven options to make test targets. Deleted unused HA test
jennyowen Oct 27, 2021
81a2edb
added new source for 5.0 branch
jennyowen Nov 1, 2021
8f0321f
teardown method to delete mount folders after unit test
jennyowen Nov 3, 2021
f6a6d8b
Merge branch 'betterTeardown'
jennyowen Nov 3, 2021
cb3f98a
testDumpLoad was running before 4.4.0 for some reason, hopefully fixed
jennyowen Nov 4, 2021
fcfcf10
Revert "testDumpLoad was running before 4.4.0 for some reason, hopefu…
jennyowen Nov 4, 2021
e241b4c
Revert "Merge branch 'betterTeardown'"
jennyowen Nov 4, 2021
d9eb296
fixed broken default_listen_address config in 3.5
jennyowen Nov 8, 2021
aa2002d
fixed typo
jennyowen Nov 8, 2021
79985e3
Change pagecache size debug log output assertion due to type change
tinwelint Nov 19, 2021
7f4dcf5
Temporary disable upgrade tests since upgrade is under update for 5.0…
MishaDemianenko Nov 19, 2021
bdf9a9e
Merge pull request #317 from MishaDemianenko/temp-disable-upgrade
MishaDemianenko Nov 19, 2021
34cd62c
Merge pull request #316 from neo4j/page-cache-mem-type-change
tinwelint Nov 22, 2021
7b86c36
Add podman how to for systems that lack docker support
MishaDemianenko Dec 1, 2021
530a6ab
Merge pull request #319 from MishaDemianenko/5.0-podman-howto
MishaDemianenko Dec 2, 2021
5c75539
creating releasable out folder for admin image
jennyowen Dec 2, 2021
e68c297
Merge branch 'master' of github.com:neo4j/docker-neo4j
jennyowen Dec 2, 2021
85a9baa
Temporary disable upgrade tests since upgrade is under update for 5.0…
MishaDemianenko Nov 19, 2021
d2ad9f2
Change pagecache size debug log output assertion due to type change
tinwelint Nov 19, 2021
9b93f75
Add podman how to for systems that lack docker support
MishaDemianenko Dec 1, 2021
8a8c4dc
makefiles now compliant with docker requirements for arm images
jennyowen Dec 3, 2021
9e86b73
makefiles now compliant with docker requirements for arm images
jennyowen Dec 3, 2021
d71738a
Merge branch 'fix-arm-dockerfiles' of github.com:neo4j/docker-neo4j i…
jennyowen Dec 3, 2021
ed5e620
in Dockerfiles combined both RUN commands to one for 4.4 and 5.0
jennyowen Dec 5, 2021
d711d2d
install tini through apt rather htan direct from github
jennyowen Dec 8, 2021
cb52cf8
Revert "install tini through apt rather htan direct from github"
glindroth Dec 16, 2021
9e12322
dump config can now write to conf folder even when running as default…
jennyowen Jan 6, 2022
b9fc888
patched source changes to 4.1 4.2 4.3 and 5.0
jennyowen Jan 6, 2022
13605d5
test to ensure dumped file has correct user when not run as root
jennyowen Jan 6, 2022
6afa0af
Revert "Revert "install tini through apt rather htan direct from gith…
jennyowen Jan 10, 2022
1fb7597
fixed tini install in versions 4.3 and earlier
jennyowen Jan 10, 2022
b058ada
add semantic version comparison
GlacialBoy Jan 11, 2022
3a2061e
fixed typo in 3.5 dockerfile
jennyowen Jan 12, 2022
51cc80d
fixed dump-config permissions for 3.5
jennyowen Jan 14, 2022
1272e67
Merge pull request #329 from neo4j/better-tini
jennyowen Jan 21, 2022
5e9bb21
add semantic version comparison
GlacialBoy Jan 11, 2022
8489c00
semver feature is working in 4.4
jennyowen Jan 17, 2022
ffe2799
added test for semantic versioning in neo4jlabs_plugins feature
jennyowen Jan 19, 2022
cd340c9
added semantic version plugin matching tests
jennyowen Jan 20, 2022
abcd3b1
created common source folder so I only need to maintain one copy of s…
jennyowen Jan 21, 2022
62a7bcc
fixed merge error
jennyowen Jan 21, 2022
c9de29a
merging claudio's original pr
jennyowen Jan 21, 2022
24241ad
patched 4.4 changes to other branches
jennyowen Jan 21, 2022
5af9d5d
fixed java syntax
jennyowen Jan 21, 2022
c046055
attempt to fix intermittent fail of backup-restore test
jennyowen Jan 26, 2022
550cb7d
corrected failing secure-mode test
jennyowen Jan 26, 2022
95963b7
patched entrypoint fix to all other neo4j versions
jennyowen Jan 26, 2022
078e445
plugin tests now use standard temp directory rather than somewhere on…
jennyowen Jan 27, 2022
5bc5417
ignoring plugin tests on arm machines due to possible testcontainersbug
jennyowen Jan 28, 2022
87c890c
Dockerfile template was being released into packages, fixed
jennyowen Feb 10, 2022
d8ba7b9
extra docker-entrypoint was being added to packages
jennyowen Feb 10, 2022
e114e20
package command will package neo4j-admin image too
jennyowen Feb 10, 2022
82300af
renamed /backup to /backups for consistency with existing documentation
jennyowen Feb 23, 2022
0c14079
replace deprecated dbms.procedures() with SHOW PROCEDURES (#336)
HannesSandberg Mar 4, 2022
5a653be
made /docker-entrypoint.sh link to newer /startup/docker-entrypoint.s…
jennyowen Mar 4, 2022
efe2631
Merge branch 'softlink-entrypoint'
jennyowen Mar 4, 2022
cc37970
Change to URLs for the GDS distribution
knutwalker Mar 22, 2022
6467f76
Merge pull request #340 from neo4j/new-gds-distribution-url
knutwalker Mar 23, 2022
4284187
changing the success message when setting initial password to emphasi…
phil198 Mar 30, 2022
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
Prev Previous commit
Next Next commit
attempt to fix intermittent fail of backup-restore test
jennyowen committed Jan 26, 2022

Verified

This commit was signed with the committer’s verified signature.
albogdano Alex Bogdanovski
commit c0460558f6ec60063f5c110a366197344aa760ff
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
<neo4j.version>${env.NEO4JVERSION}</neo4j.version>
<!-- set java.version to either 1.8 or 11 but don't commit with it set to 11 -->
<java.version>1.8</java.version>
<testcontainers.version>1.16.3</testcontainers.version>
</properties>

<build>
@@ -88,19 +89,19 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.16.0</version>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.16.0</version>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
<version>4.0.0</version>
<version>4.3.6</version>
<scope>test</scope>
</dependency>
<!-- Gson: Java to Json conversion -->
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ void shouldBackupAndRestore_nonDefaultUser_withAuth() throws Exception

private void testCanBackupAndRestore(boolean asDefaultUser, String password) throws Exception
{
String dbUser = "neo4j";
final String dbUser = "neo4j";
Path testOutputFolder = HostFileSystemOperations.createTempFolder( "backupRestore-" );

// BACKUP
@@ -111,10 +111,11 @@ private void testCanBackupAndRestore(boolean asDefaultUser, String password) thr
dbio.verifyInitialDataInContainer( dbUser, password );

// start admin container to initiate backup
String neoDBAddress = neo4j.getHost()+":"+neo4j.getMappedPort( 6362 );
GenericContainer adminBackup = createAdminContainer( asDefaultUser )
.withNetworkMode( "container:"+neo4j.getContainerId() )
.withNetworkMode( "host" )
.waitingFor( new LogMessageWaitStrategy().withRegEx( "^Backup complete successful.*" ) )
.withCommand( "neo4j-admin", "backup", "--database=neo4j", "--backup-dir=/backup");
.withCommand( "neo4j-admin", "backup", "--database=neo4j", "--backup-dir=/backup", "--from="+neoDBAddress);

Path backupDir = HostFileSystemOperations.createTempFolderAndMountAsVolume(
adminBackup, "backup-", "/backup", testOutputFolder );
4 changes: 2 additions & 2 deletions src/test/java/com/neo4j/docker/neo4jserver/TestBasic.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.neo4j.docker.neo4jserver;

import com.neo4j.docker.utils.Neo4jVersion;
import com.neo4j.docker.utils.TestSettings;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
@@ -9,8 +11,6 @@
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import com.neo4j.docker.utils.Neo4jVersion;
import com.neo4j.docker.utils.TestSettings;
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
import org.testcontainers.containers.wait.strategy.Wait;