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/01/11 19:17:17 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(75ffec7 -> 9342ee6)
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 75ffec7 SLING-7353 Update to Sling Parent 33
new ab63ee4 SLING-7373 Use Handlebars for templating
new 9342ee6 SLING-7080 Update options and versions to latest features
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sling/testing/paxexam/SlingVersionResolver.java | 15 +++++++--------
.../templates/{SlingOptions.txt => SlingOptions.hbs} | 20 ++++++++++----------
...gVersionResolver.txt => SlingVersionResolver.hbs} | 6 +++---
3 files changed, 20 insertions(+), 21 deletions(-)
rename src/main/resources/templates/{SlingOptions.txt => SlingOptions.hbs} (87%)
rename src/main/resources/templates/{SlingVersionResolver.txt => SlingVersionResolver.hbs} (96%)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-testing-paxexam] 02/02: SLING-7080 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 9342ee63937f74c6f3f27b0b04b32fb6adc91616
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 11 20:16:10 2018 +0100
SLING-7080 Update options and versions to latest features
---
.../sling/testing/paxexam/SlingVersionResolver.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 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 40fc3e1..1facd1e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -77,7 +77,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("commons-fileupload:commons-fileupload", "1.3.3");
versions.put("commons-io:commons-io", "2.6");
versions.put("commons-lang:commons-lang", "2.6");
- versions.put("io.dropwizard.metrics:metrics-core", "3.2.5");
+ 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");
@@ -113,7 +113,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.jackrabbit:oak-lucene", "1.6.7");
versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.7");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.42");
- versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.3_1");
+ 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.7.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter", "4.0.4_1");
versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.10");
@@ -123,7 +123,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.auth.openid", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.auth.selector", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.3.0");
- versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.0");
+ versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.2");
versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.4");
versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
@@ -141,11 +141,10 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.discovery.standalone", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.discovery.support", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.distribution.api", "0.3.0");
- versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.8");
- versions.put("org.apache.sling:org.apache.sling.engine", "2.6.10");
+ versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.10");
+ versions.put("org.apache.sling:org.apache.sling.engine", "2.6.12");
versions.put("org.apache.sling:org.apache.sling.event", "4.2.10");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.2");
- versions.put("org.apache.sling:org.apache.sling.extensions.explorer", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.6");
@@ -214,7 +213,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.urlrewriter", "0.0.2");
versions.put("org.apache.sling:org.apache.sling.validation.api", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.validation.core", "1.0.4");
- versions.put("org.apache.sling:org.apache.sling.xss", "2.0.0");
+ versions.put("org.apache.sling:org.apache.sling.xss", "2.0.4");
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");
@@ -222,7 +221,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.codehaus.groovy:groovy-json", "2.4.13");
versions.put("org.codehaus.groovy:groovy-templates", "2.4.13");
versions.put("org.javassist:javassist", "3.22.0-GA");
- versions.put("org.mongodb:mongo-java-driver", "3.6.0");
+ versions.put("org.mongodb:mongo-java-driver", "3.6.1");
versions.put("org.unbescape:unbescape", "1.1.5.RELEASE");
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 01/02: SLING-7373 Use
Handlebars for templating
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 ab63ee4d09d0932c2e0a7edd3092fa88e4524ef1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 11 19:59:25 2018 +0100
SLING-7373 Use Handlebars for templating
---
.../templates/{SlingOptions.txt => SlingOptions.hbs} | 20 ++++++++++----------
...gVersionResolver.txt => SlingVersionResolver.hbs} | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.hbs
similarity index 87%
rename from src/main/resources/templates/SlingOptions.txt
rename to src/main/resources/templates/SlingOptions.hbs
index e4e1154..1188e64 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -124,18 +124,18 @@ public class SlingOptions {
config()
);
}
-[# th:each="feature : ${features}"]
- public static Option [(${feature.javaName})]() {
- return composite([# th:each="fc,fcsStatus : ${feature.getFeatures()}"]
- [(${fc})]()[# th:unless="${fcsStatus.last}"],[/][/][# th:if="${not #lists.isEmpty(feature.getFeatures())}"][# th:if="${not #lists.isEmpty(feature.getBundles())}"],[/][/][# th:each="bundle,bundlesStatus : ${feature.getBundles()}"]
- mavenBundle().groupId("[(${bundle.groupId})]").artifactId("[(${bundle.artifactId})]").version(versionResolver)[# th:unless="${bundlesStatus.last}"],[/][/][# th:if="${not #lists.isEmpty(feature.getConfigurations())}"],[/][# th:each="configuration,configurationsStatus : ${feature.getConfigurations()}"]
- [# th:if="${configuration.isFactory()}"]factoryConfiguration[/][# th:unless="${configuration.isFactory()}"]newConfiguration[/]("[(${configuration.pid})]") [# th:each="entry,entriesStatus : ${configuration.getEntries()}"]
- .put("[(${entry.key})]", [(${entry.value})])[/]
- .asOption()[# th:unless="${configurationsStatus.last}"],[/][/]
+{{#each features}}
+ public static Option {{javaName}}() {
+ return composite({{#each features}}
+ {{this}}(){{#unless @last}},{{/unless}}{{/each}}{{#if features}}{{#if bundles}},{{/if}}{{/if}}{{#each bundles}}
+ mavenBundle().groupId("{{groupId}}").artifactId("{{artifactId}}").version(versionResolver){{#unless @last}},{{/unless}}{{/each}}{{#if configurations}},{{/if}}{{#each configurations}}
+ {{#if factory}}factoryConfiguration{{else}}newConfiguration{{/if}}("{{pid}}"){{#each entries}}
+ .put("{{@key}}", {{{this}}}){{/each}}
+ .asOption(){{#unless @last}},{{/unless}}{{/each}}
);
}
-
-[/] public static Option slingQuickstartOakTar(final String workingDirectory, final int httpPort) {
+{{/each}}
+ public static Option slingQuickstartOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.hbs
similarity index 96%
rename from src/main/resources/templates/SlingVersionResolver.txt
rename to src/main/resources/templates/SlingVersionResolver.hbs
index df9cb0c..99db376 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -60,9 +60,9 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.slf4j:jcl-over-slf4j", "1.7.25");
versions.put("ch.qos.logback:logback-core", "1.2.3");
versions.put("ch.qos.logback:logback-classic", "1.2.3");
- versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0");[# th:each="bundle : ${bundles}"]
- versions.put("[(${bundle.groupId})]:[(${bundle.artifactId})]", "[(${bundle.version})]");
-[/] }
+ versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0");{{#each bundles}}
+ versions.put("{{groupId}}:{{artifactId}}", "{{version}}");{{/each}}
+ }
private String key(final String groupId, final String artifactId) {
return String.format("%s:%s", groupId, artifactId);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.