This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-feature-converter-maven-plugin.git
commit 80b943772d0db0d5c7a8f265410d6da4c2c81fd4 Author: Stefan Seifert <[email protected]> AuthorDate: Wed Jan 14 13:38:36 2026 +0100 SLING-13056 fix plugin site generation --- pom.xml | 6 +++++- src/site/markdown/usage.md.vm | 28 ++++++++++++++-------------- src/site/site.xml | 16 +++------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 6806259..50355f5 100644 --- a/pom.xml +++ b/pom.xml @@ -280,7 +280,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> </plugin> </plugins> </reporting> diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm index 0d35249..3cc68f9 100644 --- a/src/site/markdown/usage.md.vm +++ b/src/site/markdown/usage.md.vm @@ -81,7 +81,7 @@ and so the copy of the resources is not done automatically: <artifactId>maven-resources-plugin</artifactId> <version>3.1.0</version> <configuration> - <outputDirectory>${sp}project.build.directory}</outputDirectory> + <outputDirectory>${sp}project.build.directory${ep}</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> @@ -118,9 +118,9 @@ equivalent so that we can launch it together with the converter CP packages late <configuration> <inputFolder>src/main/resources/sling/provisioning</inputFolder> <outputFolder>target/fm</outputFolder> - <groupId>${sp}{project.groupId}}</groupId> - <artifactId>${sp}{project.artifactId}}</artifactId> - <version>${sp}{project.version}}</version> + <groupId>${sp}{project.groupId}${ep}</groupId> + <artifactId>${sp}{project.artifactId}${ep}</artifactId> + <version>${sp}{project.version}${ep}</version> <frameworkProperties> launchpad:felix.systempackages.substitution=true, launchpad:felix.systempackages.calculate.uses=true @@ -156,8 +156,8 @@ Then we convert the Content Package: <artifactIdOverride>${sp2}project.groupId}}:${sp2}project.artifactId}}:slingosgifeature:${sp3}filename}}}:${sp2}project.version}}</artifactIdOverride> <installConvertedCP>true</installConvertedCP> <!-- Attention: because of the hack to deal with the overrides in the local Repo the generated files must be placed locally and not in the local Maven repo --> - <convertedCPOutput>${sp}project.build.directory}/fm.out</convertedCPOutput> - <fmOutput>${sp}project.build.directory}/fm</fmOutput> + <convertedCPOutput>${sp}project.build.directory${ep}/fm.out</convertedCPOutput> + <fmOutput>${sp}project.build.directory${ep}/fm</fmOutput> <fmPrefix>test-ui-apps-</fmPrefix> <contentPackages> <contentPackage> @@ -196,7 +196,7 @@ Now we can aggregate, collect them into a single FM file (attach) and verify all <phase>generate-test-sources</phase> <goals> <goal>aggregate-features</goal> - <generatedFeatures>${sp}basedir}/target/fm</generatedFeatures> + <generatedFeatures>${sp}basedir${ep}/target/fm</generatedFeatures> </goals> <configuration> <aggregates> @@ -313,7 +313,7 @@ First in each Content Package module add this plugin configuration to your POM i <plugin> <groupId>org.apache.sling</groupId> <artifactId>sling-feature-converter-maven-plugin</artifactId> - <version>${sp}sling-feature-converter-maven-plugin.version}</version> + <version>${sp}sling-feature-converter-maven-plugin.version${ep}</version> <extensions>true</extensions> <executions> <execution> @@ -323,16 +323,16 @@ First in each Content Package module add this plugin configuration to your POM i <goal>convert-cp</goal> </goals> <configuration> - <artifactIdOverride>${sp}project.groupId}:${sp}project.artifactId}:slingosgifeature:${sp3}filename}}}:${sp}project.version}</artifactIdOverride> + <artifactIdOverride>${sp}project.groupId${ep}:${sp}project.artifactId${ep}:slingosgifeature:${sp3}filename}}}:${sp}project.version${ep}</artifactIdOverride> <installConvertedCP>true</installConvertedCP> - <convertedCPOutput>${sp}project.build.directory}/fm.out</convertedCPOutput> - <fmOutput>${sp}project.build.directory}/fm</fmOutput> + <convertedCPOutput>${sp}project.build.directory${ep}/fm.out</convertedCPOutput> + <fmOutput>${sp}project.build.directory${ep}/fm</fmOutput> <fmPrefix>peregrine-</fmPrefix> <isContentPackage>true</isContentPackage> <contentPackages> <contentPackage> - <groupId>${sp}project.groupId}</groupId> - <artifactId>${sp}project.artifactId}</artifactId> + <groupId>${sp}project.groupId${ep}</groupId> + <artifactId>${sp}project.artifactId${ep}</artifactId> </contentPackage> </contentPackages> </configuration> @@ -357,7 +357,7 @@ Now we can go to the Assembly part and add the FM installed locally as artifact: <plugin> <groupId>org.apache.sling</groupId> <artifactId>slingfeature-maven-plugin</artifactId> - <version>${slingfeature-maven-plugin.version}</version> + <version>${sp}slingfeature-maven-plugin.version${ep}</version> <extensions>true</extensions> <configuration> <features>target/fm</features> diff --git a/src/site/site.xml b/src/site/site.xml index 2594b86..cc79576 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -18,13 +18,8 @@ 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> +<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"/> @@ -33,9 +28,4 @@ under the License. </menu> <menu ref="reports"/> </body> - <custom> - <fluidoSkin> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> -</project> +</site>
