Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
df89e63
Move subproject configuration into convention plugins
jjohannes Jun 7, 2025
38ccffc
Structure convention plugins
jjohannes Jun 7, 2025
a3c598e
Extract dependency-rules convention plugin
jjohannes Jun 7, 2025
837a02c
Rename: org.jabref.gradle.module
jjohannes Jun 7, 2025
fd6ec7c
Centralise version in platform
jjohannes Jun 7, 2025
4bbff58
Remove excludes that have no effect
jjohannes Jun 8, 2025
1e933c1
Remove excludes that have no effect (2)
jjohannes Jun 8, 2025
790f1fe
Remove excludes that have no effect (3)
jjohannes Jun 8, 2025
5c7f6c7
excludes -> metadata rules
jjohannes Jun 8, 2025
ae14fa1
Remove duplicated 'platform' dependencies
jjohannes Jun 8, 2025
6de5cf4
Register 'jablib/lib' as maven repository
jjohannes Jun 8, 2025
68fcf78
Add dependency analysis plugin
jjohannes Jun 13, 2025
41ba6c9
Merge branch 'main' into gradle-build-updates
jjohannes Jun 13, 2025
1ff4ff6
Move versions of 'versions/build.gradle.kt'
jjohannes Jun 13, 2025
d142c9b
Update file names in GH Actions
jjohannes Jun 13, 2025
3a18312
Restore setting the 'release' flag to 24
jjohannes Jun 13, 2025
ab73c3a
Add missing patch dependency
jjohannes Jun 13, 2025
a74b53e
Add repositories to root (for OpenRewrite)
jjohannes Jun 13, 2025
dbfce2a
Add missing dependencies
jjohannes Jun 13, 2025
c5118e0
Add a set of patch rules to make ':jabgui:jpackage*' tasks run
jjohannes Jun 13, 2025
8d57960
Adjust buildres structure to conventions of packaging plugin
jjohannes Jun 13, 2025
172d8bc
Make current jlink setup work with patched Jars
jjohannes Jun 13, 2025
cb3d09c
windows: build msi and not exe
jjohannes Jun 13, 2025
fcce6fc
Initial sketch of using packaging plugin for JabRef (jabgui)
jjohannes Jun 13, 2025
fc810db
Use plugin from source for now
jjohannes Jun 13, 2025
eceeb4b
Clone java-module-packaging repo to use preview
jjohannes Jun 14, 2025
09b068c
Clone java-module-packaging repo to use preview (2)
jjohannes Jun 14, 2025
e53e34e
Simplify include logic
jjohannes Jun 14, 2025
e048cb3
Merge remote-tracking branch 'origin/main' into gradle-build-updates
koppor Jun 15, 2025
60ef9f3
Port arm64 changes
koppor Jun 15, 2025
13083df
Merge branch 'main' into gradle-build-updates
koppor Jun 15, 2025
92aede8
Try to really use JavaFX EA
koppor Jun 7, 2025
7400111
Use AMAZON JDK
koppor Jun 16, 2025
f0f25d9
Try to fix JDK version update
koppor Jun 16, 2025
d9d5f96
Update path for javafx version update
koppor Jun 16, 2025
214556d
Fix typo
koppor Jun 16, 2025
718b226
Try to fix sed expression
koppor Jun 16, 2025
63a2483
Some debug
koppor Jun 16, 2025
176a847
Merge branch 'main' into gradle-build-updates
koppor Jun 16, 2025
71e4d84
Use amazon instead of liberica
koppor Jun 16, 2025
4328dc3
Disable JDK25 b/c unsupported
koppor Jun 16, 2025
4f284fb
Fix distribution name
koppor Jun 16, 2025
2a06bc0
Remove "downloadSources"
koppor Jun 16, 2025
4c528bb
Fix space
koppor Jun 16, 2025
b94c305
Add JBang install to tests
koppor Jun 16, 2025
8002bf3
Increase log level for gradle
koppor Jun 16, 2025
248f94d
Add some debug
koppor Jun 16, 2025
736f997
Verbose JBang check
koppor Jun 16, 2025
1425b3c
Fix vendor of JDK
koppor Jun 16, 2025
f49e81b
Refine debug
koppor Jun 16, 2025
1c43aec
Force refresh of SNAPSHOT plugin
koppor Jun 16, 2025
9ee9772
Remove debug output
koppor Jun 16, 2025
abeba80
Remove TODO
koppor Jun 16, 2025
ce5f593
Use long form for JVM switches
koppor Jun 16, 2025
a578fc5
Use fix-7-SNAPSHOT again
koppor Jun 16, 2025
99c8758
Magic merge commit for PR #13319
koppor Jun 17, 2025
22b772f
Merge commit '99c8758fb06ff34645de486bc34adac404473c97' into java-mod…
koppor Jun 17, 2025
b4bf3fa
Fix includeBuild logic
jjohannes Jun 17, 2025
85aa830
Add missing runtime requires in patching
jjohannes Jun 17, 2025
cb58eac
Remove duplicated javafx version definition
jjohannes Jun 17, 2025
e942bbe
Remove configuration code that is overridden before used
jjohannes Jun 17, 2025
ebd4a07
Add rules required for jabserv-cli dependencies
jjohannes Jun 17, 2025
2d5765c
Remove 'org.beryx.jlink'
jjohannes Jun 17, 2025
62ee636
Make more workflows run with preview branch
jjohannes Jun 17, 2025
09010f6
Make more workflows run with preview branch (2)
jjohannes Jun 17, 2025
98ca452
Move host identification to plugin
jjohannes Jun 17, 2025
349b9ce
Merge branch 'main' into java-module-plugins
jjohannes Jun 17, 2025
f2ca8cb
Add rules to deal with latest log4j
jjohannes Jun 17, 2025
f5830e2
Make MacOS targets use single step packaging
jjohannes Jun 17, 2025
696c8ce
remove merged module step from pipeline
Siedlerchr Jun 17, 2025
0634ac6
Merge remote-tracking branch 'origin/main' into java-module-plugins
koppor Jun 18, 2025
a4e4e8b
Some debug output
koppor Jun 19, 2025
8e01426
Visibility tweaks
koppor Jun 19, 2025
6e82c57
Remove obsolete empty line
koppor Jun 19, 2025
410b5bd
WIP: Add more modules for testing
koppor Jun 19, 2025
1b6e373
Merge remote-tracking branch 'origin/main' into java-module-plugins
koppor Jun 21, 2025
85d4b27
Add some more dependencies
koppor Jun 21, 2025
3520850
Use updated name for hamcrest dependency
koppor Jun 21, 2025
e55f2ec
Add org.junit.jupiter:junit-jupiter-api as dependency
koppor Jun 21, 2025
b119a2e
Some wiremock patch for [WARN]
koppor Jun 21, 2025
aa0628e
Fix run
koppor Jun 21, 2025
42ee930
Fix wiremock deps
koppor Jun 21, 2025
83e93e9
Update XmlUnit
koppor Jun 21, 2025
5b2cdd2
Fix xmlunit
koppor Jun 21, 2025
b8eb9d1
One step closer
koppor Jun 21, 2025
63e0e58
No jopt-simple for wiremock
koppor Jun 21, 2025
e859dae
No json-path for wiremock
koppor Jun 21, 2025
44bf2e1
Merge remote-tracking branch 'origin/main' into java-module-plugins
koppor Jun 21, 2025
1094d8b
Patch for org.objenesis
koppor Jun 21, 2025
7ff9198
Wiremock seems to work
koppor Jun 21, 2025
de528d7
Fix org.assertj.core
koppor Jun 21, 2025
3ac930f
testfx should be really OK now
koppor Jun 21, 2025
6e8f4e7
ArchUnit "fixes"
koppor Jun 21, 2025
4f08f79
Remove WIP comments
koppor Jun 21, 2025
b292e50
More comment removal
koppor Jun 21, 2025
9ee4c8f
Add missing requires
koppor Jun 21, 2025
3e49348
Some more "tweaks"
koppor Jun 21, 2025
0b7b57b
More code and fix
koppor Jun 21, 2025
3a597d1
Some more code'n'fix for "run"
koppor Jun 21, 2025
c0ddd4e
":jabgui:run" without errors
koppor Jun 21, 2025
2d089f3
Merge remote-tracking branch 'origin/main' into java-module-plugins
koppor Jun 21, 2025
80d2641
"Minimize" dependencies
koppor Jun 21, 2025
5532242
Try to reduce dependencies again
koppor Jun 21, 2025
c1fb6e0
Remove java.base "hack" (we have it in the jvmArgs)
koppor Jun 21, 2025
d7ce018
Update testfx from 4.0.16 to 4.0.18
koppor Jun 21, 2025
d75b5f3
"Reduce" dependencies
koppor Jun 21, 2025
dcd23c0
Some random letters
koppor Jun 21, 2025
b156d1f
Working on :jablib:check
koppor Jun 21, 2025
7d1ecf4
Fix typo
koppor Jun 21, 2025
0baaa03
Random letters
koppor Jun 21, 2025
cfa29b4
"Modern" mockito usage in JabLib
koppor Jun 21, 2025
aa10b5f
More patching for :jablib:test
koppor Jun 21, 2025
e9dd5fe
Re-enable javafx.graphics patching
koppor Jun 21, 2025
6c9000b
Some javafx.graphics refinements
koppor Jun 21, 2025
b914de8
Not-working fix as comment
koppor Jun 21, 2025
5047a93
... getting closer ...
koppor Jun 21, 2025
840b11f
Port mockito agent patch to jabgui
koppor Jun 21, 2025
a8549a6
Some more patching
koppor Jun 21, 2025
e18def2
Who said, we could avoid json path?
koppor Jun 21, 2025
8230328
Fix alphabetical ordering
koppor Jun 21, 2025
6b2a44c
WIP glassfish etc
koppor Jun 21, 2025
6b46b4f
Random fixes for compiliation
koppor Jun 22, 2025
bb512a3
Server starts
koppor Jun 22, 2025
cef1a44
Basic http requests work
koppor Jun 22, 2025
87bb3e6
jabsrv tests are green
koppor Jun 22, 2025
f05d781
Remove random debug statement
koppor Jun 22, 2025
d5e1ed8
Add missing depdendency
koppor Jun 22, 2025
c472674
Some more patching
koppor Jun 22, 2025
749c108
Some version cleanup
koppor Jun 22, 2025
aa5c5e9
Fix path (distributions with s)
koppor Jun 22, 2025
fdcf233
Fix OW2 ASM
koppor Jun 22, 2025
c07ab73
Add some debug
koppor Jun 22, 2025
17d70c9
Disable generation of portable version
koppor Jun 22, 2025
37761db
Fix dir for repack
koppor Jun 22, 2025
f09d5dc
Add required directories for org.gradlex.javamodule.packaging.JavaMod…
koppor Jun 22, 2025
43350ac
Try to fix ubuntu
koppor Jun 22, 2025
2463c19
Try to fix msi thingy
koppor Jun 22, 2025
b5e1cd0
Try to rename packaged files
koppor Jun 22, 2025
509c9f9
Fix depdencies for jabgui tests
koppor Jun 22, 2025
d6825d4
Remove javafx-ea builds to focus on the main binaries workflow
koppor Jun 22, 2025
fbd15f4
Debug
koppor Jun 22, 2025
444db88
Wiremock needs it all...
koppor Jun 22, 2025
ed9548c
Try to fix file renaming
koppor Jun 22, 2025
1f674cf
Wiremock needs more
koppor Jun 22, 2025
7f73d6a
Wiremock...
koppor Jun 22, 2025
e4fe276
Try to fix folder
koppor Jun 22, 2025
f7069dc
JabKit on macOS: Future work
koppor Jun 22, 2025
0b5a8db
Merge branch 'java-module-plugins' into java-module-plugins
koppor Jun 24, 2025
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
545 changes: 0 additions & 545 deletions .github/workflows/binaries-ea.yml

