Merge pull request #1707 from booklore-app/develop

Merge develop into master for release

Author: acx10

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,38 +9,44 @@ assignees: ''
 
 # 🐛 Bug Report for Booklore
 
-Thank you for helping us improve Booklore! Please fill out the sections below.
+Thank you for taking the time to report this bug. Your feedback helps make Booklore better for everyone! 
+
+Let's squash this bug together! 🔨
 
 ---
 
 ## 📝 What happened?
-<!-- Describe the bug in a few sentences -->
+<!-- Describe what went wrong -->
 
 
 ## 🔄 Steps to Reproduce
-<!-- Walk us through the exact steps to see the bug -->
-1. Go to '...'
-2. Click on '...'
-3. Scroll down to '...'
-4. See error
+<!-- Provide detailed steps to reproduce the behavior. Be specific about what you clicked, typed, or configured -->
+1. 
+2. 
+3. 
+4. 
+
+**Result:** <!-- What happened after these steps? -->
 
 ## ✅ Expected Behavior
-<!-- What should have happened instead? -->
+<!-- Describe what should have happened instead -->
 
 
 ## 📸 Screenshots / Error Messages
-<!-- Add screenshots or paste error messages (drag & drop images here) -->
+<!-- Share any screenshots or error messages here (just drag & drop) -->
 
 
 ## 💻 Environment
-- **Version:** (e.g., v1.1.0)
+<!-- Provide details about your setup - every detail helps! -->
+- **Booklore Version:** (e.g., v1.1.0)
 - **OS:** (e.g., Windows 11, macOS Sonoma, Ubuntu 22.04)
 - **Browser:** (e.g., Chrome 120, Firefox 121, Safari 17)
 - **Installation:** (e.g., Docker, Unraid, Manual)
+- **Storage Type:** (e.g., Local HDD/SSD, Synology NAS, SMB Share, NFS Mount, S3 Bucket)
 
 ## 📌 Additional Context
-<!-- Recent changes? Specific books? Anything else that might help? -->
+<!-- Add any other relevant information: recent changes, specific books, configuration details, etc. -->
 
 
 ## ✨ Possible Solution _(Optional)_
-<!-- Have ideas on how to fix this? Share them here! -->
+<!-- Share any ideas on how to fix this issue -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,16 +7,34 @@ assignees: ''
 
 ---
 
-# Feature Request Template for Booklore
+# ✨ Feature Request for Booklore
 
-**What problem or limitation are you encountering?**  
-Describe the challenge or issue you’re facing that this feature would address.
+Thank you for contributing to Booklore's development. Your suggestions help shape the future of this project.
 
-**What solution or improvement do you propose?**  
-Explain clearly what you’d like Booklore to do or how it could work better.
+---
+
+## 📝 Description
+<!-- Describe the problem you're facing and the solution you're proposing -->
+
+
+## 🌟 Benefits
+<!-- Explain the value this feature would bring and who would benefit from it -->
+
+
+## 💻 Use Cases
+<!-- Describe specific scenarios where this feature would be useful -->
+1. 
+2. 
+3. 
+
+
+## 📸 Visual References _(Optional)_
+<!-- Add screenshots, mockups, wireframes, or examples from other applications -->
+
+
+## 🎨 Technical Details _(Optional)_
+<!-- Share implementation ideas, alternative solutions, or related features -->
 
-**Have you found any workarounds or alternatives?**  
-Share any other solutions you’ve tried or considered, if any.
 
-**Additional details**  
-Add any extra context, examples, or screenshots that might help us understand your request.
+## 📌 Additional Context
+<!-- Any other information, research, or context that would be helpful -->

.github/workflows/docker-build-publish.yml

@@ -167,6 +167,7 @@ jobs:
           docker buildx build \
             --platform linux/amd64,linux/arm64 \
             --build-arg APP_VERSION=${{ env.image_tag }} \
+            --build-arg APP_REVISION=${{ github.sha }} \
             --tag booklore/booklore:${{ env.image_tag }} \
             --tag ghcr.io/booklore-app/booklore:${{ env.image_tag }} \
             --push .

Dockerfile

@@ -14,7 +14,7 @@ COPY ./booklore-ui /angular-app/
 RUN npm run build --configuration=production
 
 # Stage 2: Build the Spring Boot app with Gradle
-FROM gradle:9.1-jdk25-alpine AS springboot-build
+FROM gradle:8.14.3-jdk21-alpine AS springboot-build
 
 WORKDIR /springboot-app
 
