You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/11/30 16:07:48 UTC
[sling-org-apache-sling-app-cms] branch master updated (d59644b ->
df26609)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from d59644b Adding support for fragmented content
new 1b8c050 Fixes SLING-9421 in Sling CMS adding support for Groovy 3
new df26609 Updating to execute the smoke tests when building the feature model
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:
feature/pom.xml | 77 ++++++++++++++-
feature/src/main/features/app/cms.json | 110 ++++++++++++++++++++-
.../apache/sling/launchpad/LaunchpadReadyRule.java | 4 +-
.../java/org/apache/sling/launchpad/SmokeIT.java | 4 +-
4 files changed, 185 insertions(+), 10 deletions(-)
[sling-org-apache-sling-app-cms] 01/02: Fixes SLING-9421 in Sling
CMS adding support for Groovy 3
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 1b8c05050b5623a484876a4c0199c58e22debf9c
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 30 11:06:47 2020 -0500
Fixes SLING-9421 in Sling CMS adding support for Groovy 3
---
feature/pom.xml | 77 ++++++++++++++++++++++-
feature/src/main/features/app/cms.json | 110 ++++++++++++++++++++++++++++++++-
2 files changed, 181 insertions(+), 6 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index 24e7b18..b0afefa 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -24,9 +24,10 @@
<properties>
<sling.java.version>8</sling.java.version>
- <IT.expected.bundles.count>208</IT.expected.bundles.count>
+ <IT.expected.bundles.count>240</IT.expected.bundles.count>
<cms.version>${project.parent.version}</cms.version>
- <composum.version>1.12.0</composum.version>
+ <composum.version>1.12.4</composum.version>
+ <groovy.version>3.0.6</groovy.version>
<jackrabbit.version>2.20.0</jackrabbit.version>
<jackson.version>2.11.1</jackson.version>
<oak.version>1.32.0</oak.version>
@@ -36,6 +37,7 @@
<build>
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
@@ -150,7 +152,7 @@
<goal>attach-featurearchives</goal>
</goals>
<configuration>
- <replacePropertyVariables>cms.version,composum.version,jackrabbit.version,jackson.version,oak.version,slf4j.version</replacePropertyVariables>
+ <replacePropertyVariables>cms.version,composum.version,groovy.version,jackrabbit.version,jackson.version,oak.version,slf4j.version</replacePropertyVariables>
</configuration>
</execution>
</executions>
@@ -182,6 +184,75 @@
</descriptors>
</configuration>
</plugin>
+
+ <!-- reserve a network port for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <launches>
+ <launch>
+ <id>sling-12-oak-tar</id>
+ <feature>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>slingcms-standalone</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <sling.http.port>${http.port}</sling.http.port>
+ <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
diff --git a/feature/src/main/features/app/cms.json b/feature/src/main/features/app/cms.json
index 25f9e96..7b4a47d 100644
--- a/feature/src/main/features/app/cms.json
+++ b/feature/src/main/features/app/cms.json
@@ -121,15 +121,119 @@
"start-order": "15"
},
{
- "id": "org.apache.tika:tika-bundle:1.22",
+ "id": "org.ow2.asm:asm:9.0",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-analysis:9.0",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-commons:9.0",
+ "start-order": "15"
+ },
+ {
+ "id": "org.ow2.asm:asm-tree:9.0",
"start-order": "15"
},
{
- "id": "org.codehaus.groovy:groovy-all:2.4.19",
+ "id": "org.ow2.asm:asm-util:9.0",
"start-order": "15"
},
{
- "id": "com.github.jknack:handlebars:4.2.0",
+ "id": "org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.2",
+ "start-order": "15"
+ },
+ {
+ "id": "org.apache.tika:tika-bundle:1.22",
+ "start-order": "15"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-ant:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-astbuilder:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-cli-picocli:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-console:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-datetime:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-docgenerator:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-groovydoc:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-groovysh:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-jmx:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-json:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-jsr223:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-macro:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-nio:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-servlet:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-sql:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-swing:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-templates:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-test:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-test-junit5:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-testng:${groovy.version}",
+ "start-order": "20"
+ },
+ {
+ "id": "org.codehaus.groovy:groovy-xml:${groovy.version}",
"start-order": "20"
}
],
[sling-org-apache-sling-app-cms] 02/02: Updating to execute the
smoke tests when building the feature model
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit df26609d53f99786f99f1768db6317e9f9aea058
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 30 11:07:36 2020 -0500
Updating to execute the smoke tests when building the feature model
---
.../src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java | 4 ++--
feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java b/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
index d6b6d6f..4686571 100644
--- a/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
+++ b/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
@@ -39,7 +39,7 @@ public class LaunchpadReadyRule extends ExternalResource {
public LaunchpadReadyRule(int launchpadPort) {
checks.add(new Check("http://localhost:" + launchpadPort + "/server/default/jcr:root/content"));
- checks.add(new Check("http://localhost:" + launchpadPort + "/content/starter.html") {
+ checks.add(new Check("http://localhost:" + launchpadPort + "/system/sling/form/login") {
@Override
public String runCheck(HttpResponse response) throws Exception {
try (InputStreamReader isr = new InputStreamReader(response.getEntity().getContent());
@@ -47,7 +47,7 @@ public class LaunchpadReadyRule extends ExternalResource {
String line;
while ((line = reader.readLine()) != null) {
- if (line.contains("Do not remove this comment, used for Starter integration tests")) {
+ if (line.contains("Welcome to Apache Sling CMS")) {
return null;
}
}
diff --git a/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java b/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
index 71676dc..9fc6f42 100644
--- a/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
+++ b/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
@@ -52,8 +52,8 @@ import org.w3c.dom.Node;
public class SmokeIT {
- private static final int LAUNCHPAD_PORT = Integer.getInteger("launchpad.http.port", 8080);
- private static final int EXPECTED_BUNDLES_COUNT = Integer.getInteger("IT.expected.bundles.count", Integer.MAX_VALUE);
+ private static final int LAUNCHPAD_PORT = Integer.getInteger("sling.http.port", 8080);
+ private static final int EXPECTED_BUNDLES_COUNT = Integer.getInteger("IT.expected.bundles.count", 240);
@ClassRule
public static LaunchpadReadyRule LAUNCHPAD = new LaunchpadReadyRule(LAUNCHPAD_PORT);