This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/fix-site in repository https://gitbox.apache.org/repos/asf/sling-feature-launcher-maven-plugin.git
commit ce920a9cd093273546f8416d1c5b3d7a6b641941 Author: Konrad Windszus <[email protected]> AuthorDate: Mon Dec 15 17:51:05 2025 +0100 SLING-13031 Fix Maven Site Linkout to javadoc from plugin doc Migrate to Site Descriptor 2.0 --- pom.xml | 17 +++++------------ .../apache/sling/maven/feature/launcher/StartMojo.java | 2 +- src/site/markdown/index.md | 2 +- src/site/site.xml | 6 +++--- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index d56c769..456db63 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>62</version> + <version>65-SNAPSHOT</version> <relativePath /> </parent> @@ -40,7 +40,7 @@ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-feature-launcher-maven-plugin.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-feature-launcher-maven-plugin.git</developerConnection> <tag>HEAD</tag> - <url>https://github.com/apache/sling-feature-launcher-maven-plugin</url> + <url>https://github.com/apache/sling-feature-launcher-maven-plugin/tree/${project.scm.tag}</url> </scm> <properties> @@ -74,6 +74,7 @@ <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> + <version>3.15.2</version> <scope>provided</scope> </dependency> <dependency> @@ -128,6 +129,7 @@ <configuration> <!-- <goalPrefix>maven-archetype-plugin</goalPrefix> --> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + <internalJavadocBaseUrl>./apidocs/</internalJavadocBaseUrl> </configuration> <executions> <execution> @@ -147,7 +149,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>3.6.1</version> <configuration> <debug>true</debug> <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> @@ -158,10 +159,6 @@ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <streamLogsOnFailures>true</streamLogsOnFailures> - <goals> - <goal>clean</goal> - <goal>verify</goal> - </goals> </configuration> <executions> <execution> @@ -181,15 +178,11 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-plugin-report-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <!-- No javadocs --> - <excludePackageNames>org.apache.sling</excludePackageNames> - </configuration> </plugin> </plugins> </reporting> diff --git a/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java b/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java index a678c72..e9f3ab5 100644 --- a/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java +++ b/src/main/java/org/apache/sling/maven/feature/launcher/StartMojo.java @@ -95,7 +95,7 @@ public class StartMojo extends AbstractMojo { * .. * </launcherArguments> * <repositoryUrls> - * <repositoryUrl>file://${project.build.directory}/artifacts</repositoryUrl> + * <repositoryUrl>file://.../artifacts</repositoryUrl> * <repositoryUrl>https://repo1.maven.org/maven2/</repositoryUrl> * </repositoryUrls> * <environmentVariables><!--additional environment variables to pass to the launcher --> diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index f26d253..92335a8 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -6,7 +6,7 @@ It leverages the [Sling Feature Launcher](https://github.com/apache/sling-org-ap ## Example Usage -``` +```xml <plugin> <groupId>org.apache.sling</groupId> <artifactId>feature-launcher-maven-plugin</artifactId> diff --git a/src/site/site.xml b/src/site/site.xml index ed0c80c..39b9e50 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -18,8 +18,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - -<project> +<site xmlns="http://maven.apache.org/SITE/2.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd";> <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> @@ -27,4 +27,4 @@ under the License. </menu> <menu ref="reports"/> </body> -</project> +</site>
