mirror of
				https://github.com/Frooodle/Stirling-PDF.git
				synced 2025-11-01 01:21:18 +01:00 
			
		
		
		
	Merge branch 'main' into dependabot/gradle/org.springframework.boot-3.4.1
This commit is contained in:
		
						commit
						d3e0c0bce1
					
				
							
								
								
									
										2
									
								
								.github/workflows/manage-label.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/manage-label.yml
									
									
									
									
										vendored
									
									
								
							@ -22,7 +22,7 @@ jobs:
 | 
				
			|||||||
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 | 
					        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Run Labeler
 | 
					      - name: Run Labeler
 | 
				
			||||||
        uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # v5.0.0
 | 
					        uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # v5.1.0
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          github-token: ${{ secrets.GITHUB_TOKEN }}
 | 
					          github-token: ${{ secrets.GITHUB_TOKEN }}
 | 
				
			||||||
          yaml-file: .github/labels.yml
 | 
					          yaml-file: .github/labels.yml
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/multiOSReleases.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/multiOSReleases.yml
									
									
									
									
										vendored
									
									
								
							@ -96,6 +96,6 @@ jobs:
 | 
				
			|||||||
          if-no-files-found: error
 | 
					          if-no-files-found: error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Upload binaries to release
 | 
					      - name: Upload binaries to release
 | 
				
			||||||
        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
 | 
					        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
 | 
					          files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/workflows/releaseArtifacts.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/releaseArtifacts.yml
									
									
									
									
										vendored
									
									
								
							@ -59,7 +59,7 @@ jobs:
 | 
				
			|||||||
          if-no-files-found: error
 | 
					          if-no-files-found: error
 | 
				
			||||||
          
 | 
					          
 | 
				
			||||||
      - name: Upload binaries to release
 | 
					      - name: Upload binaries to release
 | 
				
			||||||
        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
 | 
					        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
 | 
					          files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -76,6 +76,6 @@ jobs:
 | 
				
			|||||||
          if-no-files-found: error
 | 
					          if-no-files-found: error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Upload jar binaries to release
 | 
					      - name: Upload jar binaries to release
 | 
				
			||||||
        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
 | 
					        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
 | 
					          files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
 | 
				
			||||||
 | 
				
			|||||||
@ -48,7 +48,7 @@ repos:
 | 
				
			|||||||
  - repo: https://github.com/jumanjihouse/pre-commit-hooks
 | 
					  - repo: https://github.com/jumanjihouse/pre-commit-hooks
 | 
				
			||||||
    rev: 3.0.0
 | 
					    rev: 3.0.0
 | 
				
			||||||
    hooks:
 | 
					    hooks:
 | 
				
			||||||
#      - id: shellcheck
 | 
					      - id: shellcheck
 | 
				
			||||||
#  - repo: https://github.com/pre-commit/mirrors-eslint
 | 
					#  - repo: https://github.com/pre-commit/mirrors-eslint
 | 
				
			||||||
#    rev: v8.38.0
 | 
					#    rev: v8.38.0
 | 
				
			||||||
#    hooks:
 | 
					#    hooks:
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
# Build the application
 | 
					# Build the application
 | 
				
			||||||
FROM gradle:8.11-jdk17 AS build
 | 
					FROM gradle:8.12-jdk17 AS build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Set the working directory
 | 
					# Set the working directory
 | 
				
			||||||
WORKDIR /app
 | 
					WORKDIR /app
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
plugins {
 | 
					plugins {
 | 
				
			||||||
    id "java"
 | 
					    id "java"
 | 
				
			||||||
    id "org.springframework.boot" version "3.4.1"
 | 
					    id "org.springframework.boot" version "3.4.1"
 | 
				
			||||||
    id "io.spring.dependency-management" version "1.1.6"
 | 
					    id "io.spring.dependency-management" version "1.1.7"
 | 
				
			||||||
    id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
 | 
					    id "org.springdoc.openapi-gradle-plugin" version "1.8.0"
 | 
				
			||||||
    id "io.swagger.swaggerhub" version "1.3.2"
 | 
					    id "io.swagger.swaggerhub" version "1.3.2"
 | 
				
			||||||
    id "edu.sc.seis.launch4j" version "3.0.6"
 | 
					    id "edu.sc.seis.launch4j" version "3.0.6"
 | 
				
			||||||
@ -16,7 +16,7 @@ plugins {
 | 
				
			|||||||
import com.github.jk1.license.render.*
 | 
					import com.github.jk1.license.render.*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ext {
 | 
					ext {
 | 
				
			||||||
    springBootVersion = "3.4.0"
 | 
					    springBootVersion = "3.4.1"
 | 
				
			||||||
    pdfboxVersion = "3.0.3"
 | 
					    pdfboxVersion = "3.0.3"
 | 
				
			||||||
    logbackVersion = "1.5.7"
 | 
					    logbackVersion = "1.5.7"
 | 
				
			||||||
    imageioVersion = "3.12.0"
 | 
					    imageioVersion = "3.12.0"
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@ -1,5 +1,5 @@
 | 
				
			|||||||
distributionBase=GRADLE_USER_HOME
 | 
					distributionBase=GRADLE_USER_HOME
 | 
				
			||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					zipStorePath=wrapper/dists
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user