Version bump to v0.3.6

.woodpecker.yml

@@ -1,19 +1,19 @@
 pipeline:
   test:
-    image: maven:3-jdk-11
+    image: maven:3-eclipse-temurin-17-alpine
     commands:
-      - apt update && apt install -y lsof
+      - apk add lsof
       - mvn test
 
   build:
-    image: maven:3-jdk-11
+    image: maven:3-eclipse-temurin-17-alpine
     commands:
       - mvn clean compile assembly:single
 
   package:
-    image: maven:3-jdk-11
+    image: maven:3-eclipse-temurin-17-alpine
     commands:
-      - apt update && apt install -y rpm
+      - apk add rpm
       - mvn clean compile package -Dmaven.test.skip
     when:
       event: tag
@@ -31,3 +31,49 @@ pipeline:
         - target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
     when:
       event: tag
+
+  copy_deb_package:
+    image: appleboy/drone-scp
+    settings:
+      host: "repo.int.metaunix.net"
+      username:
+        from_secret: repo_admin
+      password:
+        from_secret: repo_password
+      port: 22
+      target: /srv/repo/apt/dragoon/
+      source: target/dragoon-*.deb
+      strip_components: 1
+    when:
+      event: tag
+
+  copy_rpm_package:
+    image: appleboy/drone-scp
+    settings:
+      host: "repo.int.metaunix.net"
+      username:
+        from_secret: repo_admin
+      password:
+        from_secret: repo_password
+      port: 22
+      target: /srv/repo/dnf/dragoon/
+      source: target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
+      strip_components: 5
+    when:
+      event: tag
+
+  update_repos:
+    image: appleboy/drone-ssh
+    settings:
+      host:
+        - repo.int.metaunix.net
+      username:
+        from_secret: repo_admin
+      password:
+        from_secret: repo_password
+      port: 22
+      command_timeout: 2m
+      script:
+        - sudo /home/xadmin/scripts/update_repo.sh
+    when:
+      event: tag

README.md

@@ -4,17 +4,15 @@ The Bit Goblin video transcoder.
 
 ## Building
 
-Currently this project is targeting Java 11 LTS and uses Maven to manage the software lifecycle. Thus, you must have a Java 11 JDK and Maven installed to build this project.
+Currently this project is targeting Java 17 LTS and uses Maven to manage the software lifecycle. Thus, you must have a Java 17 JDK and Maven installed to build this project.
-
-*NOTE:* The targeted Java version will likely change to 17 LTS soon.
 
 ### Ubuntu
 
-`sudo apt install openjdk-11-jdk maven`
+`sudo apt install openjdk-17-jdk maven`
 
 ### Red Hat/Almalinux
 
-`sudo dnf install java-11-openjdk-devel maven`
+`sudo dnf install java-17-openjdk-devel maven`
 
 ### Actually Building
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.bitgoblin</groupId>
     <artifactId>dragoon</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.6</version>
 
     <name>Dragoon</name>
     <url>https://www.bitgoblin.tech</url>
@@ -37,8 +37,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -55,12 +55,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.2</version>
+            <version>2.19.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.2</version>
+            <version>2.19.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -146,8 +146,7 @@
                     <debBaseDir>${project.basedir}/src/build/deb</debBaseDir>
                     <installDir>/opt</installDir>
                     <osDependencies>
-                        <openjdk-11-jdk></openjdk-11-jdk>
+                        <openjdk-17-jre></openjdk-17-jre>
-                        <maven></maven>
                         <ffmpeg></ffmpeg>
                     </osDependencies>
                     <javaServiceWrapper>false</javaServiceWrapper>
@@ -161,6 +160,10 @@
                             <source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
                             <target>/opt/dragoon/dragoon.jar</target>
                         </fileSet>
+                        <fileSet>
+                            <source>${basedir}/src/main/resources/log4j2.xml</source>
+                            <target>/opt/dragoon/log4j2.xml</target>
+                        </fileSet>
                     </fileSets>
                 </configuration>
             </plugin>
@@ -202,6 +205,17 @@
                                 </source>
                             </sources>
                         </mapping>
+                        <mapping>
+                            <directory>/opt/dragoon/log4j2.xml</directory>
+                            <filemode>755</filemode>
+                            <username>dragoon</username>
+                            <groupname>dragoon</groupname>
+                            <sources>
+                                <source>
+                                    <location>${basedir}/src/main/resources/log4j2.xml</location>
+                                </source>
+                            </sources>
+                        </mapping>
                         <mapping>
                             <directory>/etc/dragoon</directory>
                             <configuration>true</configuration>
@@ -227,7 +241,7 @@
                         </mapping>
                     </mappings>
                     <requires>
-                        <require>java-11-openjdk</require>
+                        <require>java-17-openjdk</require>
                         <require>ffmpeg</require>
                     </requires>
                     <preinstallScriptlet>

src/build/deb/etc/systemd/system/dragoon.service

@@ -4,7 +4,7 @@ Description=Dragoon video transcoder service
 [Service]
 User=dragoon
 Group=dragoon
-ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar'
+ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar' -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml
 SuccessExitStatus=143
 
 [Install]

src/main/java/tech/bitgoblin/Logger.java

@@ -4,6 +4,6 @@ import org.apache.logging.log4j.LogManager;
 
 public class Logger {
 
-  public static org.apache.logging.log4j.Logger logger = LogManager.getLogger();
+  public static org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
 
 }