Skip to content

upgrade jackalope to version 2 #220

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.

Sign up for GitHub

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 1 commit into from
Feb 20, 2024
Merged

upgrade jackalope to version 2 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/test-application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ jobs:

steps:
- name: Checkout project
uses: actions/checkout@v2
uses: actions/checkout@v4

# default java installation not able to run jackrabbit. use same as jackalope-jackrabbit action
- name: Install and configure Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '8'
Expand All @@ -82,7 +82,7 @@ jobs:

- name: Cache Jackrabbit
id: cache-jackrabbit
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit-standalone-*
key: jackrabbit
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

1.6.0
-----

- Work with Jackalope 2.*.

1.5.0
-----

Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"require": {
"php": "^8.0",
"symfony/console": "^5.0 || ^6.0",
"jackalope/jackalope": "^1.3.4",
"jackalope/jackalope": "^1.3.4 || ^2.0",
"phpcr/phpcr": "^2.1",
"phpcr/phpcr-utils": "^1.2",
"symfony/finder": "^5.0 || ^6.0",
Expand All @@ -18,8 +18,8 @@
"phpunit/phpunit": "^9.5",
"behat/behat": "^3.10",
"phpspec/phpspec": "^7.2",
"jackalope/jackalope-doctrine-dbal": "^1.3",
"jackalope/jackalope-jackrabbit": "^1.4.4",
"jackalope/jackalope-doctrine-dbal": "^1.3 || ^2.0",
"jackalope/jackalope-jackrabbit": "^1.4.4 || ^2.0",
"phpspec/prophecy-phpunit": "^2.0"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected function configure(): void
$this->addArgument('path', InputArgument::REQUIRED, 'Path of node to be locked');
$this->addOption('deep', null, InputOption::VALUE_NONE, 'If given this lock will apply to this node and all its descendants; if not, it applies only to this node.');
$this->addOption('session-scoped', null, InputOption::VALUE_NONE, 'If given, this lock expires with the current session; if not it expires when explicitly or automatically unlocked for some other reason');
$this->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'Desired lock timeout in seconds (servers are free to ignore this value). If not used lock will not timeout');
$this->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'Desired lock timeout in seconds (servers are free to ignore this value). If not used lock will not timeout', PHP_INT_MAX);
$this->addOption('owner-info', null, InputOption::VALUE_REQUIRED, ' string containing owner information supplied by the client; servers are free to ignore this value. If none is specified, the implementation chooses one (i.e. user name of current backend authentication credentials');
$this->setHelp(
<<<'HERE'
Expand Down