From e82e7475389ea8a66fd25f2f6fab923096d69de7 Mon Sep 17 00:00:00 2001 From: nie <nie@informatik.uni-kiel.de> Date: Thu, 16 Feb 2012 20:48:49 +0100 Subject: [PATCH] Added the necessary code for the nightly build. --- Kieker.WebGUI/descriptors/descriptor-bin.xml | 20 +++++++++++++++++++ Kieker.WebGUI/descriptors/descriptor-src.xml | 21 ++++++++++++++++++++ Kieker.WebGUI/pom.xml | 20 +++++++++++-------- 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 Kieker.WebGUI/descriptors/descriptor-bin.xml create mode 100644 Kieker.WebGUI/descriptors/descriptor-src.xml diff --git a/Kieker.WebGUI/descriptors/descriptor-bin.xml b/Kieker.WebGUI/descriptors/descriptor-bin.xml new file mode 100644 index 00000000..54cc18fc --- /dev/null +++ b/Kieker.WebGUI/descriptors/descriptor-bin.xml @@ -0,0 +1,20 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>bin</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <includes> + <include> + **/${project.build.directory}/Kieker.WebGUI*.war + </include> + </includes> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file diff --git a/Kieker.WebGUI/descriptors/descriptor-src.xml b/Kieker.WebGUI/descriptors/descriptor-src.xml new file mode 100644 index 00000000..4ad4c423 --- /dev/null +++ b/Kieker.WebGUI/descriptors/descriptor-src.xml @@ -0,0 +1,21 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>src</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>**/*.log</exclude> + <exclude>**/${project.build.directory}/**</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml index 9148d5de..0af10d58 100644 --- a/Kieker.WebGUI/pom.xml +++ b/Kieker.WebGUI/pom.xml @@ -286,7 +286,7 @@ quality-config/pmdrules.xml </ruleset> </rulesets> - <targetJdk>1.6</targetJdk> + <targetJdk>1.6</targetJdk> </configuration> </plugin> <plugin> @@ -324,15 +324,19 @@ <failOnMissingWebXml>false</failOnMissingWebXml> </configuration> </plugin> - <!--<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> <executions> <execution> <phase>validate</phase> <goals> - <goal>copy</goal> </goals> <configuration> <outputDirectory>${endorsed.dir}</outputDirectory> - <silent>true</silent> <artifactItems> <artifactItem> <groupId>javax</groupId> - <artifactId>javaee-endorsed-api</artifactId> <version>6.0</version> <type>jar</type> - </artifactItem> </artifactItems> </configuration> </execution> </executions> - </plugin> --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> + <configuration> + <descriptors> + <descriptor>descriptors/descriptor-src.xml</descriptor> + <descriptor>descriptors/descriptor-bin.xml</descriptor> + </descriptors> + </configuration> + </plugin> </plugins> </build> + </project> -- GitLab