Merge origin/master into upgrade-test-sources-java25

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

.circleci/config.yml

@@ -41,10 +41,6 @@ commands:
             ./mvnw -ntp -B dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true
 
   save-test-results:
-    parameters:
-      flag:
-        type: string
-        default: ""
     steps:
       - run:
           name: Save package results
@@ -54,38 +50,6 @@ commands:
           when: always
       - store_test_results:
           path: ~/test-results
-      - run:
-          name: Codecov
-          command: |
-            set -x
-
-            curl -Os https://cli.codecov.io/latest/linux/codecov
-            chmod +x codecov
-
-            # Prepare extra arguments: include pull request number if set
-            EXTRA=""
-            if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              EXTRA="--pull-request-number $CIRCLE_PR_NUMBER"
-            fi
-
-            # Add flag if provided
-            FLAG_ARG=""
-            if [ -n "<< parameters.flag >>" ]; then
-              FLAG_ARG="--flag << parameters.flag >>"
-            fi
-
-            # Build the set of common arguments.
-            COMMON_ARGS="--token $CODECOV_TOKEN --branch $CIRCLE_BRANCH --commit-sha $CIRCLE_SHA1 $EXTRA $FLAG_ARG --recurse-submodules --git-service github"
-
-            ls -lha
-
-            ./codecov --version
-
-            # Upload the coverage report.
-            ./codecov upload-coverage $COMMON_ARGS
-
-            # Upload the test reports.
-            ./codecov do-upload --report-type test_results $COMMON_ARGS
 
   configure-gpg:
     steps:
@@ -150,8 +114,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B verify -Pno-databases
-      - save-test-results:
-          flag: "test"
+      - save-test-results
 
   windows:
     machine:
@@ -187,8 +150,7 @@ jobs:
           name: 'Build and test examples'
           command: |
             ./mvnw -ntp -B install -Pexamples -rf :querydsl-examples
-      - save-test-results:
-          flag: "examples"
+      - save-test-results
   buildQuarkusExample:
     <<: *defaults
     working_directory: ~/querydsl
@@ -248,8 +210,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.MySQL
-      - save-test-results:
-          flag: "mysql"
+      - save-test-results
   testPostgreSQL:
     <<: *defaults
     working_directory: ~/querydsl
@@ -269,8 +230,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.PostgreSQL
-      - save-test-results:
-          flag: "postgresql"
+      - save-test-results
   testCUBRID:
     <<: *defaults
     working_directory: ~/querydsl
@@ -288,8 +248,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.CUBRID
-      - save-test-results:
-          flag: "cubrid"
+      - save-test-results
   testOracle:
     <<: *defaults
     working_directory: ~/querydsl
@@ -310,8 +269,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.Oracle
-      - save-test-results:
-          flag: "oracle"
+      - save-test-results
   testMongo:
     <<: *defaults
     working_directory: ~/querydsl
@@ -327,14 +285,13 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.MongoDB
-      - save-test-results:
-          flag: "mongodb"
+      - save-test-results
   testFirebird:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
       - image: velo/toolchains-4-ci-builds:with-25
-      - image: jacobalberty/firebird:2.5.9-ss
+      - image: jacobalberty/firebird:v4
         environment:
           - ISC_PASSWORD=masterkey
           - FIREBIRD_DATABASE=querydsl.fdb
@@ -350,8 +307,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.Firebird
-      - save-test-results:
-          flag: "firebird"
+      - save-test-results
   testEmbedded:
     <<: *defaults
     working_directory: ~/querydsl
@@ -366,8 +322,7 @@ jobs:
           name: 'Test'
           command: |
             ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase
-      - save-test-results:
-          flag: "embedded"
+      - save-test-results
   testDB2:
     # Use the machine executor so we have full VM capabilities (e.g. docker running as admin)
     machine: true
@@ -417,8 +372,7 @@ jobs:
           name: "Stop and remove DB2 container"
           command: |
             docker stop db2 && docker rm db2
