You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/02/15 05:45:20 UTC
logging-log4j2 git commit: Fix build on Windows (as seen on my
machine and the build VM).
Repository: logging-log4j2
Updated Branches:
refs/heads/master 830924b0b -> f34bb4332
Fix build on Windows (as seen on my machine and the build VM).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f34bb433
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f34bb433
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f34bb433
Branch: refs/heads/master
Commit: f34bb43321e3ff2b22492e51d5a38709f4d9e1e9
Parents: 830924b
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Feb 14 21:45:17 2017 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Feb 14 21:45:17 2017 -0800
----------------------------------------------------------------------
log4j-api/pom.xml | 1 +
.../java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f34bb433/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index c0f3bf4..0885485 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -122,6 +122,7 @@
<Import-Package>
sun.reflect;resolution:=optional,
org.apache.logging.log4j.core.osgi;resolution:=optional,
+ org.apache.logging.log4j.core.util;resolution:=optional,
*
</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.util.Activator</Bundle-Activator>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f34bb433/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
index 9821c3b..6832157 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
@@ -56,7 +56,9 @@ public class OsgiRule extends ExternalResource {
// Cleans framework before first init. Subsequent init invocations do not clean framework.
configMap.put("org.osgi.framework.storage.clean", "onFirstInit");
configMap.put("felix.log.level", "4");
- configMap.put("eclipse.log.level", "ALL");
+ configMap.put("eclipse.log.level", "ALL");
+ // Hack to get the build working on Windows. Could try newer versions of Felix.
+ configMap.put("felix.cache.locking", "false");
// Delegates loading of endorsed libraries to JVM classloader
// config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*");
framework = factory.newFramework(configMap);
Fwd: logging-log4j2 git commit: Fix build on Windows (as seen on my
machine and the build VM).
Posted by Matt Sicker <bo...@gmail.com>.
I haven't worked with OSGi in several months now, but that added
import-package looks very odd. Technically, I think the bnd plugin is
supposed to automatically figure that one out (importing packages from
within the same jar), and besides, I wouldn't think there'd be a class
visibility issue from within the same jar.
---------- Forwarded message ----------
From: <gg...@apache.org>
Date: 14 February 2017 at 23:45
Subject: logging-log4j2 git commit: Fix build on Windows (as seen on my
machine and the build VM).
To: commits@logging.apache.org
Repository: logging-log4j2
Updated Branches:
refs/heads/master 830924b0b -> f34bb4332
Fix build on Windows (as seen on my machine and the build VM).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/
commit/f34bb433
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f34bb433
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f34bb433
Branch: refs/heads/master
Commit: f34bb43321e3ff2b22492e51d5a38709f4d9e1e9
Parents: 830924b
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Feb 14 21:45:17 2017 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Feb 14 21:45:17 2017 -0800
----------------------------------------------------------------------
log4j-api/pom.xml | 1 +
.../java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
f34bb433/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index c0f3bf4..0885485 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -122,6 +122,7 @@
<Import-Package>
sun.reflect;resolution:=optional,
org.apache.logging.log4j.core.osgi;resolution:=optional,
+ org.apache.logging.log4j.core.util;resolution:=optional,
*
</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.util.Activator</
Bundle-Activator>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/
f34bb433/log4j-osgi/src/test/java/org/apache/logging/log4j/
osgi/tests/junit/OsgiRule.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/
tests/junit/OsgiRule.java
index 9821c3b..6832157 100644
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/
tests/junit/OsgiRule.java
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/
tests/junit/OsgiRule.java
@@ -56,7 +56,9 @@ public class OsgiRule extends ExternalResource {
// Cleans framework before first init. Subsequent init invocations
do not clean framework.
configMap.put("org.osgi.framework.storage.clean", "onFirstInit");
configMap.put("felix.log.level", "4");
- configMap.put("eclipse.log.level", "ALL");
+ configMap.put("eclipse.log.level", "ALL");
+ // Hack to get the build working on Windows. Could try newer
versions of Felix.
+ configMap.put("felix.cache.locking", "false");
// Delegates loading of endorsed libraries to JVM classloader
// config.put("org.osgi.framework.bootdelegation",
"javax.*,org.w3c.*,org.xml.*");
framework = factory.newFramework(configMap);
--
Matt Sicker <bo...@gmail.com>