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 2018/03/04 13:10:16 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(8239bbb -> 1848fa5)
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 8239bbb SLING-7438 Update options and versions to Oak 1.8
new 10351e6 SLING-7530 Remove Launchpad Content Option
new 2b5a194 style
new 1848fa5 SLING-7491 Update options and versions to latest features
The 3 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 | 13 +++---
.../apache/sling/testing/paxexam/SlingOptions.java | 9 ----
.../testing/paxexam/SlingVersionResolver.java | 27 ++++++------
.../apache/sling/testing/paxexam/package-info.java | 2 +-
.../resources/templates/SlingVersionResolver.hbs | 4 +-
.../tests/SlingOptionsSlingLaunchpadContentIT.java | 48 ----------------------
6 files changed, 23 insertions(+), 80 deletions(-)
delete mode 100644 src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 03/03: SLING-7491 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 1848fa590fc463a2a43e011186c17319c2786a61
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Mar 4 14:08:30 2018 +0100
SLING-7491 Update options and versions to latest features
---
.../testing/paxexam/SlingVersionResolver.java | 26 +++++++++++-----------
.../resources/templates/SlingVersionResolver.hbs | 4 ++--
2 files changed, 15 insertions(+), 15 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 081e108..e96146d 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -71,7 +71,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.4");
versions.put("com.google.guava:guava", "15.0");
versions.put("com.h2database:h2-mvstore", "1.4.196");
- versions.put("com.sun.mail:javax.mail", "1.6.0");
+ versions.put("com.sun.mail:javax.mail", "1.6.1");
versions.put("commons-codec:commons-codec", "1.11");
versions.put("commons-collections:commons-collections", "3.2.2");
versions.put("commons-fileupload:commons-fileupload", "1.3.3");
@@ -80,7 +80,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("io.dropwizard.metrics:metrics-core", "3.2.6");
versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.0.14-0000");
versions.put("javax.jcr:jcr", "2.0");
- versions.put("javax.mail:javax.mail-api", "1.6.0");
+ versions.put("javax.mail:javax.mail-api", "1.6.1");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
versions.put("org.apache.commons:commons-collections4", "4.1");
versions.put("org.apache.commons:commons-email", "1.5");
@@ -89,7 +89,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.jaas", "1.0.2");
versions.put("org.apache.felix:org.apache.felix.prefs", "1.1.0");
- versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage", "1.0.6");
+ versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage", "1.0.8");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.4");
versions.put("org.apache.geronimo.bundles:commons-httpclient", "3.1_2");
versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.0");
@@ -120,7 +120,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.jackrabbit:oak-store-composite", "1.8.2");
versions.put("org.apache.jackrabbit:oak-store-document", "1.8.2");
versions.put("org.apache.jackrabbit:oak-store-spi", "1.8.2");
- versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.42");
+ versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.44");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.4_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.8_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter", "4.0.4_1");
@@ -162,7 +162,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.hc.webconsole", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.12");
versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.10");
+ versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.12");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.installer.hc", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.installer.provider.file", "1.1.0");
@@ -196,7 +196,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.2");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.8");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.34");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.36");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.2.0");
versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.54");
@@ -205,9 +205,9 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "3.0.4");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.4");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp.taglib", "2.2.6");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.46");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.16");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.18");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.48-1.3.1");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.20-1.3.1");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.22-1.3.1");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.26");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.0");
@@ -224,11 +224,11 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.tika:tika-bundle", "1.17");
versions.put("org.apache.tika:tika-core", "1.17");
versions.put("org.attoparser:attoparser", "2.0.4.RELEASE");
- versions.put("org.codehaus.groovy:groovy", "2.4.13");
- versions.put("org.codehaus.groovy:groovy-json", "2.4.13");
- versions.put("org.codehaus.groovy:groovy-templates", "2.4.13");
+ versions.put("org.codehaus.groovy:groovy", "2.4.14");
+ versions.put("org.codehaus.groovy:groovy-json", "2.4.14");
+ versions.put("org.codehaus.groovy:groovy-templates", "2.4.14");
versions.put("org.javassist:javassist", "3.22.0-GA");
- versions.put("org.mongodb:mongo-java-driver", "3.6.2");
+ versions.put("org.mongodb:mongo-java-driver", "3.6.3");
versions.put("org.unbescape:unbescape", "1.1.5.RELEASE");
}
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 99db376..2a54509 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -44,8 +44,8 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.8");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.3");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
- versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.7");
- versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5");
+ versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.8");
+ versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.2.0");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.6");
versions.put("org.apache.felix:org.apache.felix.scr", "2.0.14");
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 01/03: SLING-7530 Remove
Launchpad Content 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 10351e6cba9d3e9f15084ffeba59fc47f1a1912a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Mar 4 13:59:16 2018 +0100
SLING-7530 Remove Launchpad Content Option
---
pom.xml | 2 +-
.../apache/sling/testing/paxexam/SlingOptions.java | 9 ----
.../testing/paxexam/SlingVersionResolver.java | 1 -
.../apache/sling/testing/paxexam/package-info.java | 2 +-
.../tests/SlingOptionsSlingLaunchpadContentIT.java | 48 ----------------------
5 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index 41bbc14..34edb2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Sling Testing PaxExam</name>
<description>Test support for use with Pax Exam.</description>
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index a44e849..45088a6 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -604,15 +604,6 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadContent() {
- return composite(
- sling(),
- slingAuthForm(),
- composum(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.content").version(versionResolver)
- );
- }
-
public static Option slingNosqlGeneric() {
return composite(
sling(),
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 8ee2187..081e108 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -182,7 +182,6 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.jcr.webconsole", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.8");
versions.put("org.apache.sling:org.apache.sling.jmx.provider", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.12");
versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.6");
versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.6");
versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/package-info.java b/src/main/java/org/apache/sling/testing/paxexam/package-info.java
index 3cbb5fa..0d44b0e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/package-info.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("2.0.0")
+@Version("3.0.0")
package org.apache.sling.testing.paxexam;
import org.osgi.annotation.versioning.Version;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
deleted file mode 100644
index f4efadc..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.it.tests;
-
-import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadContent;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingLaunchpadContentIT extends SlingOptionsTestSupport {
-
- @Configuration
- public Option[] configuration() {
- return new Option[]{
- baseConfiguration(),
- slingLaunchpadContent()
- };
- }
-
- @Test
- public void test() {
- }
-
-}
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 02/03: 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-testing-paxexam.git
commit 2b5a194ed842a0e8e514a322559aebf87b4fb4cb
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Mar 4 14:07:29 2018 +0100
style
---
pom.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 34edb2e..6bc2be6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,12 @@
<artifactId>tinybundles</artifactId>
<version>3.0.0</version>
</dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -152,11 +158,6 @@
<version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.