You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/13 06:53:29 UTC
[1/4] logging-chainsaw git commit: Reformat and simplify pom.xml
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 <bo...@gmail.com>
Authored: Tue Mar 13 01:45:57 2018 -0500
Committer: Matt Sicker <bo...@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><![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,
@@ -513,7 +498,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8.1</version>
<reportSets>
<reportSet>
<reports>
@@ -538,8 +522,6 @@
</distributionManagement>
<properties>
<chainsaw.mainclass>org.apache.log4j.chainsaw.LogUI</chainsaw.mainclass>
- <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
- <site.plugin.version>3.4</site.plugin.version>
</properties>
<profiles>
<profile>
[4/4] logging-chainsaw git commit: Add changelog entries
Posted by ma...@apache.org.
Add changelog entries
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/a805396c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/a805396c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/a805396c
Branch: refs/heads/master
Commit: a805396cf746131f53204a839eb1bcdff9f1bbe3
Parents: ae738e2
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:53:18 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:53:18 2018 -0500
----------------------------------------------------------------------
src/changes/changes.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/a805396c/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2e98c1b..cf92f99 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,11 +20,19 @@
<title>Apache Chainsaw™</title>
</properties>
<body>
+ <release version="2.1.0" date="2018-??-??" description="Apache Chainsaw 2.1.0">
+ <action issue="CHAINSAW-1" type="chore" dev="mattsicker">
+ Modernize syntax for newer Java versions up to 1.8.
+ </action>
+ <action issue="CHAINSAW-3" type="add" dev="mattsicker">
+ Add automated Jenkins pipeline configuration for branches and pull requests.
+ </action>
+ </release>
<release version="2.0.0" date="2018-01-20" description="Apache Chainsaw 2.0.0">
<action dev="sdeboy" type="fix">
Doc updates
</action>
- <action dev="mattsicker" type="fix">
+ <action dev="mattsicker" type="chore">
Update to minimum Java 1.6
</action>
<action dev="mattsicker" type="fix">
[2/4] logging-chainsaw git commit: Add editorconfig
Posted by ma...@apache.org.
Add editorconfig
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/65281db2
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/65281db2
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/65281db2
Branch: refs/heads/master
Commit: 65281db20d79f4c82214445c0dbf555e4c57624b
Parents: 1d3ee99
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:48:58 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:48:58 2018 -0500
----------------------------------------------------------------------
.editorconfig | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/65281db2/.editorconfig
----------------------------------------------------------------------
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..e156253
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,27 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=2
+
+[*.java]
+indent_style=space
+indent_size=4
+
+[*.css]
+indent_style=space
+indent_size=4
+
+[{messages.*,spring.handlers,spring.schemas,messages,org.codehaus.groovy.runtime.ExtensionModule,*.properties}]
+indent_style=space
+indent_size=4
+
+[{*.applejs,*.js}]
+indent_style=space
+indent_size=4
+
+[{*.gson,*.gradle,*.groovy,*.gdsl,*.gy,*.gant}]
+indent_style=space
+indent_size=4
+
[3/4] logging-chainsaw git commit: Reformat changes.xml
Posted by ma...@apache.org.
Reformat changes.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/ae738e21
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/ae738e21
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/ae738e21
Branch: refs/heads/master
Commit: ae738e216f43e9183d3e6fd9ae41d28e42b3d37c
Parents: 65281db
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:49:56 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:49:56 2018 -0500
----------------------------------------------------------------------
src/changes/changes.xml | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ae738e21/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e7c88c4..2e98c1b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,36 +20,36 @@
<title>Apache Chainsaw™</title>
</properties>
<body>
- <release version="2.0.0" date="2018-01-20" description="Apache Chainsaw 2.0.0">
+ <release version="2.0.0" date="2018-01-20" description="Apache Chainsaw 2.0.0">
<action dev="sdeboy" type="fix">
- Doc updates
+ Doc updates
</action>
<action dev="mattsicker" type="fix">
- Update to minimum Java 1.6
+ Update to minimum Java 1.6
</action>
<action dev="mattsicker" type="fix">
- Branding fixes
+ Branding fixes
</action>
<action dev="bodewig" type="fix">
- Update to support maven3
+ Update to support maven3
</action>
<action dev="psmith" issue="42789" type="add" due-to="Isuru Suriarachchi" due-to-email="">
- Added support for remembering filter expressions for each LogPanel
+ Added support for remembering filter expressions for each LogPanel
</action>
<action dev="psmith" issue="42851" type="add" due-to="Isuru Suriarachchi" due-to-email="">
- Added 'Go To Line' feature to navigate to a particular event #
+ Added 'Go To Line' feature to navigate to a particular event #
</action>
<action dev="psmith" issue="42883" type="add" due-to="Isuru Suriarachchi" due-to-email="">
- Added ability to hide Welcome and Drag and Drop panels.
- </action>
- <action dev="psmith" issue="43158" type="add" due-to="Isuru Suriarachchi" due-to-email="">
- Added ability to remember last created receivers in an xml file, and load them at startup.
- </action>
- <action dev="psmith" issue="42883" type="add" due-to="Isuru Suriarachchi" due-to-email="">
- Added ability to remember hidden log panels.
- </action>
- <action dev="psmith" issue="42670" type="fix">Address memory leak when using cyclic model</action>
- <action issue="49078" action="fix">javadoc.jar was missing NOTICE and LICENSE.</action>
+ Added ability to hide Welcome and Drag and Drop panels.
+ </action>
+ <action dev="psmith" issue="43158" type="add" due-to="Isuru Suriarachchi" due-to-email="">
+ Added ability to remember last created receivers in an xml file, and load them at startup.
+ </action>
+ <action dev="psmith" issue="42883" type="add" due-to="Isuru Suriarachchi" due-to-email="">
+ Added ability to remember hidden log panels.
+ </action>
+ <action dev="psmith" issue="42670" type="fix">Address memory leak when using cyclic model</action>
+ <action issue="49078" action="fix">javadoc.jar was missing NOTICE and LICENSE.</action>
</release>
</body>
</document>