-      - save-test-results:
-          flag: "db2"
+      - save-test-results
 
   deploySnapshot:
     executor:

.github/workflows/codeql-analysis.yml

@@ -96,7 +96,7 @@ jobs:
         java-version: '25'
 
     - name: Compile project
-      run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true -pl !querydsl-tooling/querydsl-kotlin-codegen,!querydsl-tooling/querydsl-ksp-codegen,!querydsl-libraries/querydsl-kotlin
+      run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true -pl '!:querydsl-kotlin-codegen,!:querydsl-ksp-codegen,!:querydsl-kotlin'
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/docs.yml

@@ -0,0 +1,47 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches: ["master"]
+    paths:
+      - "docs/**"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./docs
+          destination: ./_site
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

CLAUDE.md

@@ -133,4 +133,43 @@ cd querydsl-examples/querydsl-example-jpa-spring
 ### Testing Guidelines
 - Use `@Tag` annotations to categorize tests by database or performance characteristics
 - Integration tests should extend appropriate base classes from `querydsl-core/src/test/java/com/querydsl/`
-- Database-specific tests go in modules like `querydsl-jpa/src/test/java/com/querydsl/jpa/`
+- Database-specific tests go in modules like `querydsl-jpa/src/test/java/com/querydsl/jpa/`
+
+## Documentation
+
+Documentation lives in `docs/` and is published to https://openfeign.github.io/querydsl via GitHub Pages using Jekyll with the just-the-docs theme.
+
+### Structure
+```
+docs/
+├── _config.yml           # Jekyll config, theme, Liquid variables
+├── Gemfile               # Ruby dependencies (local preview only)
+├── index.md              # Landing page
+├── introduction.md       # Background and principles
+├── tutorials/            # Backend-specific tutorials (JPA, SQL, R2DBC, MongoDB, etc.)
+├── guides/               # Cross-cutting guides (creating queries, result handling, codegen, aliases)
+├── troubleshooting.md
+└── migration.md          # Migration from defunct upstream com.querydsl
+```
+
+### Liquid Variables
+Use these in Markdown files instead of hardcoding values:
+- `{{ site.querydsl_version }}` — current release version (e.g. `7.1`)
+- `{{ site.group_id }}` — Maven groupId (`io.github.openfeign.querydsl`)
+- `{{ site.baseurl }}` — site base URL for internal links
+
+### Deployment
+- Automatic: `.github/workflows/docs.yml` triggers on push to `master` when `docs/**` changes
+- Manual: `workflow_dispatch` trigger available in GitHub Actions UI
+
+### Local Preview
+```bash
+docker run --rm -d -v $(pwd)/docs:/srv/jekyll -p 4000:4000 jekyll/jekyll:4.2.2 jekyll serve --host 0.0.0.0
+# Open http://localhost:4000/querydsl/
+```
+
+### Editing Guidelines
+- All doc files are Markdown with YAML front matter (`layout`, `title`, `parent`, `nav_order`)
+- Code examples should use `maven-compiler-plugin` with `annotationProcessorPaths`, not the old `apt-maven-plugin`
+- Use `{{ site.group_id }}` and `{{ site.querydsl_version }}` in dependency examples
+- Dropped modules (JDO, Lucene, Hibernate Search) should not be referenced

CONTRIBUTING.md

