You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2019/08/30 19:42:59 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(03555cc -> f8a1019)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
from 03555cc SLING-8590 Provide REST Assured Option
new bc05117 SLING-8589 Provide Awaitility Option
new f8a1019 SLING-8146 Update options and versions to latest features
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:
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 2 +-
src/main/resources/templates/SlingOptions.hbs | 2 ++
src/main/resources/templates/SlingVersionResolver.hbs | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
[sling-org-apache-sling-testing-paxexam] 02/02: SLING-8146 Update
options and versions to latest features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit f8a10194fb6c2060fd8a57145860ebcd1482fcec
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Aug 30 21:36:49 2019 +0200
SLING-8146 Update options and versions to latest features
Fix scr option in template
---
src/main/resources/templates/SlingOptions.hbs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs
index 23d3c13..fb1d56f 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -107,6 +107,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.metatype").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.scr").version(versionResolver),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.function").version(versionResolver),
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.promise").version(versionResolver),
config()
);
}
[sling-org-apache-sling-testing-paxexam] 01/02: SLING-8589 Provide
Awaitility Option
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit bc05117bb5bf7643b17d668c027896814470f95e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Aug 30 21:31:59 2019 +0200
SLING-8589 Provide Awaitility Option
Use Awaitility 4.0.0
---
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 2 +-
src/main/resources/templates/SlingVersionResolver.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index a539402..f596715 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -60,7 +60,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
- versions.put("org.awaitility:awaitility", "4.0.0-rc1");
+ versions.put("org.awaitility:awaitility", "4.0.0");
versions.put("org.codehaus.groovy:groovy", "2.5.0");
versions.put("org.codehaus.groovy:groovy-json", "2.5.0");
versions.put("org.codehaus.groovy:groovy-xml", "2.5.0");
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index db793ef..48ae121 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -60,7 +60,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.metatype", "1.2.2");
versions.put("org.apache.felix:org.apache.felix.scr", "2.1.16");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.12");
- versions.put("org.awaitility:awaitility", "4.0.0-rc1");
+ versions.put("org.awaitility:awaitility", "4.0.0");
versions.put("org.codehaus.groovy:groovy", "2.5.0");
versions.put("org.codehaus.groovy:groovy-json", "2.5.0");
versions.put("org.codehaus.groovy:groovy-xml", "2.5.0");