You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/26 09:02:37 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1901: Fix travis-ci build
Repository: logging-log4j2
Updated Branches:
refs/heads/master 4b7e3e229 -> 7b043f6a8
LOG4J2-1901: Fix travis-ci build
remove apt-get, use trusty dist
skip SecureSocketAppenderSocketOptionsTest#testSocketTrafficClass and SocketAppenderSocketOptionsTest#testSocketTrafficClass on travis-ci
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/64170ccc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/64170ccc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/64170ccc
Branch: refs/heads/master
Commit: 64170ccc1059377f039441808d2b54e71ea423a8
Parents: 4b7e3e2
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Thu May 25 21:28:35 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Fri May 26 10:56:19 2017 +0200
----------------------------------------------------------------------
.travis.yml | 7 ++-----
.../core/appender/SecureSocketAppenderSocketOptionsTest.java | 1 +
.../log4j/core/appender/SocketAppenderSocketOptionsTest.java | 1 +
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/64170ccc/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8c8131e..d3441ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@
language: java
# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/ci-environment/
sudo: true
+# trusty required for oraclejdk9
+dist: trusty
jdk:
- oraclejdk7
@@ -21,11 +23,6 @@ env:
global:
JAVA_OPTS=-Xmx4g
-addons:
- apt:
- packages:
- - oracle-java9-installer
-
install:
- ./mvnw --toolchains=./.travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/64170ccc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
index 25a6f50..98e1aa7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
@@ -120,6 +120,7 @@ public class SecureSocketAppenderSocketOptionsTest {
@Test
public void testSocketTrafficClass() throws IOException {
Assume.assumeTrue("Run only on Java 7", System.getProperty("java.specification.version").equals("1.7"));
+ Assume.assumeFalse("Do not run on Travis CI", "true".equals(System.getenv("TRAVIS")));
final SocketAppender appender = loggerContextRule.getAppender("socket", SocketAppender.class);
final TcpSocketManager manager = (TcpSocketManager) appender.getManager();
final Socket socket = manager.getSocket();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/64170ccc/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
index 475e849..030fa80 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
@@ -100,6 +100,7 @@ public class SocketAppenderSocketOptionsTest {
@Test
public void testSocketTrafficClass() throws IOException {
Assume.assumeTrue("Run only on Java 7", System.getProperty("java.specification.version").equals("1.7"));
+ Assume.assumeFalse("Do not run on Travis CI", "true".equals(System.getenv("TRAVIS")));
final SocketAppender appender = loggerContextRule.getAppender("socket", SocketAppender.class);
final TcpSocketManager manager = (TcpSocketManager) appender.getManager();
final Socket socket = manager.getSocket();
[2/2] logging-log4j2 git commit: closes #79
Posted by mi...@apache.org.
closes #79
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b043f6a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b043f6a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b043f6a
Branch: refs/heads/master
Commit: 7b043f6a89dd5e3957493b8c079b905fb2489559
Parents: 64170cc
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Fri May 26 10:57:01 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Fri May 26 10:57:01 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------