@@ -0,0 +1,77 @@
+# Contributing to Querydsl
+
+GitHub pull requests are the way to contribute to Querydsl.
+
+## Documentation
+
+The documentation site is built with [Jekyll](https://jekyllrb.com/) using the
+[just-the-docs](https://just-the-docs.com/) theme and hosted on GitHub Pages.
+
+Source files live in the `docs/` directory. Changes to `docs/**` on the
+`master` branch automatically trigger a rebuild and deploy.
+
+### Editing Documentation
+
+1. Fork the repository and create a branch from `master`.
+2. Edit or add Markdown files under `docs/`.
+3. Use Liquid variables for version and groupId:
+   - `{{ site.querydsl_version }}` — current release version
+   - `{{ site.group_id }}` — Maven groupId
+4. Open a pull request.
+
+### Local Preview
+
+To preview the site locally:
+
+```bash
+cd docs
+bundle install
+bundle exec jekyll serve
+```
+
+Then open `http://localhost:4000/querydsl/` in your browser.
+
+### Structure
+
+```
+docs/
+├── _config.yml           # Jekyll configuration and variables
+├── Gemfile               # Ruby dependencies
+├── index.md              # Landing page
+├── introduction.md       # Background and principles
+├── tutorials/            # Backend-specific tutorials
+├── guides/               # Cross-cutting guides
+├── troubleshooting.md    # Common issues
+└── migration.md          # Migration from upstream querydsl
+```
+
+## Code Contributions
+
+### Building
+
+```bash
+./mvnw -Pquickbuild clean install
+```
+
+### Running Tests
+
+```bash
+# Without external databases
+./mvnw -Pdev verify
+
+# CI profile
+./mvnw -Pci verify
+```
+
+### Code Formatting
+
+```bash
+./mvnw -Pdev initialize
+```
+
+### Pull Request Process
+
+1. Fork the repository and create a feature branch.
+2. Make your changes and add tests where appropriate.
+3. Run `./mvnw -Pdev verify` to make sure tests pass.
+4. Open a pull request against `master`.

README.md

@@ -42,17 +42,23 @@ Get a querydsl project active!  May be as a fork, may be as a wake up call to pr
 
 Well, you will need to get your hands dirty.  I might fix bugs or create features, but mostly when they affect my day job. Sorry, just a single guy here doing free work on spare time.
 
+**Documentation**
+
+Full reference documentation is available at **[openfeign.github.io/querydsl](https://openfeign.github.io/querydsl)**.
+
 **Getting started**
 
 Use these tutorials to get started
 
-* [Querying JPA](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02.html#jpa_integration)
-* [Querying SQL](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s03.html)
-* [Querying Mongodb](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s07.html)
-* [Querying Lucene](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s05.html)
-* [Querying Collections](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s08.html)
-* [Querydsl Spatial](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s04.html)
-* [Querying JDO](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s02.html)
+* [Querying JPA](https://openfeign.github.io/querydsl/tutorials/jpa)
+* [Querying SQL](https://openfeign.github.io/querydsl/tutorials/sql)
+* [Querying R2DBC](https://openfeign.github.io/querydsl/tutorials/r2dbc)
+* [Querying MongoDB](https://openfeign.github.io/querydsl/tutorials/mongodb)
+* [Querying Collections](https://openfeign.github.io/querydsl/tutorials/collections)
+* [Querydsl Spatial](https://openfeign.github.io/querydsl/tutorials/spatial)
+* [Querying in Kotlin](https://openfeign.github.io/querydsl/tutorials/kotlin)
+* [Querying in Scala](https://openfeign.github.io/querydsl/tutorials/scala)
+* [Migration Guide](https://openfeign.github.io/querydsl/migration)
 
 **Examples**
 
@@ -72,7 +78,7 @@ $ mvn -Pquickbuild,{projectname} clean install
 ```
 Where projectname is one of the Maven profiles (e.g. `jpa`, `sql`, `mongodb`, etc. or `all`)
 
-For more information visit the project homepage at https://querydsl.github.io.
+For more information visit the [documentation site](https://openfeign.github.io/querydsl).
 
 **Docker Compose setup**
 

dist.sh

@@ -8,6 +8,3 @@ do
   mvn -pl querydsl-$module -Dtest=X clean assembly:assembly
 done
 
-mkdir -p target/dist/reference
-mvn -f querydsl-docs/pom.xml -Dxslthl.config=http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml clean package
-cp -R querydsl-docs/target/docbook/publish/en-US/* target/dist/reference/

docs/.gitignore

@@ -0,0 +1,3 @@
+_site/
+.jekyll-cache/
+Gemfile.lock