From a83e0f54e29d87186591bc8de25a5902ecc274e5 Mon Sep 17 00:00:00 2001 From: Jason House Date: Fri, 9 Apr 2021 18:06:53 -0400 Subject: [PATCH 1/3] Version Updates Spring Boot 2.4.4 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6d04d65c..a8ab68ce 100755 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.4 com.jasonhhouse @@ -271,13 +271,13 @@ com.github.spotbugs spotbugs-maven-plugin - 4.2.0 + 4.2.2 com.github.spotbugs spotbugs - 4.2.0 + 4.2.2 From a077172d64bd49d5315386e5bd3e2d883a1a19e7 Mon Sep 17 00:00:00 2001 From: Jason House Date: Fri, 9 Apr 2021 18:49:29 -0400 Subject: [PATCH 2/3] 0.8.11 --- Core/pom.xml | 2 +- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.raspbian | 2 +- Dockerfile.riscv64 | 2 +- GapsAsJar/gaps.nsi | 2 +- GapsWeb/pom.xml | 2 +- GapsWeb/src/main/resources/application.yaml | 2 +- GapsWeb/src/main/resources/templates/about.html | 2 +- GapsWeb/src/main/resources/templates/index.html | 2 +- GapsWeb/src/main/resources/templates/updates.html | 5 +++++ Plex/pom.xml | 2 +- RadarrV3/pom.xml | 2 +- application-custom.yml | 2 +- build | 2 +- build.bat | 2 +- cypress/integration/about/about.spec.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- pom.xml | 4 ++-- 21 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Core/pom.xml b/Core/pom.xml index 3315fdae..2f840f64 100755 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.10 + 0.8.11 4.0.0 diff --git a/Dockerfile b/Dockerfile index 7649e37e..6c2553cf 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.10.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 67f06500..01583628 100755 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -26,7 +26,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.10.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 9d966c85..9d8a0277 100755 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -20,7 +20,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.10.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian index cad60335..be95be4c 100755 --- a/Dockerfile.raspbian +++ b/Dockerfile.raspbian @@ -20,7 +20,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.10.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 7eeaccc5..8973a51c 100755 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -24,7 +24,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data WORKDIR /usr/app -COPY GapsWeb/target/GapsWeb-0.8.10.jar /usr/app/gaps.jar +COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar COPY start.sh /usr/app/ diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi index 29af3617..0eea38fa 100644 --- a/GapsAsJar/gaps.nsi +++ b/GapsAsJar/gaps.nsi @@ -48,4 +48,4 @@ RMDIR /r $INSTDIR SectionEnd # name the installer -OutFile "gaps-0.8.10-installer.exe" \ No newline at end of file +OutFile "gaps-0.8.11-installer.exe" \ No newline at end of file diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml index 42bd6ce8..1df3b63a 100755 --- a/GapsWeb/pom.xml +++ b/GapsWeb/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.10 + 0.8.11 4.0.0 diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml index d2efd3ac..a013f941 100755 --- a/GapsWeb/src/main/resources/application.yaml +++ b/GapsWeb/src/main/resources/application.yaml @@ -47,7 +47,7 @@ info: app: name: Gaps description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course. - version: 0.8.10 + version: 0.8.11 storageFolder: /usr/data properties: rssFeed: rssFeed.json diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html index d92f94c5..b9a975ef 100755 --- a/GapsWeb/src/main/resources/templates/about.html +++ b/GapsWeb/src/main/resources/templates/about.html @@ -78,7 +78,7 @@ Gaps Logo

About

-

v0.8.10

+

v0.8.11

Gaps searches through your Plex Server. It then queries for known diff --git a/GapsWeb/src/main/resources/templates/index.html b/GapsWeb/src/main/resources/templates/index.html index b7aaebdf..8d33e063 100755 --- a/GapsWeb/src/main/resources/templates/index.html +++ b/GapsWeb/src/main/resources/templates/index.html @@ -77,7 +77,7 @@

Gaps Logo -

v0.8.10

+

v0.8.11

Gaps searches through your Plex Server. It then queries for known diff --git a/GapsWeb/src/main/resources/templates/updates.html b/GapsWeb/src/main/resources/templates/updates.html index 7aa27ea2..fec55ce7 100755 --- a/GapsWeb/src/main/resources/templates/updates.html +++ b/GapsWeb/src/main/resources/templates/updates.html @@ -78,6 +78,11 @@ Gaps Logo

Updates

+

v0.8.11

+
    +
  • Updated SpringBoot to 2.4.4
    • +
