You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/07/19 04:44:30 UTC
logging-log4j2 git commit: Fix Jenkins build
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3fd115cad -> 25a61a5f1
Fix Jenkins build
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/25a61a5f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/25a61a5f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/25a61a5f
Branch: refs/heads/master
Commit: 25a61a5f1c8b65e06d6d204b329e38058d4cabfb
Parents: 3fd115c
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Jul 18 21:44:19 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Tue Jul 18 21:44:25 2017 -0700
----------------------------------------------------------------------
log4j-jmx-gui/pom.xml | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/25a61a5f/log4j-jmx-gui/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index 6342eb3..ed18678 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -33,6 +33,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>JMX GUI Documentation</docLabel>
<projectDir>/jmx-gui</projectDir>
+ <jenkins.java.home>/home/jenkins/tools/java/latest1.7</jenkins.java.home>
</properties>
<dependencies>
<dependency>
@@ -180,7 +181,7 @@
</reporting>
<profiles>
<profile>
- <id>default-profile</id>
+ <id>default-jmx-profile</id>
<activation>
<activeByDefault>true</activeByDefault>
<file>
@@ -220,6 +221,25 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jenkins-profile</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jenkins</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>jconsole</artifactId>
+ <version>1.7.0</version>
+ <scope>system</scope>
+ <systemPath>${jenkins.java.home}/lib/jconsole.jar</systemPath>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>