This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch issues/SLING-10934 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
commit a7cbbc718a50a2fde4b4618247276ba071843a67 Author: Karl Pauls <[email protected]> AuthorDate: Mon Nov 22 00:50:20 2021 +0100 SLING-10934: Support bundled scripts with a method and a name that matches the resource type --- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../resources/SLING-INF/content/examplebundle.xml | 28 ++++++++ .../testmainpost/POST.html | 19 ++++++ .../testmainselectorpost.POST.html | 19 ++++++ .../testpost/POST.html | 19 ++++++ .../testpost/testpost.POST.html | 19 ++++++ it/pom.xml | 6 +- .../tracker/it/AbstractEndpointTestBase.java | 8 ++- .../bundle/tracker/it/ScriptMatchPostIT.java | 78 ++++++++++++++++++++++ it/src/test/provisioning/launchpad.txt | 2 +- it/src/test/provisioning/sling.txt | 12 ++-- 17 files changed, 206 insertions(+), 18 deletions(-) diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml index bdabaad..ba8c236 100644 --- a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml +++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> </dependency> </dependencies> <executions> diff --git a/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml b/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml index 6a0928b..8c590f8 100644 --- a/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-extend1/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml index 3e90a5b..ed1d459 100644 --- a/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-extend2/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml index 8e255a8..4c17e69 100644 --- a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> </dependency> </dependencies> </plugin> diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml index cf8b9ef..41c73c7 100644 --- a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml index d8594e5..11afb83 100644 --- a/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle-precompiled/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/examples/org-apache-sling-scripting-examplebundle/pom.xml b/examples/org-apache-sling-scripting-examplebundle/pom.xml index ff6d53b..be9145b 100644 --- a/examples/org-apache-sling-scripting-examplebundle/pom.xml +++ b/examples/org-apache-sling-scripting-examplebundle/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>scriptingbundle-maven-plugin</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.5.1-SNAPSHOT</version> <executions> <execution> <phase>prepare-package</phase> diff --git a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml index a8c040a..4d33f5f 100644 --- a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml +++ b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/SLING-INF/content/examplebundle.xml @@ -62,3 +62,31 @@ <type>String</type> </property> </node> +<node> +<name>script-matching-no-version</name> +<primaryNodeType>nt:unstructured</primaryNodeType> +<property> + <name>sling:resourceType</name> + <value>org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost</value> + <type>String</type> +</property> +</node> +<node> +<name>script-matching-no-version-main</name> +<primaryNodeType>nt:unstructured</primaryNodeType> +<property> + <name>sling:resourceType</name> + <value>org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost</value> + <type>String</type> +</property> +</node> +<node> +<name>script-matching-no-version-mainselector</name> +<primaryNodeType>nt:unstructured</primaryNodeType> +<property> + <name>sling:resourceType</name> + <value>org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainselectorpost</value> + <type>String</type> +</property> +</node> + diff --git a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/apps/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost/POST.html b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/apps/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost/POST.html new file mode 100644 index 0000000..004687b --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/apps/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost/POST.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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> +<div>${javax_script_filename} matched for <code>${request.method} ${request.pathInfo}</code></div> diff --git a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainselectorpost/testmainselectorpost.POST.html b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainselectorpost/testmainselectorpost.POST.html new file mode 100644 index 0000000..29e2e94 --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainselectorpost/testmainselectorpost.POST.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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> +<div>${javax_script_filename} matched for <code>${request.method} ${request.pathInfo}</code></div> \ No newline at end of file diff --git a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/POST.html b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/POST.html new file mode 100644 index 0000000..004687b --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/POST.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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> +<div>${javax_script_filename} matched for <code>${request.method} ${request.pathInfo}</code></div> diff --git a/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/testpost.POST.html b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/testpost.POST.html new file mode 100644 index 0000000..29e2e94 --- /dev/null +++ b/examples/org-apache-sling-scripting-examplebundle/src/main/resources/javax.script/org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/testpost.POST.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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> +<div>${javax_script_filename} matched for <code>${request.method} ${request.pathInfo}</code></div> \ No newline at end of file diff --git a/it/pom.xml b/it/pom.xml index e342021..ac198b2 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -182,13 +182,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.scripting.core</artifactId> - <version>2.4.0</version> + <version>2.4.1-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.servlets.resolver</artifactId> - <version>2.8.0</version> + <version>2.9.1-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.scripting.sightly</artifactId> - <version>1.4.12-1.4.0</version> + <version>1.4.14-1.4.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractEndpointTestBase.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractEndpointTestBase.java index c8bef6b..1cc02c9 100644 --- a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractEndpointTestBase.java +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/AbstractEndpointTestBase.java @@ -91,7 +91,13 @@ public abstract class AbstractEndpointTestBase { } protected SlingHttpResponse getResponse(String method, String url, NameValuePair... parameters) throws Exception { - String resourcePath = url.substring(0, url.indexOf('.')); + int idx = url.indexOf('.'); + String resourcePath; + if (idx != -1) { + resourcePath = url.substring(0, idx); + } else { + resourcePath = url; + } if (!resourceAlreadyPresent.contains(resourcePath)) { SLING_INSTANCE_RULE.getAdminClient().waitExists(resourcePath, contentFindTimeout, contentFindRetryDelay); resourceAlreadyPresent.add(resourcePath); diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java new file mode 100644 index 0000000..cf3e78b --- /dev/null +++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ScriptMatchPostIT.java @@ -0,0 +1,78 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.scripting.bundle.tracker.it; + +import org.apache.commons.lang3.StringUtils; +import org.apache.http.Header; +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpHead; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpTrace; +import org.jsoup.nodes.Document; +import org.junit.Test; + +import static junit.framework.TestCase.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class ScriptMatchPostIT extends AbstractEndpointTestBase { + + private static final String SCRIPT_MATCHING_BASE = BASE + "/examplebundle/script-matching-no-version"; + + @Test + public void testPOSTMethodMatchingNoExtension() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE, HttpPost.METHOD_NAME); + assertTrue(document.html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/POST.html")); + } + + @Test + public void testPOSTResourceLabelMatching() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE + ".html", HttpPost.METHOD_NAME); + assertTrue(document.select("div").html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testpost/testpost.POST.html")); + } + + @Test + public void testMainPOSTMethodMatchingNoExtension() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE + "-main", HttpPost.METHOD_NAME); + assertTrue(document.html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost/POST.html")); + } + + @Test + public void testMainPOSTResourceLabelMatching() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE + "-main.html", HttpPost.METHOD_NAME); + assertTrue(document.select("div").html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainpost/POST.html")); + } + + @Test + public void testMainSelectorPOSTMethodMatchingNoExtension() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE + "-mainselector", HttpPost.METHOD_NAME); + assertTrue(!document.html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion")); + } + + @Test + public void testMainSelectorPOSTResourceLabelMatching() throws Exception { + Document document = getDocument(SCRIPT_MATCHING_BASE + "-mainselector.html", HttpPost.METHOD_NAME); + assertTrue(document.select("div").html().contains("org.apache.sling.scripting.examplebundle.scriptmatching.noversion/testmainselectorpost/testmainselectorpost.POST.html")); + } +} diff --git a/it/src/test/provisioning/launchpad.txt b/it/src/test/provisioning/launchpad.txt index 3cdef89..32cc8d6 100644 --- a/it/src/test/provisioning/launchpad.txt +++ b/it/src/test/provisioning/launchpad.txt @@ -20,7 +20,7 @@ # Only a single artifact is allowed within this feature. # [feature name=:launchpad] - org.apache.sling/org.apache.sling.launchpad.base/6.0.2-2.6.36 + org.apache.sling/org.apache.sling.launchpad.base/7.0.1-2.7.4 [settings] org.osgi.framework.system.packages=org.osgi.framework;version="1.9",org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",org.osgi.framework.launch;version="1.2";uses:="org.osg [...] diff --git a/it/src/test/provisioning/sling.txt b/it/src/test/provisioning/sling.txt index 12775fe..5ebbbb0 100644 --- a/it/src/test/provisioning/sling.txt +++ b/it/src/test/provisioning/sling.txt @@ -46,7 +46,7 @@ commons-io/commons-io/2.6 commons-fileupload/commons-fileupload/1.4 org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0 - org.apache.sling/org.apache.sling.api/2.23.3-SNAPSHOT + org.apache.sling/org.apache.sling.api/2.24.0 org.apache.sling/org.apache.sling.auth.core/1.4.6 [artifacts startLevel=10] @@ -70,7 +70,7 @@ org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version} org.apache.sling/org.apache.sling.jcr.webdav/2.3.8 org.apache.sling/org.apache.sling.jcr.davex/1.3.10 - org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.8 + org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.16 org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.4 org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2 io.dropwizard.metrics/metrics-core/3.2.6 @@ -98,7 +98,7 @@ org.apache.sling/org.apache.sling.commons.mime/2.2.2 org.apache.sling/org.apache.sling.commons.scheduler/2.7.6 org.apache.sling/org.apache.sling.commons.threads/3.2.20 - org.apache.sling/org.apache.sling.engine/2.7.2 + org.apache.sling/org.apache.sling.engine/2.8.0 org.apache.sling/org.apache.sling.fsresource/2.1.16 org.apache.sling/org.apache.sling.i18n/2.5.14 org.apache.sling/org.apache.sling.installer.console/1.1.0 @@ -107,14 +107,14 @@ org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.4 org.apache.sling/org.apache.sling.installer.factory.packages/1.0.4 org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0 - org.apache.sling/org.apache.sling.jcr.resource/3.0.20 + org.apache.sling/org.apache.sling.jcr.resource/3.1.0 org.apache.sling/org.apache.sling.models.api/1.3.8 org.apache.sling/org.apache.sling.models.impl/1.4.12 - org.apache.sling/org.apache.sling.resourceresolver/1.6.16 + org.apache.sling/org.apache.sling.resourceresolver/1.8.0 org.apache.sling/org.apache.sling.serviceusermapper/1.4.4 org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2 org.apache.sling/org.apache.sling.servlets.get/2.1.40 - org.apache.sling/org.apache.sling.servlets.post/2.3.36 + org.apache.sling/org.apache.sling.servlets.post/2.5.0 org.apache.sling/org.apache.sling.xss/2.2.2 javax.mail/mail/1.5.0-b01 org.apache.geronimo.bundles/jstl/1.2_1
