Repository: logging-chainsaw Updated Branches: refs/heads/master 4b8b96ff5 -> a805396cf
Reformat and simplify pom.xml Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/1d3ee99c Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/1d3ee99c Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/1d3ee99c Branch: refs/heads/master Commit: 1d3ee99cbb5da596e19af408495a48a45f5cf0ec Parents: 4b8b96f Author: Matt Sicker <boa...@gmail.com> Authored: Tue Mar 13 01:45:57 2018 -0500 Committer: Matt Sicker <boa...@gmail.com> Committed: Tue Mar 13 01:48:33 2018 -0500 ---------------------------------------------------------------------- pom.xml | 222 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 102 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1d3ee99c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 178916c..51735cd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> @@ -113,22 +114,6 @@ <url>https://www.apache.org</url> </organization> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> - <configuration> - <bottom><![CDATA[<p align="center">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br /> - Apache Logging, Apache Log4j, Log4j, Apache Chainsaw, Chainsaw, Apache, the Apache feather logo, the Apache Logging project logo, - and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom> - <additionalparam>${javadoc.opts}</additionalparam> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.rat</groupId> @@ -183,13 +168,16 @@ <phase>site</phase> <id>untag-site</id> <configuration> - <tasks> - <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" /> - <replaceregexp file="target/site/source-repository.html" match="/tags/[^ "'<]*" replace="/trunk" flags="g" /> - <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" flags="g"> - <fileset dir="target/site/apidocs" includes="**/*.html" /> - </replaceregexp> - </tasks> + <tasks> + <taskdef name="replaceregexp" + classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"/> + <replaceregexp file="target/site/source-repository.html" match="/tags/[^ "'<]*" + replace="/trunk" flags="g"/> + <replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" + flags="g"> + <fileset dir="target/site/apidocs" includes="**/*.html"/> + </replaceregexp> + </tasks> </configuration> <goals> <goal>run</goal> @@ -203,7 +191,7 @@ </goals> <configuration> <tasks> - <ant target="post-site" /> + <ant target="post-site"/> </tasks> </configuration> </execution> @@ -215,7 +203,7 @@ </goals> <configuration> <tasks> - <ant target="site-deploy" /> + <ant target="site-deploy"/> </tasks> </configuration> </execution> @@ -229,8 +217,8 @@ <tasks> <copy todir="${project.build.directory}/apidocs/META-INF"> <fileset dir="${basedir}"> - <include name="LICENSE" /> - <include name="NOTICE" /> + <include name="LICENSE"/> + <include name="NOTICE"/> </fileset> </copy> </tasks> @@ -248,51 +236,51 @@ <artifactId>ant-contrib</artifactId> <version>1.0b2</version> </dependency> - </dependencies> + </dependencies> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>appassembler-maven-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>assemble</goal> + </goals> + </execution> + </executions> + <configuration> + <showConsoleWindow>false</showConsoleWindow> + <programs> + <program> + <mainClass>${chainsaw.mainclass}</mainClass> + <name>chainsaw</name> + </program> + </programs> + </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>appassembler-maven-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>assemble</goal> - </goals> - </execution> - </executions> - <configuration> - <showConsoleWindow>false</showConsoleWindow> - <programs> - <program> - <mainClass>${chainsaw.mainclass}</mainClass> - <name>chainsaw</name> - </program> - </programs> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.4</version> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - <descriptor>src/assembly/standalone.xml</descriptor> - </descriptors> - <!-- we append the assembly ID here,but note that the bin assembly does not have an id specified - in its config, so it doesn't have a suffix --> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - </executions> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + <descriptor>src/assembly/standalone.xml</descriptor> + </descriptors> + <!-- we append the assembly ID here,but note that the bin assembly does not have an id specified + in its config, so it doesn't have a suffix --> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + </executions> </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> @@ -328,9 +316,9 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> <executions> <execution> <goals> @@ -341,27 +329,27 @@ </plugin> <!-- FIXME: make this plugin optional --> <!--<plugin>--> - <!--<groupId>sh.tak.appbundler</groupId>--> - <!--<artifactId>appbundle-maven-plugin</artifactId>--> - <!--<version>1.2.0</version>--> - <!--<configuration>--> - <!--<mainClass>${chainsaw.mainclass}</mainClass>--> - <!--<bundleName>Chainsaw</bundleName>--> - <!--<iconFile>logo.icns</iconFile>--> - <!--<generateDiskImageFile>true</generateDiskImageFile>--> - <!--<jvmOptions>--> - <!--<jvmOption>-Xms128m</jvmOption>--> - <!--<jvmOption>-Xmx512m</jvmOption>--> - <!--</jvmOptions>--> - <!--</configuration>--> - <!--<executions>--> - <!--<execution>--> - <!--<phase>package</phase>--> - <!--<goals>--> - <!--<goal>bundle</goal>--> - <!--</goals>--> - <!--</execution>--> - <!--</executions>--> + <!--<groupId>sh.tak.appbundler</groupId>--> + <!--<artifactId>appbundle-maven-plugin</artifactId>--> + <!--<version>1.2.0</version>--> + <!--<configuration>--> + <!--<mainClass>${chainsaw.mainclass}</mainClass>--> + <!--<bundleName>Chainsaw</bundleName>--> + <!--<iconFile>logo.icns</iconFile>--> + <!--<generateDiskImageFile>true</generateDiskImageFile>--> + <!--<jvmOptions>--> + <!--<jvmOption>-Xms128m</jvmOption>--> + <!--<jvmOption>-Xmx512m</jvmOption>--> + <!--</jvmOptions>--> + <!--</configuration>--> + <!--<executions>--> + <!--<execution>--> + <!--<phase>package</phase>--> + <!--<goals>--> + <!--<goal>bundle</goal>--> + <!--</goals>--> + <!--</execution>--> + <!--</executions>--> <!--</plugin> --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -375,15 +363,15 @@ <keystore>${chainsaw.webstart.keystore}</keystore> <keypass>${chainsaw.webstart.keypass}</keypass> <storepass>${chainsaw.webstart.storepass}</storepass> - <storetype /> + <storetype/> <alias>${chainsaw.webstart.alias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> + <validity/> + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> <verify>false</verify> </sign> <verbose>false</verbose> @@ -392,7 +380,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>${site.plugin.version}</version> <configuration> <locales>en</locales> <templateFile>${basedir}/src/site/site.vm</templateFile> @@ -437,7 +424,7 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> <version>5.0-2</version> @@ -450,31 +437,30 @@ <version>0.1.42</version> </dependency> <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - <scope>test</scope> - </dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>1.0</version> - <optional>true</optional> - <scope>provided</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>1.0</version> + <optional>true</optional> + <scope>provided</scope> </dependency> </dependencies> <reporting> <excludeDefaults>true</excludeDefaults> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> <configuration> <goals>site-deploy</goals> <goals>assembly:assembly</goals> @@ -501,7 +487,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> <configuration> <bottom><