Merge pull request #268 from JasonHHouse/bugfix/general_improvements

Bugfix/general improvements
JasonHHouse · Jan 2, 2022 · 2cbc126 · 2cbc126
2 parents d165e05 + 0d37aaf
commit 2cbc126
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 25 deletions.
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.10</version>
+        <version>0.9.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.10.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.11.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.10.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.11.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -33,7 +33,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.10.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.11.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.10.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.11.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.10.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.11.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.9.10-installer.exe"
+OutFile "gaps-0.9.11-installer.exe"
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.10</version>
+        <version>0.9.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml
@@ -42,7 +42,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.9.10
+    version: 0.9.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
@@ -29,7 +29,7 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">About</h3>
-    <h4 class="top-margin text-primary">v0.9.10</h4>
+    <h4 class="top-margin text-primary">v0.9.11</h4>
 
     <p class="text-muted">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
@@ -27,7 +27,7 @@
 <div class="container bottom-margin">
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
-    <h3 class="top-margin">v0.9.10</h3>
+    <h3 class="top-margin">v0.9.11</h3>
 
     <p class="text-muted">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
@@ -28,6 +28,11 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">Updates</h3>
+    <h4 class="top-margin text-primary">v0.9.11</h4>
+    <ul class="text-muted">
+        <li>Updating spring boot, log4j, junit, and spotbugs</li>
+    </ul>
+
     <h4 class="top-margin text-primary">v0.9.10</h4>
     <ul class="text-muted">
         <li>Fixed current year limit on search</li>

diff --git a/Plex/pom.xml b/Plex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.10</version>
+        <version>0.9.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.10</version>
+        <version>0.9.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/application-custom.yml b/application-custom.yml
@@ -35,7 +35,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.9.10
+    version: 0.9.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
@@ -11,7 +11,7 @@
 ##
 
 set -e
-VERSION=0.9.10
+VERSION=0.9.11
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
 ZIP_VERSION="GapsAsJar-$VERSION.zip"
 npm ci

diff --git 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.9.10.jar GapsOnWindows\gaps.jar
+copy GapsWeb\target\GapsWeb-0.9.11.jar GapsOnWindows\gaps.jar
 copy README.md GapsOnWindows\
 cd GapsOnWindows
 makensis gaps.nsi
diff --git 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.9.10');
+      .should('have.text', 'v0.9.11');
 
     cy.get('.container > :nth-child(6)')
       .should('have.text', 'Software');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gaps",
-  "version": "0.9.10",
+  "version": "0.9.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
@@ -12,12 +12,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.jasonhhouse</groupId>
     <artifactId>Gaps</artifactId>
-    <version>0.9.10</version>
+    <version>0.9.11</version>
     <name>Gaps</name>
     <description>Demo project for Spring Boot</description>
 
@@ -26,7 +26,7 @@
         <apache.commons.lang3>3.9</apache.commons.lang3>
         <apache.commons.text>1.9</apache.commons.text>
         <commons.io>2.8.0</commons.io>
-        <gaps.version>0.9.10</gaps.version>
+        <gaps.version>0.9.11</gaps.version>
         <google.findbugs>3.0.0</google.findbugs>
         <guava>30.1-jre</guava>
         <hibernate.validator>6.1.5.Final</hibernate.validator>
@@ -37,7 +37,8 @@
         <jaxb.api.version>2.3.0</jaxb.api.version>
         <jaxb.runtime>2.3.2</jaxb.runtime>
         <jetbrains.annotations>17.0.0</jetbrains.annotations>
-        <junit>5.7.0</junit>
+        <junit>5.8.2</junit>
+        <log4j2.version>2.17.0</log4j2.version>
         <mockito.core>2.21.0</mockito.core>
         <okhttp>4.2.0</okhttp>
         <okhttp.mockwebserver>4.9.0</okhttp.mockwebserver>
@@ -250,13 +251,13 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.4.4</version>
+                <version>4.5.2</version>
                 <dependencies>
                     <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
-                        <version>4.4.4</version>
+                        <version>4.5.2</version>
                     </dependency>
                 </dependencies>
             </plugin>