Allow log4j config file passing using LOGXML (snmpman.sh)

Rewrite the maven project version in the caller script snmpman.sh
1and1 · Jan 4, 2024 · 76655c4 · 76655c4
1 parent 1560298
commit 76655c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/snmpman-cli/pom.xml b/snmpman-cli/pom.xml
@@ -33,6 +33,12 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/assembly</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/snmpman-cli/src/main/assembly/dist.xml b/snmpman-cli/src/main/assembly/dist.xml
@@ -20,7 +20,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/assembly</directory>
+      <directory>target/classes</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>0755</fileMode>
       <includes>

diff --git a/snmpman-cli/src/main/assembly/snmpman.sh b/snmpman-cli/src/main/assembly/snmpman.sh
@@ -1,6 +1,9 @@
 #! /bin/bash
 
 BASEDIR=$(cd $(dirname "$0")/..; pwd)
-JAR=${BASEDIR}/lib/snmpman-cli-*.jar
+JAR=${BASEDIR}/lib/snmpman-cli-${project.version}.jar
+if [ "$LOGXML" = "" ]; then
+  export LOGXML=file:///${BASEDIR}/etc/log4j2.xml
+fi
 
-java -Dlog4j.configurationFile=file:///${BASEDIR}/etc/log4j2.xml -jar ${JAR} "$@"
+java -Dlog4j.configurationFile=${LOGXML} -jar ${JAR} "$@"