This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-jspc-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new f5f200a trivial: prepared for release
f5f200a is described below
commit f5f200a2a99caf8bdd4358035663efe6f01bb977
Author: Radu Cotescu <[email protected]>
AuthorDate: Thu Jun 18 15:30:40 2020 +0200
trivial: prepared for release
---
pom.xml | 14 +++++-
.../sling/maven/jspc/JspCTldLocationsCache.java | 28 ++++++------
.../java/org/apache/sling/maven/jspc/JspcMojo.java | 4 +-
src/site/markdown/index.md | 48 --------------------
src/site/markdown/index.md.vm | 51 ++++++++++++++++++++++
5 files changed, 80 insertions(+), 65 deletions(-)
diff --git a/pom.xml b/pom.xml
index ac4c4ea..870bf17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,12 @@
<relativePath />
</parent>
- <groupId>org.apache.sling</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.1.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling JSPC Maven Plugin</name>
- <description>Maven Plugin for compiling JSP sources into
bundles</description>
+ <description>Maven Plugin for compiling JSP files into Java
classes</description>
<url>https://sling.apache.org/components/jspc-maven-plugin/</url>
<scm>
@@ -44,6 +43,7 @@
<properties>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
+
<site.jira.version.id>12313225,12313347,12319479,12319561,12325751,12347153</site.jira.version.id>
</properties>
<build>
@@ -100,6 +100,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>resolutiondate DESC</sortColumnNames>
+ <columnNames>Type,Key,Summary,Fix Version</columnNames>
+ <resolutionIds>Fixed</resolutionIds>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
diff --git
a/src/main/java/org/apache/sling/maven/jspc/JspCTldLocationsCache.java
b/src/main/java/org/apache/sling/maven/jspc/JspCTldLocationsCache.java
index b7d2654..bd62cc8 100644
--- a/src/main/java/org/apache/sling/maven/jspc/JspCTldLocationsCache.java
+++ b/src/main/java/org/apache/sling/maven/jspc/JspCTldLocationsCache.java
@@ -50,12 +50,12 @@ import org.xml.sax.InputSource;
* for the web application.
*
* Tag Libraries can be defined globally in one of two ways:
- * 1. Via <taglib> elements in web.xml:
+ * 1. Via <taglib> elements in web.xml:
* the uri and location of the tag-library are specified in
- * the <taglib> element.
+ * the <taglib> element.
* 2. Via packaged jar files that contain .tld files
* within the META-INF directory, or some subdirectory
- * of it. The taglib is 'global' if it has the <uri>
+ * of it. The taglib is 'global' if it has the <uri>
* element defined.
*
* A mapping between the taglib URI and its associated TaglibraryInfoImpl
@@ -167,15 +167,14 @@ public class JspCTldLocationsCache extends
TldLocationsCache {
noTldJars.add("sunpkcs11.jar");
}
- /** Constructor.
+ /**
+ * Constructor.
*
- * @param ctxt the servlet context of the web application in which Jasper
- * is running
- * @param redeployMode if true, then the compiler will allow redeploying
- * a tag library from the same jar, at the expense of slowing down the
- * server a bit. Note that this may only work on JDK 1.3.1_01a and later,
- * because of JDK bug 4211817 fixed in this release.
- * If redeployMode is false, a faster but less capable mode will be used.
+ * @param ctxt the servlet context of the web application in which
Jasper is running
+ * @param redeployMode if true, then the compiler will allow redeploying a
tag library from the same jar, at the expense of slowing down
+ * the server a bit. Note that this may only work on
JDK 1.3.1_01a and later, because of JDK bug 4211817 fixed in
+ * this release. If redeployMode is false, a faster
but less capable mode will be used.
+ * @param loader the classloader to use
*/
public JspCTldLocationsCache(ServletContext ctxt, boolean redeployMode,
ClassLoader loader) {
this.ctxt = ctxt;
@@ -250,6 +249,9 @@ public class JspCTldLocationsCache extends
TldLocationsCache {
* ABS_URI
* ROOT_REL_URI
* NOROOT_REL_URI
+ *
+ * @param uri the URI for which to return the type
+ * @return the URI type
*/
public static int uriType(String uri) {
if (uri.indexOf(':') != -1) {
@@ -364,7 +366,7 @@ public class JspCTldLocationsCache extends
TldLocationsCache {
/**
* Scans the given JarURLConnection for TLD files located in META-INF
* (or a subdirectory of it), adding an implicit map entry to the taglib
- * map for any TLD that has a <uri> element.
+ * map for any TLD that has a <uri> element.
*
* @param conn The JarURLConnection to the JAR file to scan
* @param ignore true if any exceptions raised when processing the given
@@ -434,7 +436,7 @@ public class JspCTldLocationsCache extends
TldLocationsCache {
/*
* Searches the filesystem under /WEB-INF for any TLD files, and adds
- * an implicit map entry to the taglib map for any TLD that has a <uri>
+ * an implicit map entry to the taglib map for any TLD that has a
<uri>
* element.
*/
private void processTldsInFileSystem(String startPath)
diff --git a/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
b/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
index c52eb08..3624f21 100644
--- a/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
+++ b/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
@@ -122,13 +122,13 @@ public class JspcMojo extends AbstractMojo implements
Options {
/**
* The Target Virtual Machine Version to generate class files for.
*/
- @Parameter ( property = "jspc.compilerTargetVM", defaultValue = "1.5")
+ @Parameter ( property = "jspc.compilerTargetVM", defaultValue = "1.8")
private String compilerTargetVM;
/**
* The Compiler Source Version of the Java source generated from the JSP
files before compiling into classes.
*/
- @Parameter ( property = "jspc.compilerSourceVM", defaultValue = "1.5")
+ @Parameter ( property = "jspc.compilerSourceVM", defaultValue = "1.8")
private String compilerSourceVM;
/**
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
deleted file mode 100644
index 67f49ba..0000000
--- a/src/site/markdown/index.md
+++ /dev/null
@@ -1,48 +0,0 @@
-JspC Maven Plugin
-=================
-
-Compiles JSP scripts into class files and generates Declarative Service
Descriptors to register the compiled JSPs as services.
-
-See [Goals](plugin-info.html) for a list of supported goals.
-
-
-## Overview
-
-The Maven JspC Plugin provides a single goal `jspc` which is by default
executed in the `compile` phase of the Maven build process. This goal takes all
JSP source files from a configured location (`src/main/scripts` by default) and
compiles them into classes in a configurable location
(`target/jspc-plugin-generated` by default). In addition, for each compiled JSP
a Declarative Services descriptor is generated and written to a descriptor file
(`OSGI-INF/jspServiceComponents.xml` in the ou [...]
-
-
-## Usage
-
-To use the Maven JspC Plugin define the following elements in the `<plugins>`
section of the POM:
-
-
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <project>
- ....
- <build>
- ....
- <plugins>
- ....
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-jsp</id>
- <goals>
- <goal>jspc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- ....
- <plugins>
- ....
- <build>
- ....
- <project>
-
-
-## Notes
-
-The generated JSP classes as well as the Declarative Services descriptor are
automatically copied to the generated bundle jar file if the Maven Bundle
Plugin (from the Apache Felix) project is used to build the project package.
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
new file mode 100644
index 0000000..c842777
--- /dev/null
+++ b/src/site/markdown/index.md.vm
@@ -0,0 +1,51 @@
+#set($h1 = '#')
+#set($h2 = '##')
+#set($h3 = '###')
+#set($h4 = '####')
+
+The Apache Sling JSPC Maven Plugin Compiles JSP scripts into class files.
+
+See [Goals](plugin-info.html) for a list of supported goals.
+
+$h2 Overview
+
+The JSPC Maven Plugin provides a single goal `jspc` which is by default
executed in the `compile` phase of the Maven build process. This
+goal takes all JSP source files from a configured location (`src/main/scripts`
by default) and compiles them into classes in a
+configurable location (`target/classes` by default).
+
+$h2 Usage
+
+To use the JSPC Maven Plugin define the following elements in the `<plugins>`
section of the POM:
+
+```
+<project>
+ ....
+ <build>
+ ....
+ <plugins>
+ ....
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>compile-jsp</id>
+ <goals>
+ <goal>jspc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ ....
+ <plugins>
+ ....
+ <build>
+ ....
+<project>
+```
+
+## Notes
+
+The generated JSP classes are automatically copied to the generated bundle jar
file if the Maven Bundle Plugin is used to build the project
+package.
