You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:12:24 UTC
[sling-org-apache-sling-scripting-sightly-testing-content]
annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
created (now 91730da)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git.
at 91730da (tag)
tagging 38f3fb1aa8e8c96dec5510c0a996e8f827f6ae0b (commit)
by Radu Cotescu
on Thu Apr 9 16:28:43 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.scripting.sightly.testing-content-1.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 8157d06 SLING-3959 - Sightly contribution
new 027700f SLING-4167 - The Sightly implementation should provide support for escaped expressions
new 5135230 SLING-4323 Fix SCM locations
new ddf5e16 SLING-4357 Update Sightly IT
new eabce98 SLING-4419 - [Regression] Sling Models cannot be used with Sightly Java Use-API
new 8371069 SLING-4402 - The selector manipulation options for data-sly-resource should accept string arrays
new b3e3563 SLING-4423 - Add support for URI Manipulation options
new 5fcb673 SLING-4358 - Add the 'Provide-Capability' OSGi header to the org.apache.sling.scripting.sightly bundle
new 24f8e42 SLING-4441 - The JavaUseProvider should return a failure for any exception encountered during Use object retrieval
new d109e1c trivial: updated to latest version of the io.sightly.tck
new 5c9c89d SLING-4483 - Sightly: data-sly-resource does not properly resolve relative paths
new 4822be2 SLING-4489 - Sightly: Hyphenated identifiers cause a compilation exception in Sightly generated Java classes
new 8dd4cab SLING-4493 Sightly: Create performance tests
new c5a01c0 SLING-4506 - Java APIs not consistently available in JavaScript
new d6a67a9 @trivial: added license headers to pass RAT check
new f74f274 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.0
new b64c5ca [maven-release-plugin] prepare for next development iteration
new 80fe7a2 SLING-4546 - Sightly: Improper handling of extension and selectors by data-sly-resource
new 8a809e2 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.2
new 828c761 [maven-release-plugin] prepare for next development iteration
new 3018619 SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
new 81012ad [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
new 17a86ca [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
new 0dbb154 [maven-release-plugin] prepare for next development iteration
new 59287b7 releng: rolled back Apache Sling Scripting JS Use Provider 1.0.2
new 7693ce0 SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
new 1e765e0 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
new c7dfcab [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
new 133a7bb [maven-release-plugin] prepare for next development iteration
new eaf97a9 releng: prepare sightly dependencies pre-release
new fc5a4f5 [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
new 38f3fb1 [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
The 32 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
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-scripting-sightly-testing-content] 04/13:
[maven-release-plugin] copy for tag
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 17a86ca94ded0c9f6d5682ddb63fbcaa0dd7de36
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Apr 7 15:14:00 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4@1671873 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 08/13:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 1e765e009eb9d5d98f72e9000b97e09760526229
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 15:09:53 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672388 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 229cb04..12e9c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 06/13:
releng: rolled back Apache Sling Scripting JS Use Provider 1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 59287b7960c53fae0cdd9ceb15691a6b782be4d7
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 15:01:18 2015 +0000
releng: rolled back Apache Sling Scripting JS Use Provider 1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672382 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a9b5c7f..229cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 05/13:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 0dbb154629ade1bbc7b2524e2a5d6ecbd3ab8f7f
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Apr 7 15:14:04 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1671874 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12e9c7d..a9b5c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 13/13:
[maven-release-plugin] copy for tag
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 38f3fb1aa8e8c96dec5510c0a996e8f827f6ae0b
Merge: c7dfcab fc5a4f5
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 16:28:43 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4@1672415 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 01/13:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 828c761fba26c7331ef9724f95b01e3417eaa614
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 2 10:08:53 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1670877 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 55b8372..229cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 09/13:
[maven-release-plugin] copy for tag
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit c7dfcab8aff5065d3b1eddf07902075648626f09
Merge: 17a86ca 1e765e0
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 15:10:05 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4@1672389 13f79535-47bb-0310-9956-ffa450edef68
src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 12/13:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit fc5a4f5ac91edfa7348f19e56233eb00d83ba0a6
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 16:28:31 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672414 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 229cb04..12e9c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 03/13:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.testing-content-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 81012ad83db4f75b4f62874cdffd8beeb29057c1
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Apr 7 15:13:46 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.testing-content-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1671872 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 229cb04..12e9c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 07/13:
SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 7693ce035ee6bb1553f619516d9486e70ee6478e
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 15:01:41 2015 +0000
SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
* script dependency resolution now also takes into account relative paths for
sling:resourceSuperType
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672383 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json
index 47aa682..cf20608 100644
--- a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json
@@ -9,6 +9,6 @@
},
"child": {
"jcr:primaryType": "sling:Folder",
- "sling:resourceSuperType": "/apps/sightly/scripts/useinheritance/parent"
+ "sling:resourceSuperType": "sightly/scripts/useinheritance/parent"
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 11/13:
releng: prepare sightly dependencies pre-release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit eaf97a926a2d2f2247d40ec45f5d8d1cdebf1da1
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 16:27:55 2015 +0000
releng: prepare sightly dependencies pre-release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672413 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a9b5c7f..229cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 02/13:
SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 3018619f24dda239a67f1c8a17da8dcdba24a5aa
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Apr 6 20:15:05 2015 +0000
SLING-4578 - Incorrect Sightly JS Use-API script dependency resolution
* explicitly check component inheritance when resolving script dependencies
* provided tests for Use API dependency inheritance
* made sure IT are run in the same order on all platforms
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1671688 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripts/siblingdeps/component/component.html | 27 +++++++++++++++++++
.../scripts/siblingdeps/component/dependency.js | 23 +++++++++++++++++
.../apps/sightly/scripts/siblingdeps/dependency.js | 23 +++++++++++++++++
.../apps/sightly/scripts/siblingdeps/script.js | 23 +++++++++++++++++
.../apps/sightly/scripts/useinheritance.json | 14 ++++++++++
.../sightly/scripts/useinheritance/child/S.java | 23 +++++++++++++++++
.../sightly/scripts/useinheritance/child/s.ecma | 1 +
.../apps/sightly/scripts/useinheritance/child/s.js | 5 ++++
.../scripts/useinheritance/child/templates.html | 19 ++++++++++++++
.../scripts/useinheritance/grandparent/S.java | 23 +++++++++++++++++
.../useinheritance/grandparent/grandparent.html | 30 ++++++++++++++++++++++
.../scripts/useinheritance/grandparent/s.ecma | 1 +
.../scripts/useinheritance/grandparent/s.js | 5 ++++
.../useinheritance/grandparent/templates.html | 19 ++++++++++++++
.../sightly/scripts/useinheritance/parent/S.java | 23 +++++++++++++++++
.../sightly/scripts/useinheritance/parent/s.ecma | 1 +
.../sightly/scripts/useinheritance/parent/s.js | 5 ++++
.../scripts/useinheritance/parent/templates.html | 19 ++++++++++++++
src/main/resources/SLING-INF/sightly.json | 8 ++++++
19 files changed, 292 insertions(+)
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html
new file mode 100644
index 0000000..9bfb90f
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/component.html
@@ -0,0 +1,27 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!doctype html>
+<html>
+ <head>
+ <title>Sightly JS Use-API dependency resolution</title>
+ </head>
+ <body>
+ <div id="js-rep-res" data-sly-use.js="/apps/sightly/scripts/siblingdeps/script.js">${js.result}</div>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/dependency.js b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/dependency.js
new file mode 100644
index 0000000..e887399
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/component/dependency.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+use(function () {
+ return {
+ result: '/apps/sightly/scripts/siblingdeps/component/dependency.js'
+ }
+});
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/dependency.js b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/dependency.js
new file mode 100644
index 0000000..7e1510b
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/dependency.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+use(function () {
+ return {
+ result: '/apps/sightly/scripts/siblingdeps/dependency.js'
+ }
+});
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/script.js b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/script.js
new file mode 100644
index 0000000..f396934
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/siblingdeps/script.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+use('dependency.js', function (dep) {
+ return {
+ result: dep.result
+ };
+});
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json
new file mode 100644
index 0000000..47aa682
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance.json
@@ -0,0 +1,14 @@
+{
+ "jcr:primaryType": "sling:Folder",
+ "grandparent": {
+ "jcr:primaryType": "sling:Folder"
+ },
+ "parent": {
+ "jcr:primaryType": "sling:Folder",
+ "sling:resourceSuperType": "/apps/sightly/scripts/useinheritance/grandparent"
+ },
+ "child": {
+ "jcr:primaryType": "sling:Folder",
+ "sling:resourceSuperType": "/apps/sightly/scripts/useinheritance/parent"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/S.java b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/S.java
new file mode 100644
index 0000000..c499920
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/S.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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 apps.sightly.scripts.useinheritance.child;
+
+public class S {
+ public static final String message = "child.javaobject";
+}
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.ecma b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.ecma
new file mode 100644
index 0000000..0b943e6
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.ecma
@@ -0,0 +1 @@
+"child.ecmaobject";
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.js b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.js
new file mode 100644
index 0000000..78f0894
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/s.js
@@ -0,0 +1,5 @@
+use(function () {
+ return {
+ message : 'child.javascriptobject'
+ };
+});
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/templates.html b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/templates.html
new file mode 100644
index 0000000..73c5d4a
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/templates.html
@@ -0,0 +1,19 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<template data-sly-template.template>child.template</template>
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/S.java b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/S.java
new file mode 100644
index 0000000..aa99182
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/S.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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 apps.sightly.scripts.useinheritance.grandparent;
+
+public class S {
+ public static final String message = "grandparent.javaobject";
+}
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html
new file mode 100644
index 0000000..eb7c834
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/grandparent.html
@@ -0,0 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Sightly Use-API - Inheritance</title>
+</head>
+<body>
+ <div id="javaobj" data-sly-use.javaobj="S">${javaobj.message}</div>
+ <div id="javascriptobj" data-sly-use.javascriptobj="s.js">${javascriptobj.message}</div>
+ <div id="ecmaobj" data-sly-use.ecmaobj="s.ecma">${ecmaobj}</div>
+ <div id="templateobj" data-sly-use.templateobj="templates.html" data-sly-call="${templateobj.template}"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.ecma b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.ecma
new file mode 100644
index 0000000..fb168e2
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.ecma
@@ -0,0 +1 @@
+"grandparent.ecmaobject";
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.js b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.js
new file mode 100644
index 0000000..f68a4f1
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/s.js
@@ -0,0 +1,5 @@
+use(function () {
+ return {
+ message : 'grandparent.javascriptobject'
+ };
+});
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/templates.html b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/templates.html
new file mode 100644
index 0000000..4eba99f
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/templates.html
@@ -0,0 +1,19 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<template data-sly-template.template>grandparent.template</template>
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/S.java b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/S.java
new file mode 100644
index 0000000..cd95b3e
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/S.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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 apps.sightly.scripts.useinheritance.parent;
+
+public class S {
+ public static final String message = "parent.javaobject";
+}
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.ecma b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.ecma
new file mode 100644
index 0000000..5b90afe
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.ecma
@@ -0,0 +1 @@
+"parent.ecmaobject";
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.js b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.js
new file mode 100644
index 0000000..bdfc83a
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/s.js
@@ -0,0 +1,5 @@
+use(function () {
+ return {
+ message : 'parent.javascriptobject'
+ };
+});
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/templates.html b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/templates.html
new file mode 100644
index 0000000..6850c64
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/parent/templates.html
@@ -0,0 +1,19 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<template data-sly-template.template>parent.template</template>
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/sightly.json b/src/main/resources/SLING-INF/sightly.json
index 6762796..040d487 100644
--- a/src/main/resources/SLING-INF/sightly.json
+++ b/src/main/resources/SLING-INF/sightly.json
@@ -20,5 +20,13 @@
"text.txt": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "/apps/sightly/scripts/text"
+ },
+ "useinheritance": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "/apps/sightly/scripts/useinheritance/child"
+ },
+ "use-sibling-dependency-resolution": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "/apps/sightly/scripts/siblingdeps/component"
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-testing-content] 10/13:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.testing-content-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
commit 133a7bb9deb16a256965f1c9a09776ca3290c97f
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Apr 9 15:10:09 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content@1672390 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12e9c7d..a9b5c7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.scripting.sightly.testing-content</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Integration Tests Content</name>
@@ -45,9 +45,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.testing-content-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/testing-content</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.