Update org.assertj from 3.14.0 to 3.20.2
CQ: 23501
Change-Id: Ie261eab3beb1cacf40d10cde5dca7c632cc215e8
diff --git a/assertj/org.assertj_3.14.0/osgi.bnd b/assertj/org.assertj_3.14.0/osgi.bnd
deleted file mode 100644
index 859e56e..0000000
--- a/assertj/org.assertj_3.14.0/osgi.bnd
+++ /dev/null
@@ -1,14 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-junit-version-range=${range;[===,+);4.12}junit-version=${version;===;4.12}
-junit-jupiter-api-version-range=${range;[===,+);5.5.2}junit-jupiter-api-version=${version;===;5.5.2}
-opentest4j-version-range=${range;[===,+);1.2.0}opentest4j-version=${version;===;1.2.0}
-jsr305-version-range=${range;[===,+);3.0.2}jsr305-version=${version;===;3.0.2}
-hamcrest-version-range=${range;[===,+);2.2}hamcrest-version=${version;===;2.2}
-
-Export-Package: \
- !about.html,!about_files, \
- *.internal.*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
-
-Import-Package: \
- *;resolution:=optional
diff --git a/assertj/org.assertj_3.20.2/osgi.bnd b/assertj/org.assertj_3.20.2/osgi.bnd
new file mode 100644
index 0000000..b646175
--- /dev/null
+++ b/assertj/org.assertj_3.20.2/osgi.bnd
@@ -0,0 +1,15 @@
+package-version=${version;===;${Bundle-Version}}
+
+Export-Package: \
+ !about.html,!about_files, \
+ *.internal.*;x-internal:=true;version="${package-version}";-noimport:=true, \
+ org.assertj.core.*;version="${package-version}";-noimport:=true
+
+Import-Package: \
+ org.hamcrest.*;resolution:=optional;version="${range;[===,+);2.2}", \
+ org.junit.jupiter.api.*;resolution:=optional;version="${range;[===,+);5.7}",\
+ org.junit.platform.commons.*;resolution:=optional;version="${range;[===,+);1.7}",\
+ org.opentest4j.*;resolution:=optional;version="${range;[===,+);1.2}",\
+ *;resolution:=optional
+
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.8))"
\ No newline at end of file
diff --git a/assertj/org.assertj_3.14.0/pom.xml b/assertj/org.assertj_3.20.2/pom.xml
similarity index 91%
rename from assertj/org.assertj_3.14.0/pom.xml
rename to assertj/org.assertj_3.20.2/pom.xml
index 9bf7353..5c74a3e 100644
--- a/assertj/org.assertj_3.14.0/pom.xml
+++ b/assertj/org.assertj_3.20.2/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.assertj</artifactId>
- <version>3.14.0-SNAPSHOT</version>
+ <version>3.20.2-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>AssertJ fluent assertions</name>
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.14.0</version>
+ <version>3.20.2</version>
</dependency>
</dependencies>
</project>
diff --git a/assertj/org.assertj_3.14.0/src/eclipse/ip_log.xml b/assertj/org.assertj_3.20.2/src/eclipse/ip_log.xml
similarity index 69%
rename from assertj/org.assertj_3.14.0/src/eclipse/ip_log.xml
rename to assertj/org.assertj_3.20.2/src/eclipse/ip_log.xml
index 8a4c0d7..48fd9dc 100644
--- a/assertj/org.assertj_3.14.0/src/eclipse/ip_log.xml
+++ b/assertj/org.assertj_3.20.2/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.assertj" version="3.14.0" status="done">
+ <project id="org.assertj" version="3.20.2" status="done">
<info>
<name>AssertJ fluent assertions</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
@@ -12,12 +12,13 @@
<company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21441"/>
+ <ipzilla bug_id="23501"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/org.assertj/assertj-core/3.20.2"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>assertj-core-3.14.0.jar</package>
+ <package>assertj-core-3.20.2.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/assertj/org.assertj_3.14.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/assertj/org.assertj_3.20.2/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from assertj/org.assertj_3.14.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to assertj/org.assertj_3.20.2/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/assertj/org.assertj_3.14.0/src/main/resources/about.html b/assertj/org.assertj_3.20.2/src/main/resources/about.html
similarity index 100%
rename from assertj/org.assertj_3.14.0/src/main/resources/about.html
rename to assertj/org.assertj_3.20.2/src/main/resources/about.html
diff --git a/assertj/org.assertj_3.14.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt b/assertj/org.assertj_3.20.2/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
similarity index 100%
rename from assertj/org.assertj_3.14.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
rename to assertj/org.assertj_3.20.2/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
diff --git a/assertj/pom.xml b/assertj/pom.xml
index 608f9a8..48692ac 100644
--- a/assertj/pom.xml
+++ b/assertj/pom.xml
@@ -15,7 +15,7 @@
<name>Eclipse Orbit :: AssertJ Recipes</name>
<modules>
- <module>org.assertj_3.14.0</module>
+ <module>org.assertj_3.20.2</module>
</modules>
</project>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 80eb92f..c2a2194 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -201,7 +201,7 @@
<plugin id="org.objectweb.asm.tree" version="9.1.0.qualifier"/>
<plugin id="org.objectweb.asm.util" version="9.1.0.qualifier"/>
- <plugin id="org.assertj" version="3.14.0.qualifier"/>
+ <plugin id="org.assertj" version="3.20.2.qualifier"/>
<plugin id="org.apache.commons.codec" version="1.14.0.qualifier"/>
<plugin id="org.apache.commons.logging" version="1.2.0.qualifier"/>
