This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing.git
commit 2b4860e24feb5d30520501c63e1334eab6853fae Author: Robert Munteanu <[email protected]> AuthorDate: Mon Oct 23 12:27:08 2017 +0300 Revert "Fix typo in pom.xml : conncetion should be connection" This reverts commit 939e90de222c2272866887244856e5702e5b875e. --- .gitignore | 16 +- README.md | 9 +- pom.xml | 548 +++++------------------------------- src/main/provisioning/model.txt | 40 ++- src/test/resources/logback-test.xml | 2 +- 5 files changed, 114 insertions(+), 501 deletions(-) diff --git a/.gitignore b/.gitignore index 3a86d90..7f65232 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,15 @@ -/sling/ +atlassian-ide-plugin.xml +target +.idea +.classpath +.project +.settings +.checkstyle +*.iml +*.ipr +*.iws +bin +.vlt +.vlt-sync-config.properties +.vlt-sync.log +.DS_Store diff --git a/README.md b/README.md index 5f9646a..c107c02 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ -# Apache Sling Scripting HTL Integration Tests +Sling Jenkins jobs creation +--------------------------- -This module is part of the [Apache Sling](https://sling.apache.org) project. +The scripts found in this folder are used to create the Jenkins jobs +listed at https://builds.apache.org/view/S-Z/view/Sling/ + +See https://cwiki.apache.org/confluence/display/SLING/Sling+Jenkins+Setup +for more info. diff --git a/pom.xml b/pom.xml index a4f1759..3dc07a9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,504 +1,102 @@ -<?xml version="1.0"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>30</version> + <artifactId>sling-archetype-parent</artifactId> + <version>1</version> <relativePath/> </parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling-taglib-archetype</artifactId> + <packaging>maven-archetype</packaging> + <version>1.0.0-SNAPSHOT</version> - <artifactId>org.apache.sling.scripting.sightly.testing</artifactId> - <packaging>slingstart</packaging> - <version>1.0.5-SNAPSHOT</version> - - <name>Apache Sling Scripting HTL Integration Tests</name> - <description>This project runs the integration tests for validating the Apache Sling Scripting HTL implementation - against the Adobe HTL TCK. - </description> + <name>Apache Sling Taglib Archetype</name> + <description>Maven archetype for JSP Taglib</description> <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-scripting-sightly-testing.git</url> + <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-taglib-archetype.git</conncetion> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-taglib-archetype.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=sling-taglib-archetype.git</url> </scm> - - <properties> - <!-- run modes for integration tests --> - <sling.run.modes>oak_tar</sling.run.modes> - - <!-- path suffix for HTTP access to Sling --> - <http.base.path/> - - <!-- hostname for integration tests --> - <test.host>localhost</test.host> - - <!-- optionally exclude some integration tests --> - <failsafe.exclude/> - - <!-- - Set this to true to stop mvn once the integration test Jetty instance is - started. Useful to manually test the integration testing webapp. - --> - <integration.test.wait>false</integration.test.wait> - - <!-- - if set to "true" this will start the launchpad with the following debug options: - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000 - - otherwise you can provide your own debug settings - --> - <debug.options/> - - <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version> - <!-- HTL modules under test versions --> - <org.apache.sling.scripting.sightly.compiler.version>1.0.15-SNAPSHOT</org.apache.sling.scripting.sightly.compiler.version> - <org.apache.sling.scripting.sightly.compiler.java.version>1.0.15-SNAPSHOT</org.apache.sling.scripting.sightly.compiler.java.version> - <org.apache.sling.scripting.sightly.version>1.0.43-SNAPSHOT</org.apache.sling.scripting.sightly.version> - <org.apache.sling.scripting.sightly.js.provider.version>1.0.25-SNAPSHOT</org.apache.sling.scripting.sightly.js.provider.version> - <org.apache.sling.scripting.sightly.models.provider.version>1.0.7-SNAPSHOT</org.apache.sling.scripting.sightly.models.provider.version> - </properties> - <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <excludes> + <exclude>**/.settings</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/.project</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/target/**</exclude> + <exclude>**/*.iml</exclude> + </excludes> + </testResource> + </testResources> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.2</version> + </extension> + </extensions> <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}</directory> - <includes> - <include>derby.log</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> + <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>reserve-network-port</id> + <id>fix-crlfs</id> + <phase>process-test-resources</phase> + <configuration> + <target> + <mkdir dir="${project.build.testOutputDirectory}" /> <!-- SLING-2804 --> + <fixcrlf srcdir="${project.build.testOutputDirectory}" /> + </target> + </configuration> <goals> - <goal>reserve-network-port</goal> + <goal>run</goal> </goals> - <phase>process-resources</phase> - <configuration> - <portNames> - <portName>http.port</portName> - <portName>sling.control.port</portName> - </portNames> - </configuration> </execution> </executions> </plugin> + </plugins> + </build> + + <reporting> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>2.19.1</version> - <executions> - <execution> - <id>integration-tests</id> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - <configuration> - <includes> - <include>%regex[.*LaunchpadReadyIT.*]</include> - <include>%regex[.*SlingSpecificsSightlyIT.*]</include> - <include>%regex[.*TestsRunner.*]</include> - <include>%regex[.*PerformanceIT.*]</include> - </includes> - <dependenciesToScan> - <dependency>io.sightly:io.sightly.tck</dependency> - </dependenciesToScan> - <runOrder>alphabetical</runOrder> - <excludes> - <exclude>${failsafe.exclude}</exclude> - </excludes> - <systemPropertyVariables> - <io.sightly.tck.serverURL>http://${test.host}:${http.port}</io.sightly.tck.serverURL> - <launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url> - <launchpad.servlet.context>${http.base.path}</launchpad.servlet.context> - </systemPropertyVariables> - </configuration> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin> - <groupId>org.apache.sling</groupId> - <artifactId>slingstart-maven-plugin</artifactId> - <version>1.7.7-SNAPSHOT</version> - <extensions>true</extensions> - <executions> - <execution> - <id>start-container</id> - <goals> - <goal>start</goal> - <goal>stop</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <usePomDependencies>true</usePomDependencies> - <servers> - <server> - <port>${http.port}</port> - <controlPort>${sling.control.port}</controlPort> - <runmode>${sling.run.modes}</runmode> - <contextPath>${http.base.path}</contextPath> - <debug>${debug.options}</debug> - </server> - </servers> + <!-- No javadocs --> + <excludePackageNames> + org.apache.sling + </excludePackageNames> </configuration> </plugin> </plugins> - </build> - - <profiles> - <profile> - <!-- - This profile allows running code coverage reports for the integration tests. In addition, if the other modules have been - built from the reactor, their jacoco reports will be merged to produce a report containing coverage information about - both unit and integration tests. - - By default the latest snapshots will be used for generating the report. If, however, you want to run the report on - released versions then this can be achieved with the following command: - - mvn clean verify -Pcoverage-report \ - -Dorg.apache.sling.scripting.sightly.compiler.version=1.0.2 \ - -Dorg.apache.sling.scripting.sightly.compiler.java.version=1.0.4 \ - -Dorg.apache.sling.scripting.sightly.version=1.0.26 \ - -Dorg.apache.sling.scripting.sightly.js.provider.version=1.0.16 \ - -Dorg.apache.sling.scripting.sightly.models.provider.version=1.0.4 - - --> - <id>coverage-report</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <failsafe.exclude>%regex[.*PerformanceIT.*]</failsafe.exclude> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <includeArtifactIds> - org.apache.sling.scripting.sightly.compiler, - org.apache.sling.scripting.sightly.compiler.java, - org.apache.sling.scripting.sightly, - org.apache.sling.scripting.sightly.js.provider, - org.apache.sling.scripting.sightly.models.provider - </includeArtifactIds> - <transitive>false</transitive> - </configuration> - <executions> - <execution> - <id>copy-sources</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <classifier>sources</classifier> - <failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact> - <outputDirectory>${project.build.directory}/generated-sources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.1</version> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/</outputDirectory> - <resources> - <resource> - <directory>../compiler/target/</directory> - <includes> - <include>jacoco.exec</include> - </includes> - <targetPath>compiler-jacoco</targetPath> - </resource> - <resource> - <directory>../java-compiler/target/</directory> - <includes> - <include>jacoco.exec</include> - </includes> - <targetPath>java-compiler-jacoco</targetPath> - </resource> - <resource> - <directory>../engine/target/</directory> - <includes> - <include>jacoco.exec</include> - </includes> - <targetPath>engine-jacoco</targetPath> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.sling</groupId> - <artifactId>slingstart-maven-plugin</artifactId> - <extensions>true</extensions> - <executions> - <execution> - <id>start-container</id> - <goals> - <goal>start</goal> - <goal>stop</goal> - </goals> - </execution> - </executions> - <configuration> - <usePomDependencies>true</usePomDependencies> - <servers> - <server> - <port>${http.port}</port> - <controlPort>${sling.control.port}</controlPort> - <runmode>${sling.run.modes}</runmode> - <contextPath>${http.base.path}</contextPath> - <debug>${jacoco.agent}</debug> - </server> - </servers> - </configuration> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.maven.plugin.version}</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <propertyName>jacoco.agent</propertyName> - <destFile>${project.build.directory}/jacoco-it.exec</destFile> - </configuration> - </execution> - <execution> - <id>merge-reports</id> - <phase>verify</phase> - <goals> - <goal>merge</goal> - </goals> - <configuration> - <fileSets> - <fileSet> - <directory>${project.build.directory}</directory> - <includes> - <include>jacoco-it.exec</include> - <include>compiler-jacoco/jacoco.exec</include> - <include>java-compiler-jacoco/jacoco.exec</include> - <include>engine-jacoco/jacoco.exec</include> - </includes> - </fileSet> - </fileSets> - <destFile>${project.build.directory}/jacoco.exec</destFile> - </configuration> - </execution> - <execution> - <id>final-report</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <includes> - <include>org/apache/sling/scripting/sightly/**/*</include> - </includes> - <excludes> - <exclude>org/apache/sling/scripting/sightly/impl/parser/expr/generated/**/*</exclude> - </excludes> - </configuration> - </execution> - <execution> - <id>check-coverage</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <includes> - <include>org/apache/sling/scripting/sightly/**/*</include> - </includes> - <excludes> - <exclude>org/apache/sling/scripting/sightly/impl/parser/expr/generated/**/*</exclude> - </excludes> - <rules> - <rule> - <element>BUNDLE</element> - <limits> - <limit> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>0.80</minimum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <repositories> - <repository> - <id>oss-sonatype</id> - <name>OSS Sonatype</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </repository> - </repositories> - - <dependencies> - - <!-- The integration tests --> - <dependency> - <groupId>io.sightly</groupId> - <artifactId>io.sightly.tck</artifactId> - <version>1.3.5</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- Launchpad dependencies --> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.sightly.compiler</artifactId> - <version>${org.apache.sling.scripting.sightly.compiler.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.sightly.compiler.java</artifactId> - <version>${org.apache.sling.scripting.sightly.compiler.java.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.sightly</artifactId> - <version>${org.apache.sling.scripting.sightly.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId> - <version>${org.apache.sling.scripting.sightly.js.provider.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.scripting.sightly.models.provider</artifactId> - <version>${org.apache.sling.scripting.sightly.models.provider.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Dependencies for the Test Build and Run --> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.testing</artifactId> - <version>2.0.24</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit-dep</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.rules</artifactId> - <version>1.0.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>compile</scope> - </dependency> - - <!-- Dependency for running Sling performance tests --> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.performance.base</artifactId> - <version>1.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> + </reporting> </project> diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt index 43653f5..dde07c4 100644 --- a/src/main/provisioning/model.txt +++ b/src/main/provisioning/model.txt @@ -16,34 +16,30 @@ # specific language governing permissions and limitations # under the License. # - -[feature name=sling] +[feature name=launchpad-testing] # Dependencies [artifacts] org.apache.sling/org.apache.sling.launchpad/10-SNAPSHOT/slingstart - org.apache.sling/org.apache.sling.scripting.sightly.compiler - org.apache.sling/org.apache.sling.scripting.sightly.compiler.java - org.apache.sling/org.apache.sling.scripting.sightly - org.apache.sling/org.apache.sling.scripting.sightly.js.provider - org.apache.sling/org.apache.sling.scripting.sightly.models.provider - org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.7-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.core/2.0.49-SNAPSHOT - + org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.3-SNAPSHOT/slingfeature + javax.servlet.jsp/javax.servlet.jsp-api/2.2.1 + javax.el/javax.el-api/2.2.1 # additional configuration for testing [configurations] + integrationTestsConfig + message="This test config should be loaded at startup" + + org.apache.sling.servlets.resolver.SlingServletResolver + # Set the servlet resolver's cache size to zero for testing + servletresolver.cacheSize=I"0" - org.apache.sling.commons.log.LogManager.factory.config-2ef75700-a318-4eae-bed4-86777e1bdfd2 - org.apache.sling.commons.log.pattern="{0,date,dd.MM.yyyy\ HH:mm:ss.SSS}\ *{4}*\ [{2}]\ {3}\ {5}" - org.apache.sling.commons.log.names=["org.apache.sling.scripting.sightly.js.impl.jsapi.ProxyAsyncScriptableFactory"] - org.apache.sling.commons.log.file="logs/error.log" - org.apache.sling.commons.log.level="error" + org.apache.sling.jcr.base.internal.LoginAdminWhitelist [mode=merge] + whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*" - org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl - resource.resolver.searchpath=["/apps", "/libs", "/sightlytck/scripts"] + # Test repository initialization from provisioning model + # No need to test all repoinit statements, this is done + # by the repoinit it module + [:repoinit] +create path /repoinit/provisioningModelTest -[:repoinit] - create path (sling:Folder) /sightlytck/scripts - set ACL for sling-scripting - allow jcr:read on /sightlytck/scripts - end +create service user provisioningModelUser diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index a28514c..51c11bc 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -46,4 +46,4 @@ <appender-ref ref="sift" /> </root> -</configuration> +</configuration> \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
