Author: rotty3000
Date: Thu Jun 21 16:57:38 2018
New Revision: 1834029
URL: http://svn.apache.org/viewvc?rev=1834029&view=rev
Log:
[logback] maven ignores
Modified:
felix/trunk/logback/ (props changed)
felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun
felix/trunk/logback/itests/pom.xml
felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun
Propchange: felix/trunk/logback/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 21 16:57:38 2018
@@ -0,0 +1,22 @@
+itests/immediate-equinox-logservice/target
+itests/immediate-felix-logservice/target
+itests/immediate-jbl/target
+itests/immediate-jcl/target
+itests/immediate-jul/target
+itests/immediate-log4j1/target
+itests/immediate-log4j2/target
+itests/immediate-slf4j/target
+itests/standard-equinox-logservice/target
+itests/standard-felix-logservice/target
+itests/standard-jbl/target
+itests/standard-jcl/target
+itests/standard-jul/target
+itests/standard-log4j1/target
+itests/standard-log4j2/target
+itests/standard-slf4j/target
+itests/target
+itests/test-helper/target
+logback/release.properties
+logback/target
+release.properties
+target
Modified: felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun?rev=1834029&r1=1834028&r2=1834029&view=diff
==============================================================================
--- felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun
(original)
+++ felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun Thu Jun
21 16:57:38 2018
@@ -11,9 +11,10 @@
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
slf4j.api;version='[1.7.25,1.7.26)',\
- org.apache.felix.log;version=latest,\
org.apache.felix.logback;version=latest
+# org.apache.felix.log;version=latest,\
+
-runproperties: \
logback.configurationFile=file:${.}/logback.xml
Modified: felix/trunk/logback/itests/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/logback/itests/pom.xml?rev=1834029&r1=1834028&r2=1834029&view=diff
==============================================================================
--- felix/trunk/logback/itests/pom.xml (original)
+++ felix/trunk/logback/itests/pom.xml Thu Jun 21 16:57:38 2018
@@ -111,12 +111,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.version}</version>
Modified: felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun?rev=1834029&r1=1834028&r2=1834029&view=diff
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun (original)
+++ felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun Thu Jun
21 16:57:38 2018
@@ -8,9 +8,9 @@
-runrequires:\
osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.felix.logservice)'
+# osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\
# osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
-runproperties: \
@@ -23,7 +23,6 @@
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)',\
- org.apache.felix.log;version='[1.1.0,1.1.1)',\
org.osgi.service.log;version='[1.4.0,1.4.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)',\
