Skip to content
This repository was archived by the owner on Feb 16, 2025. It is now read-only.

Fix JavaDoc generation on Debian Sid #4635

Merged
merged 4 commits into from
Nov 4, 2022
Merged

Fix JavaDoc generation on Debian Sid #4635

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3372e19
jna: add --stacktrace argument to gradle
atmaxinger Nov 4, 2022
34df752
docker: use opendjdk-17-jdk on Debian Sid, closes #4627
atmaxinger Nov 4, 2022
469c8bd
linkchecker: (temporarily) whitelist broken latest successful build l…
atmaxinger Nov 4, 2022
3ed579a
doc: fix spelling mistakes
atmaxinger Nov 4, 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
4 changes: 2 additions & 2 deletions doc/news/_preparation_next_release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ This section keeps you up-to-date with the multi-language support provided by El
- Fix warning for CMP0115 _(0x6178656c)_
- <<TODO>>
- <<TODO>>
- <<TODO>>
- Pass `--stacktrace` to gradle for the JNA builds. _(Maximilian Irlinger @atmaxinger)_
- <<TODO>>
- <<TODO>>

Expand All @@ -423,7 +423,7 @@ This section keeps you up-to-date with the multi-language support provided by El
- <<TODO>>
- <<TODO>>
- <<TODO>>
- <<TODO>>
- Use `openjdk-17-jdk` in Debian Sid. _(Maximilian Irlinger @atmaxinger)_
- <<TODO>>

## Infrastructure
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/sid/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN apt-get update && apt-get -y install \
moreutils \
ninja-build \
npm \
openjdk-11-jdk \
openjdk-17-jdk \
pkg-config \
python3-dev \
python3-pip \
Expand Down
4 changes: 2 additions & 2 deletions src/bindings/jna/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if (Java_JAVAC_EXECUTABLE)
${PLUGIN_JAR_PATHS}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${GRADLE_EXECUTABLE} -q --console=plain clean assemble
COMMAND ${GRADLE_EXECUTABLE} --stacktrace -q --console=plain clean assemble
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libelektra/test-exclusion.gradle"
"${CMAKE_CURRENT_BINARY_DIR}/version-settings.gradle" ${JNA_BINDING_SOURCE_FILES}
Expand Down Expand Up @@ -159,7 +159,7 @@ if (Java_JAVAC_EXECUTABLE)
OR (NOT BUILD_TESTING)))
add_test (
NAME testjna_gradle
COMMAND ${GRADLE_EXECUTABLE} -q --console=plain test
COMMAND ${GRADLE_EXECUTABLE} --stacktrace -q --console=plain test
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libelektra")

set_property (TEST testjna_gradle PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
Expand Down