Przeglądaj źródła

Include logback.xml in antkit, so .deb, .rpm and ppa releases can use it. fixes #650

Sebastian Stenzel 7 lat temu
rodzic
commit
19225c058d
2 zmienionych plików z 6 dodań i 3 usunięć
  1. 3 2
      main/ant-kit/assembly.xml
  2. 3 1
      main/ant-kit/pom.xml

+ 3 - 2
main/ant-kit/assembly.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
@@ -29,6 +29,7 @@
 			<directory>target</directory>
 			<includes>
 				<include>build.xml</include>
+				<include>logback.xml</include>
 			</includes>
 			<filtered>false</filtered>
 			<outputDirectory>.</outputDirectory>

+ 3 - 1
main/ant-kit/pom.xml

@@ -57,6 +57,7 @@
 									<directory>src/main/resources</directory>
 									<filtering>true</filtering>
 									<excludes>
+										<exclude>logback.xml</exclude>
 										<exclude>fixed-binaries/**</exclude>
 									</excludes>
 								</resource>
@@ -64,6 +65,7 @@
 									<directory>src/main/resources</directory>
 									<filtering>false</filtering>
 									<includes>
+										<include>logback.xml</include>
 										<include>fixed-binaries/**</include>
 									</includes>
 								</resource>
@@ -76,7 +78,7 @@
 			<!-- create antkit.tar.gz: -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>make-assembly</id>