You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/06 20:54:55 UTC
[aries] branch trunk updated (99c7cfe -> 66d053f)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git.
from 99c7cfe Merge pull request #118 from rotty3000/trunk
new 156b3c7 reformat with spaces
new 66d053f assure tests succeed when javadoc and source are built
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
spi-fly/spi-fly-itests/logback.xml | 32 +++++++++++-----------
.../apache/aries/spifly/itests/InitialTest.java | 5 +++-
spi-fly/spi-fly-itests/test.bndrun | 28 +++++++++----------
3 files changed, 34 insertions(+), 31 deletions(-)
[aries] 01/02: reformat with spaces
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 156b3c77548326a58b2be2989fa2e29d84a672b3
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Tue Apr 6 16:30:44 2021 -0400
reformat with spaces
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/spi-fly-itests/logback.xml | 32 ++++++++++++++++----------------
spi-fly/spi-fly-itests/test.bndrun | 28 ++++++++++++++--------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/spi-fly/spi-fly-itests/logback.xml b/spi-fly/spi-fly-itests/logback.xml
index 1bfb558..6a51070 100644
--- a/spi-fly/spi-fly-itests/logback.xml
+++ b/spi-fly/spi-fly-itests/logback.xml
@@ -1,35 +1,35 @@
<!--
Copyright (c) Contributors to the Eclipse Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
SPDX-License-Identifier: Apache-2.0
-->
<configuration>
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%-4relative [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern>
- </encoder>
- </appender>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-4relative [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern>
+ </encoder>
+ </appender>
- <logger name="org.osgi.test" level="DEBUG"/>
+ <logger name="org.osgi.test" level="DEBUG"/>
- <root level="WARN">
- <appender-ref ref="STDOUT" />
- </root>
+ <root level="WARN">
+ <appender-ref ref="STDOUT" />
+ </root>
</configuration>
diff --git a/spi-fly/spi-fly-itests/test.bndrun b/spi-fly/spi-fly-itests/test.bndrun
index 9670348..d3ce4b4 100644
--- a/spi-fly/spi-fly-itests/test.bndrun
+++ b/spi-fly/spi-fly-itests/test.bndrun
@@ -51,17 +51,17 @@
bnd.identity;id='junit-platform-launcher'
-runbundles: \
- assertj-core;version='[3.19.0,3.19.1)',\
- junit-jupiter-api;version='[5.7.1,5.7.2)',\
- junit-jupiter-engine;version='[5.7.1,5.7.2)',\
- junit-platform-commons;version='[1.7.1,1.7.2)',\
- junit-platform-engine;version='[1.7.1,1.7.2)',\
- junit-platform-launcher;version='[1.7.1,1.7.2)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.3,1.3.4)',\
- org.apache.aries.spifly.examples.spi.bundle;version='[1.0.1,1.0.2)',\
- org.apache.aries.spifly.itests;version='[1.3.3,1.3.4)',\
- org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\
- org.opentest4j;version='[1.2.0,1.2.1)',\
- org.osgi.test.assertj.framework;version='[0.10.0,0.10.1)',\
- org.osgi.test.common;version='[0.10.0,0.10.1)',\
- org.osgi.test.junit5;version='[0.10.0,0.10.1)'
+ assertj-core;version='[3.19.0,3.19.1)',\
+ junit-jupiter-api;version='[5.7.1,5.7.2)',\
+ junit-jupiter-engine;version='[5.7.1,5.7.2)',\
+ junit-platform-commons;version='[1.7.1,1.7.2)',\
+ junit-platform-engine;version='[1.7.1,1.7.2)',\
+ junit-platform-launcher;version='[1.7.1,1.7.2)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.3,1.3.4)',\
+ org.apache.aries.spifly.examples.spi.bundle;version='[1.0.1,1.0.2)',\
+ org.apache.aries.spifly.itests;version='[1.3.3,1.3.4)',\
+ org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\
+ org.opentest4j;version='[1.2.0,1.2.1)',\
+ org.osgi.test.assertj.framework;version='[0.10.0,0.10.1)',\
+ org.osgi.test.common;version='[0.10.0,0.10.1)',\
+ org.osgi.test.junit5;version='[0.10.0,0.10.1)'
[aries] 02/02: assure tests succeed when javadoc and source are
built
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 66d053f38df85e3125c2cade978449dc5f522bca
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Tue Apr 6 16:31:38 2021 -0400
assure tests succeed when javadoc and source are built
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../src/main/java/org/apache/aries/spifly/itests/InitialTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java b/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java
index 716fd09..12a26e0 100644
--- a/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java
+++ b/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java
@@ -181,7 +181,10 @@ public class InitialTest {
assertThat(bundle1TargetDirPath).exists();
return Files.list(bundle1TargetDirPath).filter(
- p -> p.getFileName().toString().endsWith(".jar")
+ p -> {
+ String name = p.getFileName().toString();
+ return name.endsWith(".jar") && !name.endsWith("-javadoc.jar") && !name.endsWith("-sources.jar");
+ }
).findFirst().orElseThrow(
() -> new FileNotFoundException("Could not find jar for " + mavenModuleName)
);