Skip to content

JCR-5022: Update derby dependency to 10.15.2.0 #157

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
reschke merged 1 commit into from
Jan 29, 2024
Merged

JCR-5022: Update derby dependency to 10.15.2.0 #157

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
5 changes: 5 additions & 0 deletions jackrabbit-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,11 @@ org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModify
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-tests</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions jackrabbit-jca/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
5 changes: 5 additions & 0 deletions jackrabbit-jcr-rmi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,11 @@ org.apache.jackrabbit.test.api.observation.EventJournalTest
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
5 changes: 5 additions & 0 deletions jackrabbit-jcr-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
5 changes: 5 additions & 0 deletions jackrabbit-jcr2dav/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
7 changes: 6 additions & 1 deletion jackrabbit-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.14.2.0</version>
<version>10.15.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>10.15.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Expand Down
5 changes: 5 additions & 0 deletions jackrabbit-spi2dav/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
<!-- for testing connection via a proxy -->
<dependency>
<groupId>org.littleshoot</groupId>
Expand Down
5 changes: 5 additions & 0 deletions jackrabbit-spi2jcr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,10 @@ org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
6 changes: 6 additions & 0 deletions jackrabbit-webapp/pom.xml
View file
Open in desktop
Copy link
Copy Markdown

@oleosterhagen oleosterhagen Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change of the scope resulted in the Derby database driver no longer being delivered as part of the WAR (under WEB-INF/lib)

  1. https://archive.apache.org/dist/jackrabbit/2.20.17/jackrabbit-webapp-2.20.17.war - Derby driver is included
  2. https://archive.apache.org/dist/jackrabbit/2.22.0/jackrabbit-webapp-2.22.0.war - no Derby driver included

Copy link
Copy Markdown
Contributor Author

@reschke reschke Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's likely caused by the change to make Derby just a test depency when updating the version.

Copy link
Copy Markdown

@jespersm jespersm Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, would you like me to update the patch then, with some likeliness of going forward with it?

Copy link
Copy Markdown
Contributor Author

@reschke reschke Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Derby change to a test depency was intentional (AFAIR, due to https://www.cve.org/CVERecord?id=CVE-2022-46337).

So I would prefer to keep it out of the WAR we generate.

And no, I really can't estimate if or when we can merge this, because I'm still not sure that this is the best way forward.

Would it be ok to have this only in the BETA branch for now?

Copy link
Copy Markdown

@oleosterhagen oleosterhagen Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the DerbyPersistenceManager is still there, I only need to include the Derby JARs in a WAR overlay.

Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down