You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/09/03 16:26:14 UTC
[sling-htl-maven-plugin] branch master updated: SLING-9653 use
parent 45
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b6d86b5 SLING-9653 use parent 45
b6d86b5 is described below
commit b6d86b5cfa1281e17d4f6191017a53f20f5687a9
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Sep 3 18:26:10 2021 +0200
SLING-9653 use parent 45
inherit site configuration (remove duplicate)
fix spotbugs issue
remove unused plexus-component-metadata plugin
---
pom.xml | 22 ++++++----------------
.../maven/htl/compiler/HTLJavaImportsAnalyzer.java | 3 ++-
src/site/site.xml | 16 ++++------------
3 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d55a32..1332dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>35</version>
+ <version>45</version>
<relativePath />
</parent>
@@ -39,7 +39,7 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-htl-maven-plugin.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=sling-htl-maven-plugin.git</url>
+ <url>https://github.com/apache/sling-htl-maven-plugin/tree/master</url>
<tag>HEAD</tag>
</scm>
@@ -49,12 +49,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.outputTimestamp>2020-01-22T15:10:38Z</project.build.outputTimestamp>
<site.jira.version.id>12336741,12338350,12338646,12338974,12341271,12342047,12342267,12342272,12343462,
12343846,12344079,12344332,12344876,12345571,12346551,12346590,12346596,12348677</site.jira.version.id>
<maven.version>3.3.9</maven.version>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
<sightly.runtime.version>1.2.0-1.4.0</sightly.runtime.version>
<argLine />
+ <!-- the github id used for the ribbon for Maven sites: https://maven.apache.org/skins/maven-fluido-skin/#GitHub_ribbons -->
+ <github.project.id>apache/sling-htl-maven-plugin</github.project.id>
</properties>
<!-- force maven-plugin-testing-harness to use newer plexus container (https://issues.apache.org/jira/browse/MPLUGINTESTING-53) -->
@@ -212,18 +215,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -245,9 +236,8 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.11</version>
+ <version>4.3.0</version>
<configuration>
- <effort>Max</effort>
<xmlOutput>true</xmlOutput>
</configuration>
<executions>
diff --git a/src/main/java/org/apache/sling/maven/htl/compiler/HTLJavaImportsAnalyzer.java b/src/main/java/org/apache/sling/maven/htl/compiler/HTLJavaImportsAnalyzer.java
index 93d72a6..33dd86a 100644
--- a/src/main/java/org/apache/sling/maven/htl/compiler/HTLJavaImportsAnalyzer.java
+++ b/src/main/java/org/apache/sling/maven/htl/compiler/HTLJavaImportsAnalyzer.java
@@ -18,6 +18,7 @@
******************************************************************************/
package org.apache.sling.maven.htl.compiler;
+import java.util.HashSet;
import java.util.Set;
import org.apache.sling.scripting.sightly.java.compiler.JavaImportsAnalyzer;
@@ -27,7 +28,7 @@ public class HTLJavaImportsAnalyzer implements JavaImportsAnalyzer {
private Set<String> ignoreImports;
public HTLJavaImportsAnalyzer(Set<String> ignoreImports) {
- this.ignoreImports = ignoreImports;
+ this.ignoreImports = new HashSet<>(ignoreImports);
}
@Override
diff --git a/src/site/site.xml b/src/site/site.xml
index 2592253..949fef4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,23 +18,15 @@ 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>
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"
+ name="HTL Maven Plugin">
<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"/>
+ <menu ref="reports" inherit="bottom"/>
</body>
- <custom>
- <fluidoSkin>
- <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
- </fluidoSkin>
- </custom>
</project>