You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2018/01/30 22:51:17 UTC
[sling-org-apache-sling-jcr-repoinit] branch issues/SLING-7454
created (now f4a4673)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch issues/SLING-7454
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git.
at f4a4673 SLING-7454: Make the IT use the latest repoinit snapshots, enable disabled IT's that require the newer snapshots, and improve backwardscompatibilty by dependening on older version.
This branch includes the following new commits:
new f4a4673 SLING-7454: Make the IT use the latest repoinit snapshots, enable disabled IT's that require the newer snapshots, and improve backwardscompatibilty by dependening on older version.
The 1 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.
--
To stop receiving notification emails like this one, please contact
pauls@apache.org.
[sling-org-apache-sling-jcr-repoinit] 01/01: SLING-7454: Make the
IT use the latest repoinit snapshots,
enable disabled IT's that require the newer snapshots,
and improve backwardscompatibilty by dependening on older version.
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-7454
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit f4a46739717b40f1e3ac7b61a2e20f03f0af2a4c
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Jan 30 23:51:07 2018 +0100
SLING-7454: Make the IT use the latest repoinit snapshots, enable disabled IT's that require the newer snapshots, and improve backwardscompatibilty by dependening on older version.
---
pom.xml | 15 +++++++++++----
.../apache/sling/jcr/repoinit/it/ProvisioningModelIT.java | 1 -
src/test/provisioning/repoinit-tests.txt | 9 ++++++---
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index c6e82eb..424be6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
</description>
<properties>
- <jackrabbit.version>2.17.0</jackrabbit.version>
- <oak.version>1.7.12</oak.version>
+ <jackrabbit.version>2.10.0</jackrabbit.version>
+ <oak.version>1.6.1</oak.version>
<http.host>localhost</http.host>
<sling.default.vm.options>-Xmx1024m -XX:MaxPermSize=256m -Djava.awt.headless=true</sling.default.vm.options>
</properties>
@@ -110,35 +110,40 @@
<!-- the Sling instance is provisioned from the model in src/main/provisioning/model.txt -->
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.0</version>
+ <version>1.7.16</version>
<extensions>true</extensions>
<executions>
<execution>
<id>prepare-launchpad-package</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>prepare-package</goal>
</goals>
</execution>
<execution>
<id>build-launchpad-package</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>package</goal>
</goals>
</execution>
<execution>
<id>start-container-before-IT</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop-container-after-IT</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
<configuration>
+ <usePomDependencies>true</usePomDependencies>
<servers>
<server>
<id>singleinstance</id>
@@ -154,12 +159,14 @@
<executions>
<execution>
<id>integration-test</id>
+ <phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
<execution>
<id>verify</id>
+ <phase>integration-test</phase>
<goals>
<goal>verify</goal>
</goals>
@@ -264,7 +271,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.8.4</version>
+ <version>1.8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/jcr/repoinit/it/ProvisioningModelIT.java b/src/test/java/org/apache/sling/jcr/repoinit/it/ProvisioningModelIT.java
index 25faa51..ee95ee9 100644
--- a/src/test/java/org/apache/sling/jcr/repoinit/it/ProvisioningModelIT.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/it/ProvisioningModelIT.java
@@ -63,7 +63,6 @@ public class ProvisioningModelIT {
}
@Test
- @Ignore("TODO - need more recent bundles for this test")
public void userDisabled() throws Exception {
assertTrue(String.format("Expecting user %s to be disabled", THIRD_TEST_USER), U.userIsDisabled(session, THIRD_TEST_USER));
assertFalse(String.format("Expecting user %s to be enabled", TEST_USER), U.userIsDisabled(session,TEST_USER));
diff --git a/src/test/provisioning/repoinit-tests.txt b/src/test/provisioning/repoinit-tests.txt
index 0bba129..1c881e8 100644
--- a/src/test/provisioning/repoinit-tests.txt
+++ b/src/test/provisioning/repoinit-tests.txt
@@ -19,6 +19,10 @@
[feature name=repoinit-tests]
+[artifacts]
+ org.apache.sling/org.apache.sling.repoinit.parser
+ org.apache.sling/org.apache.sling.jcr.repoinit
+
[configurations]
org.apache.sling.jcr.repoinit.impl.RepositoryInitializer
references=["model:context:/resources/provisioning/model.txt","model@repoinitTwo:context:/resources/provisioning/model.txt"]
@@ -36,8 +40,7 @@ end
create service user thirdUserFromProvisioningModel
-# TODO need more recent snapshots than sling 9 for this
-# disable service user thirdUserFromProvisioningModel : "Disabled for testing reason"
+disable service user thirdUserFromProvisioningModel : "Disabled for testing reason"
register namespace (slingtest) http://sling.apache.org/ns/test/repoinit-it/v1.0
@@ -49,4 +52,4 @@ register nodetypes
# second section, to test multiple configured URLs supplied in config
[:repoinitTwo]
-create service user secondUserFromProvisioningModel
\ No newline at end of file
+create service user secondUserFromProvisioningModel
--
To stop receiving notification emails like this one, please contact
pauls@apache.org.