This file was deleted.

75 changes: 43 additions & 32 deletions .github/workflows/binaries.yml

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -59,6 +65,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -79,6 +91,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -101,6 +119,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: markdownlint-cli2-action
uses: DavidAnson/markdownlint-cli2-action@v20
with:
Expand All @@ -117,6 +141,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Generate JBang cache key
id: cache-key
shell: bash
Expand Down Expand Up @@ -157,6 +187,12 @@ jobs:
submodules: 'false'
show-progress: 'false'
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Cache clparse jar
id: cache-clparse
uses: actions/cache@v4
Expand All @@ -183,6 +219,12 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v4
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -204,6 +246,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -253,6 +301,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -288,6 +342,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -310,6 +370,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -335,6 +401,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- run: jbang build .jbang/CheckoutPR.java
- run: jbang build .jbang/CloneJabRef.java
- run: jbang build .jbang/JabKitLauncher.java
Expand Down Expand Up @@ -376,6 +448,12 @@ jobs:
with:
submodules: 'true'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
if: github.ref == 'refs/heads/main'
uses: actions/setup-java@v4
Expand Down Expand Up @@ -408,6 +486,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand All @@ -428,6 +512,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- uses: gradle/actions/wrapper-validation@v4

mandatory-checks-section-exists:
Expand All @@ -449,6 +539,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview

