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 09:13:43 UTC
[sling-htl-maven-plugin] annotated tag htl-maven-plugin-1.0.8
created (now 0181965)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git.
at 0181965 (tag)
tagging 8590326d1a2d890bf4066c438ee6e6e3519f8e49 (commit)
by Radu Cotescu
on Wed Aug 2 10:07:00 2017 +0000
- Log -----------------------------------------------------------------
htl-maven-plugin-1.0.8
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 84657d3 SLING-6028 - Replace Sightly references with HTL in both code and documentation
new c26853e releng: updated dependencies
new f831fbc [maven-release-plugin] prepare release no
new df2650a [maven-release-plugin] prepare for next development iteration
new ea2ee46 [maven-release-plugin] prepare release htl-maven-plugin-1.0.0
new b4295b0 [maven-release-plugin] prepare for next development iteration
new d48c8cd releng: updated dependencies
new 9ff35d3 trivial: added README for the htl-maven-plugin
new 1853b99 trivial: added README for the htl-maven-plugin
new aa679fb SLING-6083 htl-maven-plugin should not fail when source directory not found
new 09ba49f compile phase is the default phase, no need to define it explicitly
new 00bc556 SLING-6084 htl-maven-plugin should provide skip parameter
new 14d21c8 SLING-6084 htl-maven-plugin should provide skip parameter
new 5ec0a06 SLING-6084 - htl-maven-plugin should provide skip parameter
new db39aaa [maven-release-plugin] prepare release htl-maven-plugin-1.0.2
new fb72e02 [maven-release-plugin] prepare for next development iteration
new 8792be6 SLING-6084 - htl-maven-plugin should provide skip parameter
new c52b181 SLING-6230 - The SightlyCompiler reports errors and warnings with an offset by one for the line count
new 02c0908 [maven-release-plugin] prepare release htl-maven-plugin-1.0.4
new 89091e6 [maven-release-plugin] prepare for next development iteration
new fdba337 update to next snapshot version until releases are available on maven central
new a9aa2c1 [maven-release-plugin] prepare release htl-maven-plugin-1.0.6
new 8fc94d7 [maven-release-plugin] prepare for next development iteration
new 69a4d76 releng: updated dependencies post-release
new 548e775 use Sling Parent 30
new 33bc150 enable maven plugin site generation
new bbb5933 link to generated docs
new 38895b4 update intro text
new c7711b3 exclude site markdown files from RAT
new 2349942 version of maven-scm-publish-plugin already defined in parent pom
new 8e7b259 INFRA-13644 switch site publish url to sling site staging area
new 9790f8c SLING-7025 - htl-maven-plugin: Correctly state default values for include parameter
new 3b84ebc SLING-7026 - htl-maven-plugin: Namespace all user properties
new 05c5b42 SLING-6651 - Improve documentation for htl-maven-plugin
new ca40a06 SLING-6651 - Improve documentation for htl-maven-plugin
new bcedd59 [maven-release-plugin] prepare release htl-maven-plugin-1.0.8
new 8590326 [maven-release-plugin] copy for tag htl-maven-plugin-1.0.8
The 37 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-htl-maven-plugin] 14/15: [maven-release-plugin] prepare
release htl-maven-plugin-1.0.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit bcedd594f34aba7f8c8a028a7b7e7cc003d925a3
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Aug 2 10:06:47 2017 +0000
[maven-release-plugin] prepare release htl-maven-plugin-1.0.8
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1803799 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index c90b40a..b4b9190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>htl-maven-plugin</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling HTL Maven Plugin</name>
@@ -33,9 +33,9 @@
<url>https://sling.apache.org/components/htl-maven-plugin/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/htl-maven-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/htl-maven-plugin-1.0.8</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/htl-maven-plugin-1.0.8</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/htl-maven-plugin-1.0.8</url>
</scm>
<prerequisites>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <version>1.0.10</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 12/15: SLING-6651 - Improve documentation
for htl-maven-plugin
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 05c5b42446dea393661f1545ebcba849240b24b1
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Aug 1 16:42:17 2017 +0000
SLING-6651 - Improve documentation for htl-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1803667 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
.../org/apache/sling/maven/htl/ValidateMojo.java | 2 +-
src/site/markdown/index.md | 30 +++++++++--
src/site/markdown/usage.md.vm | 60 ++++++++++++++++++++++
src/site/site.xml | 31 ++++++-----
5 files changed, 106 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index d28a679..243c302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
<name>Apache Sling HTL Maven Plugin</name>
<description>The Apache Sling HTL Maven Plugin provides support for validating HTML Template Language scripts from projects.</description>
+ <url>https://sling.apache.org/components/htl-maven-plugin/</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin</connection>
diff --git a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
index 6426e29..78765b3 100644
--- a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
+++ b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
@@ -44,7 +44,7 @@ import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
- * This goal validates Sightly scripts syntax.
+ * Validates HTL scripts.
*/
@Mojo(
name = "validate",
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index e6f2449..7d449e4 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,6 +1,28 @@
-HTL Maven Plugin
-================
+## Apache Sling HTL Maven Plugin
-The Apache Sling HTL Maven Plugin, M2Eclipse compatible, provides support for validating HTML Template Language scripts from projects during build time.
+The Apache Sling HTL Maven Plugin, M2Eclipse compatible, provides support for validating HTML Template Language scripts from projects during
+build time, reporting issues like:
+
+* syntax errors;
+* expression warnings (e.g. missing required display contexts, sensible attributes with dynamic values, etc.);
+* incorrect usage of block elements.
+
+### Goals
+The HTL Maven Plugin has only one goal:
+
+* [htl:validate](validate-mojo.html) is bound to the compile phase and is used to validate HTL scripts.
+
+
+### Usage
+General instructions on how to use the HTL Maven Plugin can be found on the usage page.
+
+In case you still have questions regarding the plugin's usage feel free to contact the Apache Sling Development List. The posts to the
+mailing list are archived and could already contain the answer to your question as part of an older thread. Hence, it is also worth
+browsing/searching the mail archive.
+
+If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our issue tracker. When
+creating a new issue, please provide a comprehensive description of your concern. Especially for fixing bugs it is crucial that the
+developers can reproduce your problem. For this reason, entire debug logs, POMs or most preferably little demo projects attached to the
+issue are very much appreciated. Of course, patches are welcome, too. Contributors can check out the project from our source repository and
+will find supplementary information in the guide to helping with Maven.
-See [Goals](plugin-info.html) for a list of supported goals.
diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm
new file mode 100644
index 0000000..cb89c11
--- /dev/null
+++ b/src/site/markdown/usage.md.vm
@@ -0,0 +1,60 @@
+#set($h1 = '#')
+#set($h2 = '##')
+#set($h3 = '###')
+#set($h4 = '####')
+
+
+$h2 Usage
+
+$h3 Validating your HTL Scripts
+
+To validate your HTL Scripts you can run the following command:
+
+```
+mvn org.apache.sling:htl-maven-plugin:validate
+```
+
+This assumes you've configured the `\${project.build.sourceDirectory}` setting.
+
+The command can be simplified to
+
+```
+mvn htl:validate
+```
+
+if your Maven user settings file provides the following configuration
+
+```
+<pluginGroups>
+ <pluginGroup>org.apache.sling</pluginGroup>
+</pluginGroups>
+```
+
+$h3 Configuring Your HTL Maven Plugin
+
+```
+<project>
+ ...
+ <build>
+ <pluginManagement>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>htl-maven-plugin</artifactId>
+ <version>${project.version}/version>
+ <configuration>
+ <!-- put your configurations here -->
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <!-- configure which goals you want to execute -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </pluginManagement>
+ </build>
+ ...
+</project>
+```
+
diff --git a/src/site/site.xml b/src/site/site.xml
index 9abab11..2592253 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,18 +18,23 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.6</version>
- </skin>
- <body>
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- <item name="Goals" href="plugin-info.html"/>
- </menu>
- <menu ref="reports"/>
- </body>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Goals" href="plugin-info.html"/>
+ <item name="Usage" href="usage.html"/>
+ </menu>
+ <menu ref="reports"/>
+ </body>
+ <custom>
+ <fluidoSkin>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ </fluidoSkin>
+ </custom>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 01/15: [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 htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 8fc94d759aedb402914c297633a1d830bdc8f11e
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 13 11:40:52 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1778555 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 227da30..84e8be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,16 +25,16 @@
</parent>
<artifactId>htl-maven-plugin</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling HTL Maven Plugin</name>
<description>The Apache Sling HTL Maven Plugin provides support for validating HTML Template Language scripts from projects.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/htl-maven-plugin-1.0.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/htl-maven-plugin-1.0.6</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/htl-maven-plugin-1.0.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/htl-maven-plugin</url>
</scm>
<properties>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 07/15: exclude site markdown files from RAT
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit c7711b316f6680356a3a27896f9960d9dfeb7e93
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:39:31 2017 +0000
exclude site markdown files from RAT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1786258 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index aa45b84..472484e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,6 +175,7 @@
<excludes>
<exclude>**/*.iml</exclude>
<exclude>**/target/**/*</exclude>
+ <exclude>src/site/markdown/**</exclude>
</excludes>
</configuration>
</plugin>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 06/15: update intro text
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 38895b40c8c1d0d10957f6df30e6613cd7ca002c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:20:31 2017 +0000
update intro text
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1786257 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/markdown/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 1a4922e..e6f2449 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,6 +1,6 @@
HTL Maven Plugin
================
-The Apache Sling HTL Maven Plugin provides support for validating HTML Template Language scripts from projects.
+The Apache Sling HTL Maven Plugin, M2Eclipse compatible, provides support for validating HTML Template Language scripts from projects during build time.
See [Goals](plugin-info.html) for a list of supported goals.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 05/15: link to generated docs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit bbb593328766a0347484a0fc278dd8fc59335896
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:17:46 2017 +0000
link to generated docs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1786256 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 84 ++-------------------------------------------------------------
1 file changed, 2 insertions(+), 82 deletions(-)
diff --git a/README.md b/README.md
index ec8fd1b..1e93dd5 100644
--- a/README.md
+++ b/README.md
@@ -1,86 +1,6 @@
Apache Sling HTL Maven Plugin
====
-The Apache Sling HTL Maven Plugin, M2Eclipse compatible, provides support for validating HTML Template Language scripts from projects during build time.
-
-## Goals overview
-
-* [`htl:validate`](#htlvalidate) - validate the scripts from the build directory (`${project.build.sourceDirectory}`)
-
-## Usage
-```xml
-<build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>htl-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <id>validate-scripts</id>
- <goals>
- <goal>validate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-</build>
-```
-
-## `htl:validate`
-**Full name:** `org.apache.sling:htl-maven-plugin:1.0.0:validate`
-
-**Description:**
-Validates HTL scripts syntax during the build process.
-
-### Optional Parameters
-
-|Name |Type |Since |Description |
-|---------------------------------------------|------------|---------|--------------------------------------------------------------------------------------------------|
-| [`sourceDirectory`](#param-sourceDirectory) | `String` | `1.0.0` | Defines the root folder where this goal expects to find Sightly scripts to validate. |
-| [`includes`](#param-includes) | `String[]` | `1.0.0` | List of files to include, specified as fileset patterns which are relative to `sourceDirectory`. |
-| [`excludes`](#param-excludes) | `String[]` | `1.0.0` | List of files to exclude, specified as fileset patterns which are relative to `sourceDirectory`. |
-| [`failOnWarnings`](#param-failOnWarnings) | `boolean` | `1.0.0` | If set to `true` it will fail the build on compiler warnings. |
-| [`skip`](#param-skip) | `boolean` | `1.0.2` | If set to `true` the validation will be skipped. |
-
-### Parameter Details
-
-<a name="param-sourceDirectory"><code>sourceDirectory</code></a>:
-Defines the root folder where this goal expects to find Sightly scripts to validate.
-* **Type:** `java.lang.String`
-* **Required:** No
-* **User Property:** `sourceDirectory`
-* **Default:** `${project.build.sourceDirectory}`
-
-<a name="param-includes"><code>includes</code></a>:
-
-List of files to include, specified as fileset patterns which are relative to `sourceDirectory`.
-* **Type:** `java.lang.String[]`
-* **Required:** No
-* **User Property:** `includes`
-* **Default:** `**/*.html`
-
-<a name="param-excludes"><code>excludes</code></a>:
-
-List of files to exclude, specified as fileset patterns which are relative to `sourceDirectory`.
-* **Type:** `java.lang.String[]`
-* **Required:** No
-* **User Property:** `excludes`
-
-<a name="param-failOnWarnings"><code>failOnWarnings</code></a>:
-
-If set to `true` it will fail the build on compiler warnings.
-* **Type:** `boolean`
-* **Required:** No
-* **User Property:** `failOnWarnings`
-* **Default:** `false`
-
-<a name="param-skip"><code>skip</code></a>:
-
-If set to `true` the validation will be skipped.
-* **Type:** `boolean`
-* **Required:** No
-* **User Property** `htl.skip`
-* **Default:** `false`
+The Apache Sling HTL Maven Plugin, M2Eclipse compatible, provides support for validating HTML Template Language scripts from projects during build time.
+See [Apache Sling HTL Maven Plugin documentation](http://sling.apache.org/components/htl-maven-plugin/plugin-info.html) for a list of supported goals.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 10/15: SLING-7025 - htl-maven-plugin:
Correctly state default values for include parameter
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 9790f8c10f892f2996eaa0f460bfdf787ed22199
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Aug 1 14:07:48 2017 +0000
SLING-7025 - htl-maven-plugin: Correctly state default values for include parameter
* applied slightly modified patch from Konrad Windszus
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1803644 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 40 ++++++++++++-
.../org/apache/sling/maven/htl/ValidateMojo.java | 5 +-
.../apache/sling/maven/htl/ValidateMojoTest.java | 69 +++++++++++++++++-----
.../test-project/default-includes.pom.xml | 49 +++++++++++++++
4 files changed, 145 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4dc3d7..d28a679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,10 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/htl-maven-plugin</url>
</scm>
+ <prerequisites>
+ <maven>3.3.9</maven><!-- due to https://issues.apache.org/jira/browse/MNG-5440 -->
+ </prerequisites>
+
<!-- Support for publishing the mvn site. -->
<distributionManagement>
<site>
@@ -47,15 +51,47 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.version>3.3.3</maven.version>
+ <maven.version>3.3.9</maven.version>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
+ <!-- force maven-plugin-testing-harness to use newer plexus container (https://issues.apache.org/jira/browse/MPLUGINTESTING-53) -->
+ <dependencyManagement>
+ <dependencies>
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
index 4155473..151f823 100644
--- a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
+++ b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
@@ -72,7 +72,7 @@ public class ValidateMojo extends AbstractMojo {
* List of files to include. Specified as fileset patterns which are relative to the input directory whose contents will be scanned
* (see the sourceDirectory configuration option).
*/
- @Parameter
+ @Parameter(defaultValue = DEFAULT_INCLUDES)
private String[] includes;
/**
@@ -215,8 +215,9 @@ public class ValidateMojo extends AbstractMojo {
}
private String processIncludes() {
+ // since default = "" leads to null deal with that as well here
if (includes == null) {
- return DEFAULT_INCLUDES;
+ return "";
}
return join(includes, ',');
}
diff --git a/src/test/java/org/apache/sling/maven/htl/ValidateMojoTest.java b/src/test/java/org/apache/sling/maven/htl/ValidateMojoTest.java
index 86d14eb..24833e4 100644
--- a/src/test/java/org/apache/sling/maven/htl/ValidateMojoTest.java
+++ b/src/test/java/org/apache/sling/maven/htl/ValidateMojoTest.java
@@ -19,10 +19,18 @@ package org.apache.sling.maven.htl;
import java.io.File;
import java.util.List;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.MojoRule;
import org.apache.maven.plugin.testing.SilentLog;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.sonatype.plexus.build.incremental.DefaultBuildContext;
@@ -33,20 +41,22 @@ import static org.junit.Assert.assertTrue;
public class ValidateMojoTest {
- public static final String ERROR_SLY = "src/main/resources/apps/projects/error.sly";
- public static final String WARNING_SLY = "src/main/resources/apps/projects/warning.sly";
- public static final String SCRIPT_HTML = "src/main/resources/apps/projects/script.html";
- public static final String TEST_PROJECT = "test-project";
- public static final String EXPLICIT_INCLUDES_POM = "explicit-includes.pom.xml";
- public static final String EXPLICIT_EXCLUDES_POM = "explicit-excludes.pom.xml";
- public static final String FAIL_ON_WARNINGS_POM = "fail-on-warnings.pom.xml";
+ private static final String ERROR_SLY = "src/main/resources/apps/projects/error.sly";
+ private static final String WARNING_SLY = "src/main/resources/apps/projects/warning.sly";
+ private static final String SCRIPT_HTML = "src/main/resources/apps/projects/script.html";
+ private static final String EXCLUDE_HTML = "src/main/resources/apps/projects/exclude.html";
+ private static final String TEST_PROJECT = "test-project";
+ private static final String EXPLICIT_INCLUDES_POM = "explicit-includes.pom.xml";
+ private static final String EXPLICIT_EXCLUDES_POM = "explicit-excludes.pom.xml";
+ private static final String FAIL_ON_WARNINGS_POM = "fail-on-warnings.pom.xml";
+ private static final String DEFAULT_INCLUDES_POM = "default-includes.pom.xml";
@Rule
public MojoRule mojoRule = new MojoRule() {
@Override
protected void before() throws Throwable {
super.before();
- /**
+ /*
* Make sure the base directory is initialised properly for this test
*/
System.setProperty("basedir", new File("src" + File.separator + "test" + File.separator + "resources" + File
@@ -99,20 +109,51 @@ public class ValidateMojoTest {
assertEquals("Expected compilation warnings.", true, validateMojo.hasWarnings());
}
+ @Test
+ public void testDefaultIncludes() throws Exception {
+ File baseDir = new File(System.getProperty("basedir"));
+ ValidateMojo validateMojo = getMojo(baseDir, DEFAULT_INCLUDES_POM);
+ Exception exception = null;
+ try {
+ validateMojo.execute();
+ } catch (MojoFailureException e) {
+ exception = e;
+ }
+ List<File> processedFiles = validateMojo.getProcessedFiles();
+ assertNotNull("Expected a MojoFailureException.", exception);
+ assertEquals("Expected 2 files to process.", 2, processedFiles.size());
+ assertTrue("Expected exclude.html to be one of the processed files.", processedFiles.contains(new File(baseDir, EXCLUDE_HTML)));
+ assertTrue("Expected script.html to be one of the processed files.", processedFiles.contains(new File(baseDir, SCRIPT_HTML)));
+ assertEquals("Did not expect compilation warnings.", false, validateMojo.hasWarnings());
+ }
+
private ValidateMojo getMojo(File baseDir, String pomFile) throws Exception {
SilentLog log = new SilentLog();
DefaultBuildContext buildContext = new DefaultBuildContext();
- File pom = new File(baseDir, pomFile);
- ValidateMojo validateMojo = new ValidateMojo();
- mojoRule.configureMojo(validateMojo, mojoRule.extractPluginConfiguration("htl-maven-plugin", pom));
- MavenProject mavenProject = new ProjectStub(pom);
- mojoRule.setVariableValueToObject(validateMojo, "project", mavenProject);
+ // use lookupConfiguredMojo to also consider default values (https://issues.apache.org/jira/browse/MPLUGINTESTING-23)
+ // similar to MojoRule#lookupConfiguredMojo(File, String) but with custom pom file name
+ MavenProject project = readMavenProject(baseDir, pomFile);
+ MavenSession session = mojoRule.newMavenSession(project);
+ MojoExecution execution = mojoRule.newMojoExecution("validate");
+ ValidateMojo validateMojo = (ValidateMojo) mojoRule.lookupConfiguredMojo(session, execution);
validateMojo.setLog(log);
buildContext.enableLogging(log);
validateMojo.setBuildContext(buildContext);
return validateMojo;
}
-
+ /**
+ * Copied from {@code org.apache.maven.plugin.testing.readMavenProject(...)} but customized to allow custom pom names
+ */
+ private MavenProject readMavenProject(File basedir, String pomFileName) throws Exception {
+ File pom = new File(basedir, pomFileName);
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest();
+ request.setBaseDirectory(basedir);
+ ProjectBuildingRequest configuration = request.getProjectBuildingRequest();
+ configuration.setRepositorySession(new DefaultRepositorySystemSession());
+ MavenProject project = mojoRule.lookup(ProjectBuilder.class).build(pom, configuration).getProject();
+ Assert.assertNotNull(project);
+ return project;
+ }
}
diff --git a/src/test/resources/test-project/default-includes.pom.xml b/src/test/resources/test-project/default-includes.pom.xml
new file mode 100644
index 0000000..c06629d
--- /dev/null
+++ b/src/test/resources/test-project/default-includes.pom.xml
@@ -0,0 +1,49 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>htl-maven-plugin-it-default-includes</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>HTL Maven Plugin IT - Default includes</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>htl-maven-plugin</artifactId>
+ <configuration>
+ <sourceDirectory>src/main/resources</sourceDirectory>
+ <!-- only exclude.html will be compiled -->
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate-scripts</id>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 09/15: INFRA-13644 switch site publish url
to sling site staging area
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 8e7b2595427258a58df2a69b0ad93ead329b1eb3
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Jun 12 20:21:27 2017 +0000
INFRA-13644 switch site publish url to sling site staging area
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1798527 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 95279e9..c4dc3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/sling/content/components/${maven.site.path}</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/sling/site/trunk/content/components/${maven.site.path}</url>
</site>
</distributionManagement>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 15/15: [maven-release-plugin] copy for tag
htl-maven-plugin-1.0.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 8590326d1a2d890bf4066c438ee6e6e3519f8e49
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Aug 2 10:07:00 2017 +0000
[maven-release-plugin] copy for tag htl-maven-plugin-1.0.8
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/htl-maven-plugin-1.0.8@1803800 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 03/15: use Sling Parent 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 548e775d63334d51d9369fd25a1f95c408231bb9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:31:22 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1785622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1768a1f..fd343d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>28</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 02/15: releng: updated dependencies
post-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 htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 69a4d761f308f74c74d69e530bb8ea7080b6250b
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 13 12:19:13 2017 +0000
releng: updated dependencies post-release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1778566 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 84e8be5..1768a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.compiler</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 13/15: SLING-6651 - Improve documentation
for htl-maven-plugin
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit ca40a06b13fdbf78fa5f263137aa7b6623eeb6b2
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Aug 2 09:36:59 2017 +0000
SLING-6651 - Improve documentation for htl-maven-plugin
* added JIRA version IDs for the report page
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1803788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 11 +++++++++++
src/site/markdown/usage.md.vm | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 243c302..c90b40a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <site.jira.version.id>12336741,12338350,12338646,12338974,12341271</site.jira.version.id>
<maven.version>3.3.9</maven.version>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
@@ -233,6 +234,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <useJql>true</useJql>
+ <sortColumnNames>Key DESC</sortColumnNames>
+ <columnNames>Type,Key,Summary,Fix Version</columnNames>
+ <resolutionIds>Fixed</resolutionIds>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm
index cb89c11..1518825 100644
--- a/src/site/markdown/usage.md.vm
+++ b/src/site/markdown/usage.md.vm
@@ -47,7 +47,7 @@ $h3 Configuring Your HTL Maven Plugin
<executions>
<execution>
<goals>
- <!-- configure which goals you want to execute -->
+ <goal>validate</goal>
</goals>
</execution>
</executions>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 11/15: SLING-7026 - htl-maven-plugin:
Namespace all user properties
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 3b84ebc857ecb646dc3e954977ff6e127198015d
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Aug 1 14:15:34 2017 +0000
SLING-7026 - htl-maven-plugin: Namespace all user properties
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1803645 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/maven/htl/ValidateMojo.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
index 151f823..6426e29 100644
--- a/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
+++ b/src/main/java/org/apache/sling/maven/htl/ValidateMojo.java
@@ -65,7 +65,8 @@ public class ValidateMojo extends AbstractMojo {
/**
* Defines the root folder where this Mojo expects to find Sightly scripts to validate.
*/
- @Parameter(property = "sourceDirectory", defaultValue = "${project.build.sourceDirectory}")
+ @Parameter(property = "htl.sourceDirectory",
+ defaultValue = "${project.build.sourceDirectory}")
private File sourceDirectory;
/**
@@ -85,7 +86,8 @@ public class ValidateMojo extends AbstractMojo {
/**
* If set to "true" it will fail the build on compiler warnings.
*/
- @Parameter(property = "failOnWarnings", defaultValue = "false")
+ @Parameter(property = "htl.failOnWarnings",
+ defaultValue = "false")
private boolean failOnWarnings;
/**
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 08/15: version of maven-scm-publish-plugin
already defined in parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 2349942116ae227905b8e02231d62e0f37901f48
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Mar 10 17:02:04 2017 +0000
version of maven-scm-publish-plugin already defined in parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1786386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 472484e..95279e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
<configuration>
<checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-htl-maven-plugin] 04/15: enable maven plugin site generation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag htl-maven-plugin-1.0.8
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
commit 33bc150e3a4f1d09ec63d53116fe9ef38f6041b6
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:06:16 2017 +0000
enable maven plugin site generation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/htl-maven-plugin@1786253 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ++++++++++++++++++++++++++++
src/site/markdown/index.md | 6 ++++++
src/site/site.xml | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/pom.xml b/pom.xml
index fd343d2..aa45b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,18 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/htl-maven-plugin</url>
</scm>
+ <!-- Support for publishing the mvn site. -->
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/sling/content/components/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.3.3</maven.version>
+ <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
<dependencies>
@@ -169,6 +178,25 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
+ <tryUpdate>true</tryUpdate>
+ </configuration>
+ </plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000..1a4922e
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,6 @@
+HTL Maven Plugin
+================
+
+The Apache Sling HTL Maven Plugin provides support for validating HTML Template Language scripts from projects.
+
+See [Goals](plugin-info.html) for a list of supported goals.
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..9abab11
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Goals" href="plugin-info.html"/>
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.