+

v0.8.10

  • Fixing exception that prevented multi plex server automatic scans
    • diff --git a/Plex/pom.xml b/Plex/pom.xml index 6da91943..eb72539f 100755 --- a/Plex/pom.xml +++ b/Plex/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.10 + 0.8.11 4.0.0 diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml index e93c2c7a..07d736d9 100755 --- a/RadarrV3/pom.xml +++ b/RadarrV3/pom.xml @@ -5,7 +5,7 @@ Gaps com.jasonhhouse - 0.8.10 + 0.8.11 4.0.0 diff --git a/application-custom.yml b/application-custom.yml index c08ed3e1..1f71ca9d 100644 --- a/application-custom.yml +++ b/application-custom.yml @@ -44,7 +44,7 @@ info: app: name: Gaps description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course. - version: 0.8.10 + version: 0.8.11 storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in. properties: rssFeed: rssFeed.json diff --git a/build b/build index 26e5e3f2..4451b247 100755 --- a/build +++ b/build @@ -1,6 +1,6 @@ #!/bin/bash set -e -VERSION=0.8.10 +VERSION=0.8.11 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar" ZIP_VERSION="GapsAsJar-$VERSION.zip" npm ci diff --git a/build.bat b/build.bat index 494b775a..39b5b23e 100644 --- a/build.bat +++ b/build.bat @@ -7,7 +7,7 @@ call npm run uglifyjs-pages call mvn clean install del GapsOnWindows\*.jar del GapsOnWindows\README.md -copy GapsWeb\target\GapsWeb-0.8.10.jar GapsOnWindows\gaps.jar +copy GapsWeb\target\GapsWeb-0.8.11.jar GapsOnWindows\gaps.jar copy README.md GapsOnWindows\ cd GapsOnWindows makensis gaps.nsi \ No newline at end of file diff --git a/cypress/integration/about/about.spec.js b/cypress/integration/about/about.spec.js index 3aee218e..7a7fa479 100644 --- a/cypress/integration/about/about.spec.js +++ b/cypress/integration/about/about.spec.js @@ -21,7 +21,7 @@ describe('Verify About Page', () => { .should('have.text', 'About'); cy.get('.container > :nth-child(3)') - .should('have.text', 'v0.8.10'); + .should('have.text', 'v0.8.11'); cy.get('.container > :nth-child(6)') .should('have.text', 'Software'); diff --git a/package-lock.json b/package-lock.json index d6ec9d0f..ae8b8f18 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "gaps", - "version": "0.8.10", + "version": "0.8.11", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.8.10", + "version": "0.8.11", "license": "ISC", "dependencies": { "cssnano": "^4.1.10", diff --git a/package.json b/package.json index 16e0e540..6b9165a8 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gaps", - "version": "0.8.10", + "version": "0.8.11", "description": "Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.", "main": "/", "dependencies": { diff --git a/pom.xml b/pom.xml index a8ab68ce..6d500c96 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ com.jasonhhouse Gaps - 0.8.10 + 0.8.11 Gaps Demo project for Spring Boot @@ -26,7 +26,7 @@ 3.9 1.9 2.8.0 - 0.8.10 + 0.8.11 3.0.0 30.1-jre 5.2.12.Final From 27a2b1598a57a683c28b0fd63a70168f2e29668d Mon Sep 17 00:00:00 2001 From: Jason House Date: Fri, 9 Apr 2021 18:53:50 -0400 Subject: [PATCH 3/3] Docker Java 11.0.10 --- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.ppc64le | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6c2553cf..5b1335e7 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11-openj9:jre-11.0.9_11_openj9-0.23.0 +FROM adoptopenjdk/openjdk11-openj9:jre-11.0.10_9_openj9-0.24.0 LABEL maintainer="jh5975@gmail.com" LABEL name="Jason House" diff --git a/Dockerfile.dev b/Dockerfile.dev index 711b45bb..86ff5ce5 100755 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11-openj9:jre-11.0.9_11_openj9-0.23.0 +FROM adoptopenjdk/openjdk11-openj9:jre-11.0.10_9_openj9-0.24.0 ## Build image with sensible default environment values ## ENV gapsVersion=* diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 9d8a0277..d48f3bc4 100755 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11-openj9:ppc64le-tumbleweed-jre-11.0.9_11_openj9-0.23.0 +FROM adoptopenjdk/openjdk11-openj9:ppc64le-tumbleweed-jre-11.0.10_9_openj9-0.24.0 LABEL maintainer="jh5975@gmail.com" LABEL name="Jason House"