- name: Check for existence of Mandatory Checks section
id: check_mandatory_section
Expand Down Expand Up @@ -485,6 +581,12 @@ jobs:
with:
submodules: 'false'
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Check for PR checklist
id: check_changelog_modification
run: |
Expand Down Expand Up @@ -528,6 +630,12 @@ jobs:
- uses: actions/checkout@v4
with:
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Merge Conflict finder
uses: olivernybroe/[email protected]

Expand All @@ -539,6 +647,12 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Check force push
id: force_push_check
run: |
Expand All @@ -563,6 +677,12 @@ jobs:
with:
submodules: true
show-progress: 'false'
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Check for submodule modifications
id: check_submodule
run: |
Expand Down Expand Up @@ -613,6 +733,12 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout java-module-packaging
uses: actions/checkout@v4
with:
repository: gradlex-org/java-module-packaging
path: build-logic/java-module-packaging
ref: preview
- name: Check PR body for changelog note
id: changelog_check
run: |
Expand Down
1 change: 1 addition & 0 deletions build-logic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java-module-packaging
2 changes: 2 additions & 0 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ dependencies {
implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.18.0")
implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
implementation("org.gradlex:extra-java-module-info:1.12")
implementation("org.gradlex:java-module-dependencies:1.9.1")
implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
implementation("org.gradlex:java-module-testing:1.7")
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
implementation("org.gradle.toolchains:foojay-resolver:1.0.0")
}
5 changes: 5 additions & 0 deletions build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
rootProject.name = "build-logic"

// If this is not found:
// - clone https://github.com/gradlex-org/java-module-packaging next to this file
// - switch to branch 'preview' and pull
includeBuild("java-module-packaging")
Loading