Upgrade to JUnit 5

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index 4bab07aa14ac5e3ac723ccc55ef0410936e2285c..b988f8b7c9cded9a509ac78c5a9f76d4e4cc9477 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -290,19 +290,23 @@ public class A2Factory {
                                entries: while ((entry = jarIn.getNextJarEntry()) != null) {
                                        if (entry.isDirectory())
                                                continue entries;
-                                       if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
+                                       else if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
                                                continue entries;
-                                       if (entry.getName().startsWith("META-INF/versions/"))
+                                       else if (entry.getName().startsWith("META-INF/versions/"))
                                                continue entries;
-                                       if (entry.getName().startsWith("META-INF/maven/"))
+                                       else if (entry.getName().startsWith("META-INF/maven/"))
                                                continue entries;
-                                       if (entry.getName().equals("module-info.class"))
+                                       else if (entry.getName().equals("module-info.class"))
                                                continue entries;
-                                       if (entry.getName().equals("META-INF/NOTICE"))
+                                       else if (entry.getName().equals("META-INF/NOTICE"))
                                                continue entries;
-                                       if (entry.getName().equals("META-INF/NOTICE.txt"))
+                                       else if (entry.getName().equals("META-INF/NOTICE.txt"))
                                                continue entries;
-                                       if (entry.getName().equals("META-INF/LICENSE"))
+                                       else if (entry.getName().equals("META-INF/LICENSE"))
+                                               continue entries;
+                                       else if (entry.getName().equals("META-INF/LICENSE.md"))
+                                               continue entries;
+                                       else if (entry.getName().equals("META-INF/LICENSE-notice.md"))
                                                continue entries;
                                        Path target = targetBundleDir.resolve(entry.getName());
                                        Files.createDirectories(target.getParent());
@@ -920,9 +924,9 @@ public class A2Factory {
                Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
 
 //             factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
+//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
 //             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty.websocket"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
 //             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));

diff --git a/tp/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/tp/org.argeo.tp.sdk/junit-jupiter/merge.bnd
new file mode 100644 (file)
index 0000000..312584e
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/junit-jupiter/merge.bnd
@@ -0,0 +1,14 @@
+Bundle-License: EPL-2.0
+Bundle-SymbolicName: org.junit.jupiter
+SLC-Origin-M2: :5.8.2
+SLC-Origin-M2-Merge: \
+org.junit.jupiter:junit-jupiter-api, \
+org.junit.jupiter:junit-jupiter-engine, \
+org.junit.jupiter:junit-jupiter-params, \
+
+Export-Package: org.junit.jupiter.*
+
+Import-Package: \
+com.googlecode.openbeans.*;resolution:="optional", \
+kotlin.*;resolution:="optional", \
+*
\ No newline at end of file

diff --git a/tp/org.argeo.tp.sdk/junit-platform/merge.bnd b/tp/org.argeo.tp.sdk/junit-platform/merge.bnd
new file mode 100644 (file)
index 0000000..502ffa6
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/junit-platform/merge.bnd
@@ -0,0 +1,22 @@
+Bundle-License: EPL-2.0
+Bundle-SymbolicName: org.junit.platform
+SLC-Origin-M2: :1.8.2
+SLC-Origin-M2-Merge: \
+org.junit.platform:junit-platform-commons, \
+org.junit.platform:junit-platform-console, \
+org.junit.platform:junit-platform-engine, \
+org.junit.platform:junit-platform-reporting, \
+org.junit.platform:junit-platform-suite, \
+org.junit.platform:junit-platform-suite-api, \
+org.junit.platform:junit-platform-suite-commons, \
+org.junit.platform:junit-platform-suite-engine, \
+org.junit.platform:junit-platform-testkit, \
+org.junit.platform:junit-platform-launcher, \
+
+Export-Package: org.junit.platform.*
+
+Import-Package: \
+org.assertj.*;resolution:="optional", \
+groovy.lang.*;resolution:="optional", \
+org.fusesource.*;resolution:="optional", \
+*
\ No newline at end of file

diff --git a/tp/org.argeo.tp.sdk/org.apiguardian.bnd b/tp/org.argeo.tp.sdk/org.apiguardian.bnd
new file mode 100644 (file)
index 0000000..039c57a
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/org.apiguardian.bnd
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: org.apiguardian:apiguardian-api:1.1.2
\ No newline at end of file

diff --git a/tp/org.argeo.tp.sdk/org.hamcrest.bnd b/tp/org.argeo.tp.sdk/org.hamcrest.bnd
deleted file mode 100644 (file)
index f59732a..0000000
--- a/tp/org.argeo.tp.sdk/org.hamcrest.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-License: BSD-3-Clause
-Bundle-SymbolicName: org.hamcrest
-Bundle-Version: 2.1.0
-SLC-Origin-M2: org.hamcrest:hamcrest:2.2
-SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.sdk/org.hamcrest.core.bnd b/tp/org.argeo.tp.sdk/org.hamcrest.core.bnd
new file mode 100644 (file)
index 0000000..1a47046
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/org.hamcrest.core.bnd
@@ -0,0 +1,2 @@
+Bundle-License: BSD-3-Clause
+SLC-Origin-M2: org.hamcrest:hamcrest-core:1.3

diff --git a/tp/org.argeo.tp.sdk/org.junit.bnd b/tp/org.argeo.tp.sdk/org.junit.bnd
index 58bf1ca179027f41049362b2e5e46f02a3507900..414b102583d269cf37ac4766f1db891063e5ae38 100644 (file)
--- a/tp/org.argeo.tp.sdk/org.junit.bnd
+++ b/tp/org.argeo.tp.sdk/org.junit.bnd
@@ -1,6 +1,5 @@
 Bundle-License: EPL-1.0
 Bundle-SymbolicName: org.junit
-Bundle-Version: 4.12.0
 Import-Package: org.hamcrest;resolution:=optional,\
 org.hamcrest.core;resolution:=optional,\
 *

diff --git a/tp/org.argeo.tp.sdk/org.junit.vintage.bnd b/tp/org.argeo.tp.sdk/org.junit.vintage.bnd
new file mode 100644 (file)
index 0000000..c063891
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/org.junit.vintage.bnd
@@ -0,0 +1,2 @@
+Bundle-License: EPL-2.0
+SLC-Origin-M2: org.junit.vintage:junit-vintage-engine:5.8.2
\ No newline at end of file

diff --git a/tp/org.argeo.tp.sdk/org.opentest4j.bnd b/tp/org.argeo.tp.sdk/org.opentest4j.bnd
new file mode 100644 (file)
index 0000000..c959b42
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/org.opentest4j.bnd
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: org.opentest4j:opentest4j:1.2.0
\ No newline at end of file