@@ -29,7 +29,21 @@ RUN apk add --no-cache yq && \
 RUN gradle clean build -x test
 
 # Stage 3: Final image
-FROM eclipse-temurin:25-jre-alpine
+FROM eclipse-temurin:21.0.9_10-jre-alpine
+
+ARG APP_VERSION
+ARG APP_REVISION
+
+# Set OCI labels
+LABEL org.opencontainers.image.title="BookLore" \
+      org.opencontainers.image.description="BookLore: A self-hosted, multi-user digital library with smart shelves, auto metadata, Kobo & KOReader sync, BookDrop imports, OPDS support, and a built-in reader for EPUB, PDF, and comics." \
+      org.opencontainers.image.source="https://github.com/booklore-app/booklore" \
+      org.opencontainers.image.url="https://github.com/booklore-app/booklore" \
+      org.opencontainers.image.documentation="https://booklore-app.github.io/booklore-docs/docs/getting-started" \
+      org.opencontainers.image.version=$APP_VERSION \
+      org.opencontainers.image.revision=$APP_REVISION \
+      org.opencontainers.image.licenses="GPL-3.0" \
+      org.opencontainers.image.base.name="docker.io/library/eclipse-temurin:21.0.9_10-jre-alpine"
 
 RUN apk update && apk add nginx gettext su-exec
 
@@ -41,4 +55,4 @@ RUN chmod +x /start.sh
 
 EXPOSE 8080 80
 
-CMD ["/start.sh"]
+CMD ["/start.sh"]

booklore-api/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.5.1'
+    id 'org.springframework.boot' version '3.5.8'
     id 'io.spring.dependency-management' version '1.1.7'
-    id 'org.hibernate.orm' version '7.1.3.Final'
+    id 'org.hibernate.orm' version '6.6.36.Final'
     id 'com.github.ben-manes.versions' version '0.53.0'
 }
 
@@ -11,7 +11,7 @@ version = '0.0.1-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(25)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -39,8 +39,7 @@ dependencies {
 
     // --- Database & Migration ---
     implementation 'org.mariadb.jdbc:mariadb-java-client:3.5.6'
-    implementation 'org.flywaydb:flyway-mysql:11.13.2'
-    implementation 'jakarta.persistence:jakarta.persistence-api:3.2.0'
+    implementation 'org.flywaydb:flyway-mysql:11.18.0'
 
     // --- Security & Authentication ---
     implementation 'io.jsonwebtoken:jjwt-api:0.13.0'
@@ -52,29 +51,32 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.42'
 
     // --- Book & Image Processing ---
-    implementation 'org.apache.pdfbox:pdfbox:3.0.5'
+    implementation 'org.apache.pdfbox:pdfbox:3.0.6'
+    implementation 'org.apache.pdfbox:xmpbox:3.0.6'
     implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
-    implementation 'org.apache.pdfbox:xmpbox:3.0.5'
     implementation 'com.github.jai-imageio:jai-imageio-core:1.4.0'
     implementation 'com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0'
     implementation 'io.documentnode:epub4j-core:4.2.2'
 
     // --- UNRAR Support ---
-    implementation 'com.github.junrar:junrar:7.5.5'
+    implementation 'com.github.junrar:junrar:7.5.7'
 
     // --- JSON & Web Scraping ---
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1'
     implementation 'org.jsoup:jsoup:1.21.2'
 
     // --- Mapping (DTOs & Entities) ---
     implementation 'org.mapstruct:mapstruct:1.6.3'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
 
     // --- API Documentation ---
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14'
     implementation 'org.apache.commons:commons-compress:1.28.0'
     implementation 'org.apache.commons:commons-text:1.14.0'
 
+    // --- Template Engine ---
+    implementation 'org.freemarker:freemarker:2.3.33'
+
     // --- Test Dependencies ---
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.assertj:assertj-core:3.27.3'

booklore-api/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

booklore-api/gradle/wrapper/gradle-wrapper.properties

@@ -24,6 +24,6 @@ public OpdsUserDetails loadUserByUsername(String username) throws UsernameNotFou
         OpdsUserV2Entity userV2 = opdsUserV2Repository.findByUsername(username)
                 .orElseThrow(() -> ApiError.USER_NOT_FOUND.createException(username));
         OpdsUserV2 mappedCredential = opdsUserV2Mapper.toDto(userV2);
-        return new OpdsUserDetails(mappedCredential, null);
+        return new OpdsUserDetails(mappedCredential);
     }
 }