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 2020/02/22 21:13:34 UTC
[sling-org-apache-sling-i18n] branch master updated (95eb584 ->
fc0b422)
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-i18n.git.
from 95eb584 Merge pull request #3 from Buuhuu/feature/SLING-8915
new dd8d770 style
new fc0b422 SLING-9110 Update Pax Exam to 4.13.2
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:
pom.xml | 2 +-
src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
[sling-org-apache-sling-i18n] 01/02: style
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-i18n.git
commit dd8d77052439c6f4544bc035b00da344e092b766
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 22:07:30 2020 +0100
style
---
src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java b/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
index 3b31b89..d6feee1 100644
--- a/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
+++ b/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
@@ -25,6 +25,7 @@ import org.ops4j.pax.exam.Option;
import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
@@ -32,7 +33,7 @@ public abstract class I18nTestSupport extends TestSupport {
@Configuration
public Option[] configuration() {
- return new Option[]{
+ return options(
baseConfiguration(),
quickstart(),
// Sling I18N
@@ -48,7 +49,7 @@ public abstract class I18nTestSupport extends TestSupport {
.put("whitelist.bundles.regexp", "PAXEXAM-PROBE-.*")
.asOption(),
junitBundles()
- };
+ );
}
protected Option quickstart() {
[sling-org-apache-sling-i18n] 02/02: SLING-9110 Update Pax Exam to
4.13.2
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-i18n.git
commit fc0b4221679ebf9b704f2fab05fbbb40e7542776
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Feb 22 22:09:27 2020 +0100
SLING-9110 Update Pax Exam to 4.13.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9fee8f4..53ddb7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<description>Support for creating Java I18N ResourceBundles from repository resources.</description>
<properties>
- <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
</properties>
<scm>