diff --git a/.asf.yaml b/.asf.yaml index 09e58fc8d..5c545b022 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -28,8 +28,10 @@ github: squash: true merge: false rebase: true + autolink_jira: + - MSITE notifications: commits: commits@maven.apache.org issues: issues@maven.apache.org pullrequests: issues@maven.apache.org - jira_options: link label comment + jira_options: link label diff --git a/.github/dependabot.yml b/.github/dependabot.yml index eb730a80f..1fed810d3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,24 +16,29 @@ # version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - time: '04:00' - open-pull-requests-limit: 10 - ignore: - # ignore Java 8+ dependencies - - dependency-name: org.mockito:mockito-core - versions: - - ">= 3.0" - - dependency-name: org.apache.commons:commons-lang3 - versions: - - ">= 3.9" - - dependency-name: commons-io:commons-io - versions: - - ">= 2.7" - # Ignore Maven 3.2.1+ - - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-tools - versions: - - ">=3.2.0" \ No newline at end of file + - package-ecosystem: maven + directory: "/" + schedule: + interval: daily + time: '04:00' + open-pull-requests-limit: 10 + ignore: + # ignore Java 8+ dependencies + - dependency-name: org.mockito:mockito-core + versions: + - ">= 3.0" + - dependency-name: org.apache.commons:commons-lang3 + versions: + - ">= 3.9" + - dependency-name: commons-io:commons-io + versions: + - ">= 2.7" + # Ignore Maven 3.2.1+ + - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-tools + versions: + - ">=3.2.0" + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index bbd778653..932827cf9 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -24,4 +24,4 @@ on: jobs: build: name: Verify - uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 8f5959c96..b6d540723 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -24,4 +24,4 @@ on: - master jobs: update_release_draft: - uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v2 + uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4 diff --git a/Jenkinsfile b/Jenkinsfile index a6f5f3ddb..02ccc0c82 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild(jdk:['8','11','14'], maven:['3.3.x', '3.5.x', '3.8.x']) +asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.6.x', '3.8.x', '3.9.x']) diff --git a/README.md b/README.md index 67ab809f0..4eccc69ca 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,9 @@ Contributing to [Apache Maven Site Plugin](https://maven.apache.org/plugins/mave [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSITE.json)][jira] [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] -[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-site-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-site-plugin) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-site-plugin.svg?label=Maven%20Central&versionPrefix=3.1)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-site-plugin) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-site-plugin.svg?label=Maven%20Central&versionPrefix=3.)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-site-plugin) +[![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/apache/maven/plugins/maven-site-plugin/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/plugins/maven-site-plugin/README.md) [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-site-plugin/job/master.svg?)][build] [![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-site-plugin/job/master.svg?)][test-results] diff --git a/pom.xml b/pom.xml index d8afa4598..3c2144e10 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - - 4.0.0 org.apache.maven.plugins maven-plugins - 34 + 43 maven-site-plugin - 3.12.1-SNAPSHOT + 4.0.0-M17-SNAPSHOT maven-plugin Apache Maven Site Plugin @@ -176,8 +174,8 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git - https://github.com/apache/maven-site-plugin/tree/${project.scm.tag} HEAD + https://github.com/apache/maven-site-plugin/tree/${project.scm.tag} JIRA @@ -185,7 +183,7 @@ under the License. Jenkins - https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-site-plugin/ + https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-site-plugin/ @@ -195,24 +193,27 @@ under the License. - 3.2.5 8 - + 3.6.3 - 1.11.1 - 1.11.1 - 9.4.46.v20220331 - 3.5.1 + 9.4.56.v20240826 + 2.0.0 + 2.0.0 + 3.5.3 1.7.36 - 3.1.2 - 3.3.2 - 3.16.0 - 3.2.0 - 3.2.2 - 2.22.2 - 2.22.2 - 2022-04-16T21:02:16Z + 3.5.0 + 3.10.1 + 3.25.0 + 3.5.0 + 3.7.0 + 3.5.1 + 3.15.0 + 3.2.1 + 3.1.0 + 4.0.0 + 2.0.0-M11 + 2024-07-17T13:43:56Z @@ -220,17 +221,17 @@ under the License. org.apache.maven.reporting maven-reporting-api - 3.1.0 + 4.0.0 org.apache.maven.reporting maven-reporting-exec - 1.6.0 + 2.0.0 org.apache.maven.shared maven-shared-utils - 3.3.4 + 3.4.2 @@ -244,7 +245,7 @@ under the License. org.apache.maven maven-compat ${mavenVersion} - provided + test org.apache.maven @@ -254,7 +255,7 @@ under the License. org.apache.maven - maven-aether-provider + maven-resolver-provider ${mavenVersion} provided @@ -286,7 +287,7 @@ under the License. org.apache.maven maven-archiver - 3.5.2 + 3.6.3 @@ -295,19 +296,23 @@ under the License. maven-plugin-annotations provided + + javax.inject + javax.inject + 1 + provided + - org.sonatype.sisu - sisu-inject-plexus - 1.4.2 + org.eclipse.sisu + org.eclipse.sisu.plexus provided - org.codehaus.plexus plexus-archiver - 4.2.5 + 4.10.0 @@ -324,7 +329,10 @@ under the License. org.codehaus.plexus plexus-utils - 3.3.1 + + + org.codehaus.plexus + plexus-xml @@ -333,17 +341,11 @@ under the License. doxia-sink-api ${doxiaVersion} - org.apache.maven.doxia doxia-core ${doxiaVersion} - - org.apache.maven.doxia - doxia-module-xhtml - ${doxiaVersion} - org.apache.maven.doxia doxia-module-xhtml5 @@ -372,28 +374,11 @@ under the License. ${doxiaVersion} runtime - - org.apache.maven.doxia - doxia-module-confluence - ${doxiaVersion} - runtime - - - org.apache.maven.doxia - doxia-module-docbook-simple - ${doxiaVersion} - runtime - - - org.apache.maven.doxia - doxia-module-twiki - ${doxiaVersion} - runtime - + org.apache.maven.doxia - doxia-decoration-model + doxia-site-model ${doxiaSitetoolsVersion} @@ -407,12 +392,6 @@ under the License. org.apache.maven.doxia doxia-integration-tools ${doxiaSitetoolsVersion} - - - org.codehaus.plexus - plexus-container-default - - @@ -436,6 +415,18 @@ under the License. + + org.apache.maven.scm + maven-scm-api + 2.1.0 + + + + org.apache.commons + commons-lang3 + 3.17.0 + + javax.servlet javax.servlet-api @@ -449,6 +440,12 @@ under the License. ${jettyVersion} + + org.eclipse.jetty + jetty-http + ${jettyVersion} + + org.eclipse.jetty jetty-servlet @@ -502,13 +499,6 @@ under the License. test - - commons-io - commons-io - 2.11.0 - test - - org.apache.maven.plugin-testing @@ -529,6 +519,35 @@ under the License. run-its + + org.apache.maven.plugins + maven-clean-plugin + + + + delete-0-byte-site-descriptors + + clean + + pre-integration-test + + true + + + ${settings.localRepository}/org/apache/apache + + **/*-site*.xml + + + + + + + org.apache.maven.plugins maven-invoker-plugin @@ -537,6 +556,7 @@ under the License. src/it/mrm/settings.xml ${mrm.repository.url} + ${testingFluidoSkinVersion} clean @@ -552,7 +572,12 @@ under the License. org.codehaus.mojo mrm-maven-plugin - 1.3.0 + 1.6.0 + + + + + @@ -561,14 +586,6 @@ under the License. - - - - src/it/mrm/repository - - - - @@ -579,9 +596,9 @@ under the License. - org.codehaus.mojo + com.googlecode.l10n-maven-plugin l10n-maven-plugin - 1.0-alpha-2 + 1.8 ca diff --git a/src/it/mrm/settings.xml b/src/it/mrm/settings.xml index d939e59e9..4ce9b3555 100644 --- a/src/it/mrm/settings.xml +++ b/src/it/mrm/settings.xml @@ -76,9 +76,9 @@ under the License. msite604 - settingsId - file://@project.build.directory@/it/MSITE-604/target/root - settingsBase + settingsId + file://@project.build.directory@/it/MSITE-604/target/root + settingsBase diff --git a/src/it/projects/MSITE-159/pom.xml b/src/it/projects/MSITE-159/pom.xml index e2f3c88d6..374bf3772 100644 --- a/src/it/projects/MSITE-159/pom.xml +++ b/src/it/projects/MSITE-159/pom.xml @@ -31,6 +31,10 @@ under the License. http://webhost.company.com/ + + @fluidoSkinVersion@ + + website @@ -45,7 +49,7 @@ under the License. maven-site-plugin @project.version@ - false + false @@ -56,7 +60,7 @@ under the License. maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-159/src/site/site.xml b/src/it/projects/MSITE-159/src/site/site.xml index c666a02d1..5117797bd 100644 --- a/src/it/projects/MSITE-159/src/site/site.xml +++ b/src/it/projects/MSITE-159/src/site/site.xml @@ -19,8 +19,14 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + @@ -35,4 +41,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-159/verify.bsh b/src/it/projects/MSITE-159/verify.bsh index 8b9b875f3..34dc3f055 100644 --- a/src/it/projects/MSITE-159/verify.bsh +++ b/src/it/projects/MSITE-159/verify.bsh @@ -41,9 +41,9 @@ try } String content = FileUtils.fileRead( index, "UTF-8" ); - int index1 = content.indexOf( "Breadcrumb" ); - int index2 = content.indexOf( "Link" ); - int index3 = content.indexOf( "Menu" ); + int index1 = content.indexOf( "Breadcrumb" ); + int index2 = content.indexOf( "Link" ); + int index3 = content.indexOf( "Menu" ); if ( index1 < 0 || index2 < 0 || index3 < 0 ) { System.err.println( "index.html has incorrect links!" ); diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml index 7142d9034..44a89ca77 100644 --- a/src/it/projects/MSITE-265/pom.xml +++ b/src/it/projects/MSITE-265/pom.xml @@ -34,6 +34,7 @@ under the License. 3.0.5 UTF-8 + @fluidoSkinVersion@ @@ -42,7 +43,7 @@ under the License. maven-site-plugin @project.version@ - en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN + default,en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN @@ -52,7 +53,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.1.2 + @projectInfoReportsPluginVersion@ @@ -64,7 +65,7 @@ under the License. org.codehaus.mojo taglist-maven-plugin - 2.0 + @taglistPluginVersion@ diff --git a/src/it/projects/MSITE-265/src/site/site.xml b/src/it/projects/MSITE-265/src/site/site.xml index 2cfb48659..3dbd83748 100644 --- a/src/it/projects/MSITE-265/src/site/site.xml +++ b/src/it/projects/MSITE-265/src/site/site.xml @@ -19,15 +19,15 @@ specific language governing permissions and limitations under the License. --> - + org.apache.maven.skins - maven-stylus-skin - 1.5 + maven-fluido-skin + ${fluidoSkinVersion} @@ -41,4 +41,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-265/verify.bsh b/src/it/projects/MSITE-265/verify.bsh index e4603090b..400667d82 100644 --- a/src/it/projects/MSITE-265/verify.bsh +++ b/src/it/projects/MSITE-265/verify.bsh @@ -71,9 +71,9 @@ try System.err.println( "download.html doesn't contain Download Maven 3.0.5" ); return false; } - if ( downloadContent.indexOf( "charset=UTF-8" ) < 0 ) + if ( downloadContent.indexOf( "charset=\"UTF-8\"" ) < 0 ) { - System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" ); + System.err.println( "download.html doesn't contain 'charset=\"UTF-8\"' directive" ); return false; } if ( downloadContent.indexOf( "demo character: € (euro)" ) < 0 ) diff --git a/src/it/projects/MSITE-354/pom.xml b/src/it/projects/MSITE-354/pom.xml index 543ff47d4..912ac9c61 100644 --- a/src/it/projects/MSITE-354/pom.xml +++ b/src/it/projects/MSITE-354/pom.xml @@ -54,12 +54,12 @@ under the License. - + maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-456/pom.xml b/src/it/projects/MSITE-456/pom.xml index a74e5bcb5..0e420c595 100644 --- a/src/it/projects/MSITE-456/pom.xml +++ b/src/it/projects/MSITE-456/pom.xml @@ -45,7 +45,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-456/verify.bsh b/src/it/projects/MSITE-456/verify.bsh index f54f9bc69..b63853a7e 100644 --- a/src/it/projects/MSITE-456/verify.bsh +++ b/src/it/projects/MSITE-456/verify.bsh @@ -40,8 +40,8 @@ try } String content = FileUtils.fileRead( parentIndex, "UTF-8" ); - int index1 = content.indexOf( "MSITE-456 - child" ); - int index2 = content.indexOf( "Project Information" ); + int index1 = content.indexOf( "MSITE-456 - child" ); + int index2 = content.indexOf( "Project Information" ); if ( index1 < 0 || index2 < 0 ) @@ -75,8 +75,8 @@ try } content = FileUtils.fileRead( childIndex, "UTF-8" ); - index1 = content.indexOf( "MSITE-456 - parent" ); - index2 = content.indexOf( "Project Information" ); + index1 = content.indexOf( "MSITE-456 - parent" ); + index2 = content.indexOf( "Project Information" ); if ( index1 < 0 || index2 < 0 ) { diff --git a/src/it/projects/MSITE-458/pom.xml b/src/it/projects/MSITE-458/pom.xml index e6f60b0c3..43eb1293c 100644 --- a/src/it/projects/MSITE-458/pom.xml +++ b/src/it/projects/MSITE-458/pom.xml @@ -31,6 +31,7 @@ under the License. UTF-8 + @fluidoSkinVersion@ @@ -53,7 +54,7 @@ under the License. maven-project-info-reports-plugin - 2.4 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-458/src/site/site.xml b/src/it/projects/MSITE-458/src/site/site.xml index 1e4a3366d..f4bd950db 100644 --- a/src/it/projects/MSITE-458/src/site/site.xml +++ b/src/it/projects/MSITE-458/src/site/site.xml @@ -19,8 +19,15 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + - + diff --git a/src/it/projects/MSITE-484/invoker.properties b/src/it/projects/MSITE-484/invoker.properties index 5fcde54ed..978b68af6 100644 --- a/src/it/projects/MSITE-484/invoker.properties +++ b/src/it/projects/MSITE-484/invoker.properties @@ -14,5 +14,3 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - -invoker.maven.version = 3.0+ diff --git a/src/it/projects/MSITE-484/pom.xml b/src/it/projects/MSITE-484/pom.xml index e8e50dc5e..8cd975c4a 100644 --- a/src/it/projects/MSITE-484/pom.xml +++ b/src/it/projects/MSITE-484/pom.xml @@ -28,6 +28,12 @@ under the License. 1.0-SNAPSHOT parent http://url + + + jira + http://example.com + + @@ -47,7 +53,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.2 + @projectInfoReportsPluginVersion@ false @@ -56,8 +62,8 @@ under the License. summary index - cim - issue-tracking + ci-management + issue-management scm diff --git a/src/it/projects/MSITE-484/verify.groovy b/src/it/projects/MSITE-484/verify.groovy index 65845249b..134f02c25 100644 --- a/src/it/projects/MSITE-484/verify.groovy +++ b/src/it/projects/MSITE-484/verify.groovy @@ -18,11 +18,11 @@ * under the License. */ -assert new File( basedir, 'target/site/issue-tracking.html' ).exists(); +assert new File( basedir, 'target/site/issue-management.html' ).exists(); assert new File( basedir, 'parent-usage-test/target/site/xref/index.html' ).exists(); assert new File( basedir, 'parent-usage-test/target/site/xref-test/index.html' ).exists(); -assert new File( basedir, 'parent-usage-test/target/site/issue-tracking.html' ).exists(); +assert new File( basedir, 'parent-usage-test/target/site/issue-management.html' ).exists(); assert new File( basedir, 'parent-usage-test/target/site/apidocs' ).exists(); -return true; \ No newline at end of file +return true; diff --git a/src/it/projects/MSITE-497/apps/app/pom.xml b/src/it/projects/MSITE-497/apps/app/pom.xml index a8a17815e..beea72643 100644 --- a/src/it/projects/MSITE-497/apps/app/pom.xml +++ b/src/it/projects/MSITE-497/apps/app/pom.xml @@ -32,14 +32,19 @@ under the License. - log4j - log4j - 1.2.16 + org.apache.logging.log4j + log4j-api + 2.20.0 + + + org.apache.logging.log4j + log4j-core + 2.20.0 junit junit - 3.8.2 + 4.13.2 test diff --git a/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java b/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java index 0a9ac1777..35e450464 100644 --- a/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java +++ b/src/it/projects/MSITE-497/apps/app/src/main/java/org/apache/maven/App.java @@ -19,13 +19,14 @@ * under the License. */ -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class App { public static void main( String[] args ) { - Logger mylogger = Logger.getLogger("MyLogger"); + Logger mylogger = LogManager.getLogger("MyLogger"); mylogger.info( "Hello World!" ); } } diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml index 2e2129196..200f3cf7b 100644 --- a/src/it/projects/MSITE-497/pom.xml +++ b/src/it/projects/MSITE-497/pom.xml @@ -28,6 +28,10 @@ under the License. pom parent + + @fluidoSkinVersion@ + + apps @@ -38,7 +42,7 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 2.3.1 + 3.13.0 org.apache.maven.plugins @@ -48,8 +52,7 @@ under the License. org.apache.maven.plugins maven-site-plugin - - 2.1.1 + @project.version@ org.apache.maven.plugins @@ -70,27 +73,4 @@ under the License. - - - maven-3 - - - - ${basedir} - - - - - - - org.apache.maven.plugins - maven-site-plugin - @project.version@ - - - - - - diff --git a/src/it/projects/MSITE-497/src/site/site.xml b/src/it/projects/MSITE-497/src/site/site.xml index c8e55cd50..ebd094f47 100644 --- a/src/it/projects/MSITE-497/src/site/site.xml +++ b/src/it/projects/MSITE-497/src/site/site.xml @@ -19,8 +19,14 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + @@ -30,4 +36,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-504/maven-plugin/pom.xml b/src/it/projects/MSITE-504/maven-plugin/pom.xml index 03cdf5a0e..9049ffef0 100644 --- a/src/it/projects/MSITE-504/maven-plugin/pom.xml +++ b/src/it/projects/MSITE-504/maven-plugin/pom.xml @@ -33,11 +33,24 @@ under the License. maven-plugin + + + + org.apache.maven.plugins + maven-plugin-plugin + @mavenPluginPluginVersion@ + + MSITE-504 + + + + + org.apache.maven maven-plugin-api - 3.0-beta-3 + @mavenVersion@ - \ No newline at end of file + diff --git a/src/it/projects/MSITE-504/pom.xml b/src/it/projects/MSITE-504/pom.xml index d0101fcbd..94486ca5b 100644 --- a/src/it/projects/MSITE-504/pom.xml +++ b/src/it/projects/MSITE-504/pom.xml @@ -32,7 +32,7 @@ under the License. - 2.2 + @mavenVersion@ @@ -52,4 +52,4 @@ under the License. - \ No newline at end of file + diff --git a/src/it/projects/MSITE-506/pom.xml b/src/it/projects/MSITE-506/pom.xml index 9832859c0..290a38062 100644 --- a/src/it/projects/MSITE-506/pom.xml +++ b/src/it/projects/MSITE-506/pom.xml @@ -34,9 +34,9 @@ under the License. - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter + 5.10.0 test @@ -46,7 +46,7 @@ under the License. org.apache.maven.plugins maven-site-plugin - @pom.version@ + @project.version@ diff --git a/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java b/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java index a35a2a287..061b54ec4 100644 --- a/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java +++ b/src/it/projects/MSITE-506/src/test/java/mavenjavadoc/AppTest.java @@ -8,9 +8,9 @@ * 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 @@ -19,38 +19,20 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ -public class AppTest - extends TestCase +public class AppTest { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - /** * Rigourous Test :-) */ - public void testApp() + @Test + void testApp() { assertTrue( true ); } diff --git a/src/it/projects/MSITE-507/pom.xml b/src/it/projects/MSITE-507/pom.xml index 149e449a6..4d80f87ff 100644 --- a/src/it/projects/MSITE-507/pom.xml +++ b/src/it/projects/MSITE-507/pom.xml @@ -22,81 +22,81 @@ under the License. 4.0.0 - + my.group.id my-artifact-id 1.0-SNAPSHOT - - - 1.1.8 - - - - - - - org.apache.maven.plugins - maven-site-plugin + + + 1.1.8 + + + + + + + org.apache.maven.plugins + maven-site-plugin @pom.version@ - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.2 - - true - utf-8 - utf-8 - xref/cedarsoft.css - - - - com.cedarsoft.maven - cedarsoft-skin - ${maven.skin.version} - - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - - - com.cedarsoft.maven - cedarsoft-skin - ${maven.skin.version} - - - + + + org.apache.maven.plugins + maven-project-info-reports-plugin + @projectInfoReportsPluginVersion@ + + + org.apache.maven.plugins + maven-jxr-plugin + @jxrPluginVersion@ + + true + utf-8 + utf-8 + xref/cedarsoft.css + + + + com.cedarsoft.maven + cedarsoft-skin + ${maven.skin.version} + + + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + + + com.cedarsoft.maven + cedarsoft-skin + ${maven.skin.version} + + + org.apache.maven.plugins maven-site-plugin - - - - + + + + - - - org.apache.maven.plugins - maven-jxr-plugin - - true - utf-8 - utf-8 - xref/cedarsoft.css - - + + + org.apache.maven.plugins + maven-jxr-plugin + + true + utf-8 + utf-8 + xref/cedarsoft.css + + org.apache.maven.plugins @@ -108,7 +108,7 @@ under the License. - - + + diff --git a/src/it/projects/MSITE-548/pom.xml b/src/it/projects/MSITE-548/pom.xml index a7e5da50c..bd2ff5164 100644 --- a/src/it/projects/MSITE-548/pom.xml +++ b/src/it/projects/MSITE-548/pom.xml @@ -51,7 +51,7 @@ under the License. maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-548/root/pom.xml b/src/it/projects/MSITE-548/root/pom.xml index 514d23dc1..d8e8d9940 100644 --- a/src/it/projects/MSITE-548/root/pom.xml +++ b/src/it/projects/MSITE-548/root/pom.xml @@ -40,11 +40,11 @@ under the License. - - org.apache.maven.plugins - maven-site-plugin - @project.version@ - + + org.apache.maven.plugins + maven-site-plugin + @project.version@ + @@ -53,7 +53,7 @@ under the License. maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-566/pom.xml b/src/it/projects/MSITE-566/pom.xml index 93fc629d2..d8763fca8 100644 --- a/src/it/projects/MSITE-566/pom.xml +++ b/src/it/projects/MSITE-566/pom.xml @@ -32,6 +32,7 @@ under the License. UTF-8 Documentation + @fluidoSkinVersion@ diff --git a/src/it/projects/MSITE-566/src/site/site.xml b/src/it/projects/MSITE-566/src/site/site.xml index 0e4d77103..c11e69dc7 100644 --- a/src/it/projects/MSITE-566/src/site/site.xml +++ b/src/it/projects/MSITE-566/src/site/site.xml @@ -19,12 +19,18 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + - + diff --git a/src/it/projects/MSITE-566/verify.bsh b/src/it/projects/MSITE-566/verify.bsh index 0c978aea1..94c81a597 100644 --- a/src/it/projects/MSITE-566/verify.bsh +++ b/src/it/projects/MSITE-566/verify.bsh @@ -66,7 +66,7 @@ try content = FileUtils.fileRead( index, "UTF-8" ); index1 = content.indexOf( "MSITE-566 IT" ); - index2 = content.indexOf( "
Documentation
" ); + index2 = content.indexOf( "
  • Documentation
    • " ); if ( index1 < 0 || index2 < 0 ) { System.err.println( "generated site has unresolved properties!" ); diff --git a/src/it/projects/MSITE-582/child/src/site/site.xml b/src/it/projects/MSITE-582/child/src/site/site.xml index 532d95292..7a2df146f 100644 --- a/src/it/projects/MSITE-582/child/src/site/site.xml +++ b/src/it/projects/MSITE-582/child/src/site/site.xml @@ -19,9 +19,14 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + @@ -30,4 +35,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-582/pom.xml b/src/it/projects/MSITE-582/pom.xml index 1617b4c57..bb472de4e 100644 --- a/src/it/projects/MSITE-582/pom.xml +++ b/src/it/projects/MSITE-582/pom.xml @@ -31,6 +31,10 @@ under the License. Make it possible to remove breadcrumbs in child projects again http://www.example.com/parent/ + + @fluidoSkinVersion@ + + child @@ -51,7 +55,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.1.2 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-582/src/site/site.xml b/src/it/projects/MSITE-582/src/site/site.xml index c8533502b..9de237a60 100644 --- a/src/it/projects/MSITE-582/src/site/site.xml +++ b/src/it/projects/MSITE-582/src/site/site.xml @@ -19,9 +19,14 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + @@ -32,4 +37,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-582/verify.groovy b/src/it/projects/MSITE-582/verify.groovy index d24ed5566..d9c526aa8 100644 --- a/src/it/projects/MSITE-582/verify.groovy +++ b/src/it/projects/MSITE-582/verify.groovy @@ -20,7 +20,7 @@ content = new File( basedir, 'child/target/site/index.html' ).text; -assert !content.contains( 'D' ); -assert content.contains( 'M' ); +assert !content.contains( 'D' ); +assert content.contains( 'M' ); return true; \ No newline at end of file diff --git a/src/it/projects/MSITE-604/invoker.properties b/src/it/projects/MSITE-604/invoker.properties index de515df4b..0acfea1d5 100644 --- a/src/it/projects/MSITE-604/invoker.properties +++ b/src/it/projects/MSITE-604/invoker.properties @@ -15,8 +15,5 @@ # specific language governing permissions and limitations # under the License. -# only fixed with Maven 3 -invoker.maven.version = 3.0+ invoker.goals=clean site:site site:deploy invoker.profiles = msite604 - diff --git a/src/it/projects/MSITE-604/parent/pom.xml b/src/it/projects/MSITE-604/parent/pom.xml index dedbcd4d1..0e325922c 100644 --- a/src/it/projects/MSITE-604/parent/pom.xml +++ b/src/it/projects/MSITE-604/parent/pom.xml @@ -32,13 +32,13 @@ under the License. Parent override settings IT - parent + parent - ${msite604.siteRepositoryId} - ${msite604.siteRepositoryRoot}/${msite604.siteRepositoryBase}/${msite604.siteRepositoryUrl} + ${msite604.siteId} + ${msite604.siteURL}/${msite604.siteBase}/${msite604.sitePath} diff --git a/src/it/projects/MSITE-604/pom.xml b/src/it/projects/MSITE-604/pom.xml index 77a560f87..0f85b4a34 100644 --- a/src/it/projects/MSITE-604/pom.xml +++ b/src/it/projects/MSITE-604/pom.xml @@ -40,15 +40,15 @@ under the License. UTF-8 - defaultId - defaultBase - defaultRepositoryUrl + defaultId + defaultBase + defaultPath - ${msite604.siteRepositoryId} - ${msite604.siteRepositoryRoot}/${msite604.siteRepositoryBase}/${msite604.siteRepositoryUrl} + ${msite604.siteId} + ${msite604.siteURL}/${msite604.siteBase}/${msite604.sitePath} @@ -66,7 +66,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.1.2 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-604/verify.groovy b/src/it/projects/MSITE-604/verify.groovy index 58fdd3895..7c7040c23 100644 --- a/src/it/projects/MSITE-604/verify.groovy +++ b/src/it/projects/MSITE-604/verify.groovy @@ -20,20 +20,20 @@ target = new File( basedir, 'target' ); assert target.isDirectory(); -// msite604.siteRepositoryRoot property value from settings.xml +// msite604.siteURL property value from settings.xml rootDirectory = new File( target, 'root' ); assert rootDirectory.isDirectory(); -// msite604.siteRepositoryBase property value from pom.xml +// msite604.siteBase property value from pom.xml baseDirectory = new File( rootDirectory, 'defaultBase' ); assert !baseDirectory.isDirectory(); -// msite604.siteRepositoryBase property value from settings.xml +// msite604.siteBase property value from settings.xml baseDirectory = new File( rootDirectory, 'settingsBase' ); assert baseDirectory.isDirectory(); -// msite604.siteRepositoryUrl property value from pom.xml -defaultDirectory = new File( baseDirectory, 'defaultRepositoryUrl' ); +// msite604.sitePath property value from pom.xml +defaultDirectory = new File( baseDirectory, 'defaultPath' ); assert defaultDirectory.exists(); return true; diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-609/pom.xml index 85d4a09e9..7e17f40f8 100644 --- a/src/it/projects/MSITE-609/pom.xml +++ b/src/it/projects/MSITE-609/pom.xml @@ -32,8 +32,9 @@ under the License. MSITE-609 IT - 3.0.5 + @mavenVersion@ UTF-8 + @fluidoSkinVersion@ @@ -58,7 +59,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.1.2 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-609/src/site/site.xml b/src/it/projects/MSITE-609/src/site/site.xml index 2cfb48659..e2cf91246 100644 --- a/src/it/projects/MSITE-609/src/site/site.xml +++ b/src/it/projects/MSITE-609/src/site/site.xml @@ -19,15 +19,15 @@ specific language governing permissions and limitations under the License. --> - + org.apache.maven.skins - maven-stylus-skin - 1.5 + maven-fluido-skin + ${fluidoSkinVersion} @@ -41,4 +41,4 @@ under the License. - + diff --git a/src/it/projects/MSITE-609/verify.bsh b/src/it/projects/MSITE-609/verify.bsh index 0b822a860..2b4715e5f 100644 --- a/src/it/projects/MSITE-609/verify.bsh +++ b/src/it/projects/MSITE-609/verify.bsh @@ -65,10 +65,10 @@ try return false; } String downloadContent = FileUtils.fileRead( download, "UTF-8" ); - int indexOf = downloadContent.indexOf( "Download Maven 3.0.5" ); + int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" ); if ( indexOf < 0 ) { - System.err.println( "download.html doesn't contain Download Maven 3.0.5" ); + System.err.println( "download.html doesn't contain Download Maven 3.6.3" ); return false; } } diff --git a/src/it/projects/MSITE-627/invoker.properties b/src/it/projects/MSITE-627/invoker.properties index 238105913..dc513b4f1 100644 --- a/src/it/projects/MSITE-627/invoker.properties +++ b/src/it/projects/MSITE-627/invoker.properties @@ -18,4 +18,3 @@ invoker.goals.1 = clean install invoker.debug.1 = false invoker.goals.2 = site -invoker.maven.version = 3.0+ \ No newline at end of file diff --git a/src/it/projects/MSITE-627/pom.xml b/src/it/projects/MSITE-627/pom.xml index bb7c6fd78..e24f9880e 100644 --- a/src/it/projects/MSITE-627/pom.xml +++ b/src/it/projects/MSITE-627/pom.xml @@ -39,7 +39,19 @@ under the License. org.apache.maven.reporting maven-reporting-impl - 2.1 + @mavenReportingImplVersion@ + + + org.apache.maven + maven-plugin-api + @mavenVersion@ + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + @mavenPluginPluginVersion@ + provided @@ -51,8 +63,22 @@ under the License. maven-site-plugin @project.version@ + + org.apache.maven.plugins + maven-plugin-plugin + @mavenPluginPluginVersion@ + + + + org.apache.maven.plugins + maven-plugin-plugin + + MSITE-627 + + + diff --git a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java index 1d4ffe2bf..19cd83bfa 100644 --- a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java +++ b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java @@ -20,9 +20,11 @@ */ import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkAdapter; +import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.SinkAdapter; import org.apache.maven.doxia.siterenderer.Renderer; -import org.apache.maven.project.MavenProject; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -30,10 +32,8 @@ /** * Goal which creates a sink in a report. - * - * @goal test - * @phase site */ +@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE ) public class MyReport extends AbstractMavenReport { @@ -53,24 +53,6 @@ public String getDescription( Locale locale ) return "Test Report for MSITE-672"; } - @Override - protected Renderer getSiteRenderer() - { - return null; - } - - @Override - protected String getOutputDirectory() - { - return null; - } - - @Override - protected MavenProject getProject() - { - return null; - } - @Override protected void executeReport( Locale locale ) throws MavenReportException @@ -79,7 +61,7 @@ protected void executeReport( Locale locale ) final Sink sa = new SinkAdapter() { @Override - public void text( String text ) + public void text( String text, SinkEventAttributes attributes ) { s.text( text.replace( "OK", "passed" ) ); } diff --git a/src/it/projects/MSITE-658/pom.xml b/src/it/projects/MSITE-658/pom.xml index c6299e33d..d329dd490 100644 --- a/src/it/projects/MSITE-658/pom.xml +++ b/src/it/projects/MSITE-658/pom.xml @@ -31,9 +31,18 @@ under the License. MSITE-658 http://maven.apache.org/sub-directory + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + UTF-8 UTF-8 + @fluidoSkinVersion@ @@ -44,7 +53,7 @@ under the License. maven-site-plugin @project.version@ - en,de + default,en,de @@ -55,12 +64,12 @@ under the License. maven-project-info-reports-plugin - 2.5.1 + @projectInfoReportsPluginVersion@ index - license + licenses diff --git a/src/it/projects/MSITE-658/src/site/site.xml b/src/it/projects/MSITE-658/src/site/site.xml index 42feaf95d..08fa53aff 100644 --- a/src/it/projects/MSITE-658/src/site/site.xml +++ b/src/it/projects/MSITE-658/src/site/site.xml @@ -19,12 +19,18 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + + - + diff --git a/src/it/projects/MSITE-658/src/site/site_de.xml b/src/it/projects/MSITE-658/src/site/site_de.xml index f257dd4b6..2aca99bfe 100644 --- a/src/it/projects/MSITE-658/src/site/site_de.xml +++ b/src/it/projects/MSITE-658/src/site/site_de.xml @@ -19,12 +19,18 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + + - + diff --git a/src/it/projects/MSITE-658/verify.bsh b/src/it/projects/MSITE-658/verify.bsh index 1aafec0d8..188326d04 100644 --- a/src/it/projects/MSITE-658/verify.bsh +++ b/src/it/projects/MSITE-658/verify.bsh @@ -33,18 +33,18 @@ try result = false; } - File license = new File( siteDirectory, "license.html" ); - if ( !license.exists() || license.isDirectory() ) + File licenses = new File( siteDirectory, "licenses.html" ); + if ( !licenses.exists() || licenses.isDirectory() ) { - System.err.println( "no license file or is a directory." ); + System.err.println( "no licenses file or is a directory." ); result = false; } - String content = FileUtils.fileRead( license, "UTF-8" ); - int index = content.indexOf( "Home" ); + String content = FileUtils.fileRead( licenses, "UTF-8" ); + int index = content.indexOf( "Home" ); if ( index < 0 ) { - System.err.println( "license.html has incorrect links!" ); + System.err.println( "licenses.html has incorrect links!" ); result = false; } @@ -57,18 +57,18 @@ try result = false; } - license = new File( deDirectory, "license.html" ); - if ( !license.exists() || license.isDirectory() ) + licenses = new File( deDirectory, "licenses.html" ); + if ( !licenses.exists() || licenses.isDirectory() ) { - System.err.println( "no license file or is a directory." ); + System.err.println( "no licenses file or is a directory." ); result = false; } - content = FileUtils.fileRead( license, "UTF-8" ); - int index = content.indexOf( "Heim" ); + content = FileUtils.fileRead( licenses, "UTF-8" ); + int index = content.indexOf( "Heim" ); if ( index < 0 ) { - System.err.println( "license.html has incorrect links!" ); + System.err.println( "licenses.html has incorrect links!" ); result = false; } } diff --git a/src/it/projects/MSITE-665/pom.xml b/src/it/projects/MSITE-665/pom.xml index c8c57c885..23fefa54f 100644 --- a/src/it/projects/MSITE-665/pom.xml +++ b/src/it/projects/MSITE-665/pom.xml @@ -60,7 +60,7 @@ under the License. junit junit - 4.8.1 + 4.13.2 test @@ -70,7 +70,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.5.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-723/pom.xml b/src/it/projects/MSITE-723/pom.xml index f7818e3b5..019c799a8 100644 --- a/src/it/projects/MSITE-723/pom.xml +++ b/src/it/projects/MSITE-723/pom.xml @@ -44,7 +44,7 @@ under the License. org.apache.maven.plugins maven-antrun-plugin - 1.7 + @antrunPluginVersion@ copy-site-files @@ -54,7 +54,7 @@ under the License. - + Correct!${line.separator}${line.separator} This is an index file in the generated-site. @@ -73,7 +73,7 @@ under the License. org.apache.maven.plugins maven-project-info-reports-plugin - 2.5.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-842/invoker.properties b/src/it/projects/MSITE-842/invoker.properties index ed62a6130..fc01a8211 100644 --- a/src/it/projects/MSITE-842/invoker.properties +++ b/src/it/projects/MSITE-842/invoker.properties @@ -17,5 +17,4 @@ invoker.goals.1 = clean install invoker.debug.1 = false -invoker.goals.2 = site -invoker.maven.version = 3.0+ +invoker.goals.2 = -pl project site diff --git a/src/it/projects/MSITE-842/pom.xml b/src/it/projects/MSITE-842/pom.xml index 470ef8672..15ac0597c 100644 --- a/src/it/projects/MSITE-842/pom.xml +++ b/src/it/projects/MSITE-842/pom.xml @@ -25,69 +25,16 @@ under the License. 4.0.0 org.apache.maven.plugins.site.its - MSITE-842 + MSITE-842-aggregator 1.0-SNAPSHOT - maven-plugin + pom it-plugin-test Maven Mojo http://maven.apache.org - - UTF-8 - - - - - org.apache.maven.reporting - maven-reporting-impl - 3.0.0 - - - - - - - - - org.apache.maven.plugins - maven-site-plugin - @project.version@ - - - - - - - org.apache.maven.plugins - maven-site-plugin - - ${basedir}/src/site/show-properties.vm - - - - - - - - - - org.apache.maven.plugins.site.its - MSITE-842 - ${project.version} - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - - - - true - - - - - - + + skin + project + diff --git a/src/it/projects/MSITE-842/project/pom.xml b/src/it/projects/MSITE-842/project/pom.xml new file mode 100644 index 000000000..783d6fa89 --- /dev/null +++ b/src/it/projects/MSITE-842/project/pom.xml @@ -0,0 +1,106 @@ + + + + + + 4.0.0 + + org.apache.maven.plugins.site.its + MSITE-842-plugin + 1.0-SNAPSHOT + maven-plugin + + it-plugin-test Maven Mojo + http://maven.apache.org + + + UTF-8 + + + + + org.apache.maven.reporting + maven-reporting-impl + @mavenReportingImplVersion@ + + + org.apache.maven + maven-plugin-api + @mavenVersion@ + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + @mavenPluginPluginVersion@ + provided + + + + + + + + + org.apache.maven.plugins + maven-site-plugin + @project.version@ + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + @mavenPluginPluginVersion@ + + MSITE-842 + + + + + + + + + + org.apache.maven.plugins.site.its + MSITE-842-plugin + ${project.version} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + @projectInfoReportsPluginVersion@ + + + + true + + + + + + + + diff --git a/src/it/projects/MSITE-842/src/it/MSITE-842.html b/src/it/projects/MSITE-842/project/src/it/MSITE-842.html similarity index 100% rename from src/it/projects/MSITE-842/src/it/MSITE-842.html rename to src/it/projects/MSITE-842/project/src/it/MSITE-842.html diff --git a/src/it/projects/MSITE-842/src/it/another-page.html b/src/it/projects/MSITE-842/project/src/it/another-page.html similarity index 100% rename from src/it/projects/MSITE-842/src/it/another-page.html rename to src/it/projects/MSITE-842/project/src/it/another-page.html diff --git a/src/it/projects/MSITE-842/src/it/sub/sub.html b/src/it/projects/MSITE-842/project/src/it/sub/sub.html similarity index 100% rename from src/it/projects/MSITE-842/src/it/sub/sub.html rename to src/it/projects/MSITE-842/project/src/it/sub/sub.html diff --git a/src/it/projects/MSITE-842/src/main/java/org/apache/maven/plugins/it/MyReport.java b/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java similarity index 88% rename from src/it/projects/MSITE-842/src/main/java/org/apache/maven/plugins/it/MyReport.java rename to src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java index c00c6fc96..b16dc2865 100644 --- a/src/it/projects/MSITE-842/src/main/java/org/apache/maven/plugins/it/MyReport.java +++ b/src/it/projects/MSITE-842/project/src/main/java/org/apache/maven/plugins/it/MyReport.java @@ -20,6 +20,8 @@ */ import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -29,10 +31,8 @@ /** * Goal which creates several pages in a report. - * - * @goal test - * @phase site */ +@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE ) public class MyReport extends AbstractMavenReport { @@ -69,7 +69,7 @@ protected void executeReport( Locale locale ) throws MavenReportException Sink anotherSink; try { - anotherSink = getSinkFactory().createSink( outputDirectory, "another-page.html" ); + anotherSink = getSinkFactory().createSink( getReportOutputDirectory(), "another-page.html" ); } catch ( IOException e ) { @@ -81,7 +81,7 @@ protected void executeReport( Locale locale ) throws MavenReportException anotherSink.text( "Another Sink" ); // Create a new sink, in a subdirectory - File subDirectory = new File( outputDirectory, "sub" ); + File subDirectory = new File( getReportOutputDirectory(), "sub" ); Sink subDirectorySink; try { diff --git a/src/it/projects/MSITE-842/project/src/site/site.xml b/src/it/projects/MSITE-842/project/src/site/site.xml new file mode 100644 index 000000000..69ffb51d3 --- /dev/null +++ b/src/it/projects/MSITE-842/project/src/site/site.xml @@ -0,0 +1,40 @@ + + + + + + + org.apache.maven.plugins.site.its + MSITE-842-skin + 1.0-SNAPSHOT + + + + + + + + + + + + diff --git a/src/it/projects/MSITE-842/skin/pom.xml b/src/it/projects/MSITE-842/skin/pom.xml new file mode 100644 index 000000000..009ce86b3 --- /dev/null +++ b/src/it/projects/MSITE-842/skin/pom.xml @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.plugins.site.its + MSITE-842-skin + 1.0-SNAPSHOT + jar + + it-plugin-test Maven Mojo + http://maven.apache.org + + + UTF-8 + + + diff --git a/src/it/projects/MSITE-842/src/site/show-properties.vm b/src/it/projects/MSITE-842/skin/src/main/resources/META-INF/maven/site.vm similarity index 100% rename from src/it/projects/MSITE-842/src/site/show-properties.vm rename to src/it/projects/MSITE-842/skin/src/main/resources/META-INF/maven/site.vm diff --git a/src/it/projects/MSITE-842/verify.groovy b/src/it/projects/MSITE-842/verify.groovy index 508edb643..2bc801d6d 100644 --- a/src/it/projects/MSITE-842/verify.groovy +++ b/src/it/projects/MSITE-842/verify.groovy @@ -22,22 +22,22 @@ File resultFile; File expectedFile; // Check MSITE-842.html (must exist and be exactly like the model -resultFile = new File(basedir, "target/site/MSITE-842.html"); -expectedFile = new File(basedir, "src/it/MSITE-842.html"); +resultFile = new File(basedir, "project/target/site/MSITE-842.html"); +expectedFile = new File(basedir, "project/src/it/MSITE-842.html"); assert resultFile.exists() && resultFile.isFile() assert resultFile.text.normalize().equals(expectedFile.text.normalize()) // Check another-page.html (must exist and be exactly like the model -resultFile = new File(basedir, "target/site/another-page.html"); -expectedFile = new File(basedir, "src/it/another-page.html"); +resultFile = new File(basedir, "project/target/site/another-page.html"); +expectedFile = new File(basedir, "project/src/it/another-page.html"); assert resultFile.exists() && resultFile.isFile() assert resultFile.text.normalize().equals(expectedFile.text.normalize()) // Check sub/sub.html (must exist and be exactly like the model -resultFile = new File(basedir, "target/site/sub/sub.html"); -expectedFile = new File(basedir, "src/it/sub/sub.html"); +resultFile = new File(basedir, "project/target/site/sub/sub.html"); +expectedFile = new File(basedir, "project/src/it/sub/sub.html"); assert resultFile.exists() && resultFile.isFile() assert resultFile.text.normalize().equals(expectedFile.text.normalize()) diff --git a/src/it/projects/MSITE-856/pom.xml b/src/it/projects/MSITE-856/pom.xml index dfdeccb7f..a66c8158b 100644 --- a/src/it/projects/MSITE-856/pom.xml +++ b/src/it/projects/MSITE-856/pom.xml @@ -29,6 +29,10 @@ under the License. pom MSITE-856 + + @fluidoSkinVersion@ + + @@ -37,6 +41,7 @@ under the License. @project.version@ true + default,de @@ -47,7 +52,7 @@ under the License. maven-project-info-reports-plugin - 2.3.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/MSITE-856/src/site/site.xml b/src/it/projects/MSITE-856/src/site/site.xml index 88a1a9573..3610d5cd1 100644 --- a/src/it/projects/MSITE-856/src/site/site.xml +++ b/src/it/projects/MSITE-856/src/site/site.xml @@ -19,12 +19,18 @@ specific language governing permissions and limitations under the License. --> - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + + - + diff --git a/src/it/projects/MSITE-856/src/site/site_de.xml b/src/it/projects/MSITE-856/src/site/site_de.xml new file mode 100644 index 000000000..13f8eec1b --- /dev/null +++ b/src/it/projects/MSITE-856/src/site/site_de.xml @@ -0,0 +1,36 @@ + + + + + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + + + + + + + + diff --git a/src/it/projects/MSITE-856/verify.bsh b/src/it/projects/MSITE-856/verify.bsh index 802eae94a..4ee0e12d1 100644 --- a/src/it/projects/MSITE-856/verify.bsh +++ b/src/it/projects/MSITE-856/verify.bsh @@ -22,17 +22,38 @@ import org.codehaus.plexus.util.*; try { - final File siteDirectory = new File( basedir, "target/generated-site" ); - if ( !siteDirectory.exists() || !siteDirectory.isDirectory() ) + final File siteDirectory = new File( basedir, "target/site" ); + if ( !siteDirectory.isDirectory() ) { - System.err.println( "generated-site is missing or not a directory." ); + System.err.println( "site is missing or not a directory." ); return false; } - File index = new File( siteDirectory, "xdoc/sitemap.xml" ); - if ( !index.exists() || index.isDirectory() ) + File sitemapHtmlFile = new File( siteDirectory, "sitemap.html" ); + if ( !sitemapHtmlFile.isFile() ) { - System.err.println( "no sitemap.xml!" ); + System.err.println( "no sitemap.html!" ); + return false; + } + + content = FileUtils.fileRead( sitemapHtmlFile, "UTF-8" ); + if ( !content.contains( "
  • My first item
    • " ) ) + { + System.err.println( "\"
  • My first item
    • \" not found in sitemap.html!" ); + return false; + } + + File sitemapGermanHtmlFile = new File( siteDirectory, "de/sitemap.html" ); + if ( !sitemapGermanHtmlFile.isFile() ) + { + System.err.println( "no German sitemap.html!" ); + return false; + } + + content = FileUtils.fileRead( sitemapGermanHtmlFile, "UTF-8" ); + if ( !content.contains( "
  • Mein erstes Element
    • " ) ) + { + System.err.println( "\"
  • Mein erstes Element
    • \" not found in German sitemap.html!" ); return false; } } diff --git a/src/it/projects/doxia-formats/pom.xml b/src/it/projects/doxia-formats/pom.xml index 2acd9ee06..127e3d34f 100644 --- a/src/it/projects/doxia-formats/pom.xml +++ b/src/it/projects/doxia-formats/pom.xml @@ -31,13 +31,18 @@ under the License. @project.version@ + @fluidoSkinVersion@ + @project.build.outputTimestamp@ + UTF-8 + UTF-8 - org.apache.velocity - velocity-tools - 2.0 + org.apache.velocity.tools + velocity-tools-generic + 3.1 + provided @@ -49,6 +54,7 @@ under the License. maven-site-plugin @project.version@ + default,de false true diff --git a/src/it/projects/doxia-formats/src/site/apt/index.apt b/src/it/projects/doxia-formats/src/site/apt/index.apt index ab679c82b..d154ff1f0 100644 --- a/src/it/projects/doxia-formats/src/site/apt/index.apt +++ b/src/it/projects/doxia-formats/src/site/apt/index.apt @@ -1,7 +1,8 @@ ----- - Doxia Formats + Doxia Formats Title Property ----- Hervé Boutemy + Other Authors ----- 2015-12-20 ----- @@ -33,14 +34,14 @@ Doxia Formats By default, only the following are integrated into maven-site-plugin: -*--------------------*-------------------------------------------------------*-----------------------------------* +*--------------------+-------------------------------------------------------+-----------------------------------+ || Format || plain || macro || *--------------------+-------------------------------------------------------+-----------------------------------+ | Apt | {{{./index.html} <<>>}} | {{{./apt-macro.html} macro}} | *--------------------+-------------------------------------------------------+-----------------------------------+ | FML | {{{./faq.html} <<>>}} | {{{./faq-macro.html} macro}} | *--------------------+-------------------------------------------------------+-----------------------------------+ -| Markdown | {{{./markdown.html} <<>>}} | {{{./markdown-macro.html} macro}} | +| Markdown | {{{./markdown.html} <<>>}} / | {{{./markdown-macro.html} macro}} / | | | {{{./markdown2.html} <<>>}} | {{{./markdown2-macro.html} macro}}| *--------------------+-------------------------------------------------------+-----------------------------------+ | Xdoc | {{{./xdoc.html} <<>>}} | {{{./xdoc-macro.html} macro}} | diff --git a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm index 122a93138..d1c873e55 100644 --- a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm +++ b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm @@ -37,7 +37,7 @@ Doxia Site Renderer Velocity Context *-----------------------+-------------------------------------------------------+-----+ #foreach( $key in $sorter.sort( $context.keys ) ) #set( $value = $context.get($key) ) -| <<<$key>>> | <<<#if ($value)$value.class.name#else?#end>>> | #if ($key != "decoration")<<<$value>>>#end | +| <<<$key>>> | <<<#if ($value)$value.class.name#else?#end>>> | #if ($key != "decoration" && $key != "site" && $key != "link")#if ($value)<<<$StringUtils.replace($value, '\' , '\\')>>>#end#end| *-----------------------+-------------------------------------------------------+-----+ #end @@ -45,48 +45,37 @@ Doxia Site Renderer Velocity Context * Document Variables -*-----------------------*-------------------------------------------------------* -|| variable || examples || -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$alignedFileName>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | <<>> = <<< $decoration.name>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$currentDate>>> \ -| | <<>> = <<<$dateFormat.format($currentDate)>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$currentFileName>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$dateFormat>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$dateRevision>>> -*-----------------------+-------------------------------------------------------+ +*------------------------*-------------------------------------------------------* +|| variable || examples || +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$alignedFileName>>> +*------------------------+-------------------------------------------------------+ +| <<>> | <<>> = <<<$site.name>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$currentFileName>>> +*------------------------+-------------------------------------------------------+ | <<>> | = <<<$doxiaSiteRendererVersion>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$locale>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<< $publishDate>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$relativePath>>> -*-----------------------+-------------------------------------------------------+ +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$locale>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$publishDate>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$relativePath>>> +*------------------------+-------------------------------------------------------+ | <<>> | = <<<$supportedLocales>>> -*-----------------------+-------------------------------------------------------+ +*------------------------+-------------------------------------------------------+ * Tools *-----------------------*-------------------------------------------------------* || variable || examples || *-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$FileUtils>>> -*-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$i18n>>> -*-----------------------+-------------------------------------------------------+ | <<>> | = <<<$PathTool>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$StringUtils>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$plexus>>> \ -| | plexus.lookup("org.apache.maven.Maven") = <<<$plexus.lookup("org.apache.maven.Maven")>>> +| | <<>> = <<<$plexus.lookup("org.apache.maven.Maven")>>> *-----------------------+-------------------------------------------------------+ * Maven Site Plugin @@ -98,10 +87,10 @@ Doxia Site Renderer Velocity Context *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$outputEncoding>>> *-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$project>>>, \ +| <<>> | = <<<$StringUtils.replace($project, '\' , '\\')>>>, \ | | <<>> = <<<$project.version>>> *-----------------------+-------------------------------------------------------+ -| <<>> | = <<<${property-project-version}>>> +| <<>> | = <<<$context.get('property-project-version')>>> *-----------------------+-------------------------------------------------------+ | (attributes) <<>> | = <<<${att1}>>> *-----------------------+-------------------------------------------------------+ @@ -120,7 +109,7 @@ Doxia Site Renderer Velocity Context | <<>> | = <<<$convert>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$date>>> \ -| | <<< \$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd', $currentDate)>>> +| | <<< \$date.get('d MMM yyyy')>>> = <<<$date.get('d MMM yyyy')>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$display>>> *-----------------------+-------------------------------------------------------+ @@ -130,7 +119,7 @@ Doxia Site Renderer Velocity Context *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$loop>>> *-----------------------+-------------------------------------------------------+ -| <<>> | = <<< \$link.relative('MyPage.vm') = >>><<<$link.relative('MyPage.vm')>>> +| <<>> | = <<< \$link.relative('MyPage.vm')>>> = <<<$link.relative('MyPage.vm')>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$math>>> *-----------------------+-------------------------------------------------------+ diff --git a/src/it/projects/doxia-formats/src/site/de/apt/index.apt b/src/it/projects/doxia-formats/src/site/de/apt/index.apt new file mode 100644 index 000000000..5c71e3253 --- /dev/null +++ b/src/it/projects/doxia-formats/src/site/de/apt/index.apt @@ -0,0 +1,36 @@ + ----- + Doxia-Formate Eigenschaft Titel + ----- + Hervé Boutemy + Other Authors + ----- + 2015-12-20 + ----- + +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Velocity + + Siehe {{{./velocity-context.html} Doxia Site Renderer Velocity Context Demo}}. + + Siehe ebenfalls {{{./velocity-include-parse.html} Velocity #parse und #include Demo}}. + +Inhalt für verify.groovy diff --git a/src/it/projects/doxia-formats/src/site/de/apt/velocity-context.apt.vm b/src/it/projects/doxia-formats/src/site/de/apt/velocity-context.apt.vm new file mode 100644 index 000000000..e8c7a4824 --- /dev/null +++ b/src/it/projects/doxia-formats/src/site/de/apt/velocity-context.apt.vm @@ -0,0 +1,143 @@ + ----- + Doxia Site Renderer Velocity Context + ----- + Hervé Boutemy + ----- + 2015-12-20 + ----- + +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Doxia Site Renderer Velocity Context + + Siehe {{{http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/} doxia-site-renderer}}. + + Wir haben die folgenden Schlüssel im Kontext (automatisch extrahiert und sortiert): + +*-----------------------*-------------------------------------------------------*-----* +|| Variable || class || value +*-----------------------+-------------------------------------------------------+-----+ +#foreach( $key in $sorter.sort( $context.keys ) ) +#set( $value = $context.get($key) ) +| <<<$key>>> | <<<#if ($value)$value.class.name#else?#end>>> | #if ($key != "decoration" && $key != "site" && $key != "link")#if ($value)<<<$StringUtils.replace($value, '\' , '\\')>>>#end#end| +*-----------------------+-------------------------------------------------------+-----+ +#end + + Handgeschriebene Klassifikation: + +* DokumentenVariablen + +*------------------------*-------------------------------------------------------* +|| Variable || Beispiele || +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$alignedFileName>>> +*------------------------+-------------------------------------------------------+ +| <<>> | <<>> = <<<$site.name>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$currentFileName>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$doxiaSiteRendererVersion>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$locale>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$publishDate>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$relativePath>>> +*------------------------+-------------------------------------------------------+ +| <<>> | = <<<$supportedLocales>>> +*------------------------+-------------------------------------------------------+ + +* Werkzeuge + +*-----------------------*-------------------------------------------------------* +|| Variable || Beispiele || +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$PathTool>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$StringUtils>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$plexus>>> \ +| | <<>> = <<<$plexus.lookup("org.apache.maven.Maven")>>> +*-----------------------+-------------------------------------------------------+ + +* Maven Site Plugin + +*-----------------------*-------------------------------------------------------* +|| Variable || Beispiele || +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$inputEncoding>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$outputEncoding>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$StringUtils.replace($project, '\' , '\\')>>>, \ +| | <<>> = <<<$project.version>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$context.get('property-project-version')>>> +*-----------------------+-------------------------------------------------------+ +| (attributes) <<>> | = <<<${att1}>>> +*-----------------------+-------------------------------------------------------+ + +* Velocity GenericTools + + Siehe {{{http://velocity.apache.org/tools/releases/2.0/generic.html} Velocity GenericTools Dokumentation}} für mehr Informationen: + +*-----------------------*-------------------------------------------------------* +|| Variable || Beispiele || +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$alternator>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$context>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$convert>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$date>>> \ +| | <<< \$date.get('d MMM yyyy')>>> = <<<$date.get('d MMM yyyy')>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$display>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$esc>>>, <<>> = <<<$esc.q>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$field>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$loop>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<< \$link.relative('MyPage.vm')>>> = <<<$link.relative('MyPage.vm')>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$math>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$number>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$render>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$text>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$sorter>>> +*-----------------------+-------------------------------------------------------+ +| <<>> | = <<<$xml>>> +*-----------------------+-------------------------------------------------------+ + +* Velocity-Spezialwerkzeug in <<>> deklariert + + <<>> = <<<$custom>>> + + <<>> = <<<$custom.test()>>> + +Inhalt für verify.groovy diff --git a/src/it/projects/doxia-formats/src/site/de/apt/velocity-include-parse.apt.vm b/src/it/projects/doxia-formats/src/site/de/apt/velocity-include-parse.apt.vm new file mode 100644 index 000000000..f21c3ab48 --- /dev/null +++ b/src/it/projects/doxia-formats/src/site/de/apt/velocity-include-parse.apt.vm @@ -0,0 +1,45 @@ + ----- + Doxia Site Renderer Velocity ${esc.h}parse und ${esc.h}include + ----- + Hervé Boutemy + ----- + 2016-04-09 + ----- + +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Doxia Site Renderer Velocity ${esc.h}parse und ${esc.h}include + +* ${esc.h}include + +#include( "velocity-include.txt" ) + +* ${esc.h}parse + +#parse( "velocity-parse.txt" ) + +* ${esc.h}include ../../../../pom.xml + ++---------------+ +#include( "../../../../pom.xml" ) ++---------------+ + +Inhalt für verify.groovy diff --git a/src/it/projects/MSITE-723/index.apt b/src/it/projects/doxia-formats/src/site/de/apt/velocity-include.txt similarity index 77% rename from src/it/projects/MSITE-723/index.apt rename to src/it/projects/doxia-formats/src/site/de/apt/velocity-include.txt index 30d1c7738..3a57df613 100644 --- a/src/it/projects/MSITE-723/index.apt +++ b/src/it/projects/doxia-formats/src/site/de/apt/velocity-include.txt @@ -1,5 +1,3 @@ -Correct! - ~~ 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 @@ -17,4 +15,9 @@ Correct! ~~ specific language governing permissions and limitations ~~ under the License. - This is an index file in the generated-site. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + + <<>> content + + Es werden keine Velocity-Ausdrücke interpretiert, wie z. B. #parse oder ## comment diff --git a/src/it/projects/doxia-formats/src/site/de/apt/velocity-parse.txt b/src/it/projects/doxia-formats/src/site/de/apt/velocity-parse.txt new file mode 100644 index 000000000..e304464f3 --- /dev/null +++ b/src/it/projects/doxia-formats/src/site/de/apt/velocity-parse.txt @@ -0,0 +1,23 @@ +## 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. +## +## NOTE: For help with the syntax of this file, see: +## http://maven.apache.org/doxia/references/apt-format.html + + <<>> Inhalt + +## Verarbeitete Kommentare sind echte Kommentare diff --git a/src/it/projects/doxia-formats/src/site/docbook/docbook.xml b/src/it/projects/doxia-formats/src/site/docbook/docbook.xml deleted file mode 100644 index a5d77f24f..000000000 --- a/src/it/projects/doxia-formats/src/site/docbook/docbook.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - -
    - - Your title here - - - Your first name - Your surname - -
    Your e-mail address
    -     -     - - - 2002 - Your name - - - - Include an abstract of the article's contents here. - -     - - Section 1 - - blah blah blah - - - - Section 2 - - Content for verify.groovy - - -
    diff --git a/src/it/projects/doxia-formats/src/site/markdown/markdown-macro.md b/src/it/projects/doxia-formats/src/site/markdown/markdown-macro.md index 20c12a767..c871ea2ff 100644 --- a/src/it/projects/doxia-formats/src/site/markdown/markdown-macro.md +++ b/src/it/projects/doxia-formats/src/site/markdown/markdown-macro.md @@ -18,17 +18,17 @@ under the License. --> Macros in Markdown ----------------- +================== -### TOC Macro +## TOC Macro -### Echo Macro +## Echo Macro -### Snippet Macro +## Snippet Macro diff --git a/src/it/projects/doxia-formats/src/site/markdown/markdown.md b/src/it/projects/doxia-formats/src/site/markdown/markdown.md index 21c9d6073..b0b103eb3 100644 --- a/src/it/projects/doxia-formats/src/site/markdown/markdown.md +++ b/src/it/projects/doxia-formats/src/site/markdown/markdown.md @@ -1,3 +1,8 @@ +title: Markdown Title Metadata +author: Author Metadata +date: Date Metadata +description: Markdown description metadata, not known from Doxia API as title, author and date are + - + org.apache.maven.skins maven-fluido-skin - 1.8 + ${fluidoSkinVersion} @@ -33,4 +33,13 @@ under the License. true - + + + + +     + + + + +     diff --git a/src/it/projects/doxia-formats/src/site/site_de.xml b/src/it/projects/doxia-formats/src/site/site_de.xml new file mode 100644 index 000000000..e8cfc2e80 --- /dev/null +++ b/src/it/projects/doxia-formats/src/site/site_de.xml @@ -0,0 +1,45 @@ + + + + + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + + + + + true + + + + + + + + + + + + diff --git a/src/it/projects/doxia-formats/src/site/xdoc/xdoc.xml b/src/it/projects/doxia-formats/src/site/xdoc/xdoc.xml index 0cdec6d5a..109ffaa63 100644 --- a/src/it/projects/doxia-formats/src/site/xdoc/xdoc.xml +++ b/src/it/projects/doxia-formats/src/site/xdoc/xdoc.xml @@ -22,23 +22,25 @@ xsi:schemaLocation="http://maven.apache.org/xsd/xdoc-2.0.xsd"> - Title + Title (required) Author - Date + Author #2 + Date (optional) + -
    +

    Paragraph 1, line 1. Paragraph 1, line 2.

    Paragraph 2, line 1. Paragraph 2, line 2.

    -

    Sub-sub-section title

    -
    Sub-sub-sub-section
    -
    Sub-sub-sub-sub-section
    +

    Sub-sub-section title

    +

    Sub-sub-sub-section

    +
    Sub-sub-sub-sub-section
    • List item 1.
      • diff --git a/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml b/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml index 48c8480c2..b6da8c5de 100644 --- a/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml +++ b/src/it/projects/doxia-formats/src/site/xhtml/xhtml-macro.xhtml @@ -1,4 +1,4 @@ - + -

      Echo Macro

      +

      Echo Macro

      -

      Snippet Macro

      +

      Snippet Macro

      diff --git a/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml b/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml index c2c0131c3..14c6373d4 100644 --- a/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml +++ b/src/it/projects/doxia-formats/src/site/xhtml/xhtml.xhtml @@ -1,4 +1,4 @@ - + - + + + org.apache.maven.skins + maven-fluido-skin + ${fluidoSkinVersion} + @@ -29,4 +34,4 @@ under the License. - + diff --git a/src/it/projects/empty-report-set/pom.xml b/src/it/projects/empty-report-set/pom.xml index 1f0d53213..cc704686d 100644 --- a/src/it/projects/empty-report-set/pom.xml +++ b/src/it/projects/empty-report-set/pom.xml @@ -46,7 +46,7 @@ under the License. maven-project-info-reports-plugin - 2.1.1 + @projectInfoReportsPluginVersion@ diff --git a/src/it/projects/failure/invoker.properties b/src/it/projects/failure/invoker.properties index 60377a750..064023eaa 100644 --- a/src/it/projects/failure/invoker.properties +++ b/src/it/projects/failure/invoker.properties @@ -18,8 +18,6 @@ invoker.buildResult = failure invoker.debug = false -# --log-file option is only supported by Maven 3 -invoker.maven.version = 3.0+ invoker.goals.1 = --log-file report-plugin.log -DsiteOutputDirectory=target/site-report-plugin -Preport-plugin clean site invoker.goals.2 = --log-file report-plugin-debug.log -DsiteOutputDirectory=target/site-report-plugin-debug -Preport-plugin clean site invoker.debug.2 = true diff --git a/src/it/projects/failure/pom.xml b/src/it/projects/failure/pom.xml index b0008d45e..a75d4cb43 100644 --- a/src/it/projects/failure/pom.xml +++ b/src/it/projects/failure/pom.xml @@ -42,7 +42,7 @@ under the License. junit junit - 3.8.2 + 4.13.2 test diff --git a/src/it/projects/full-reporting/invoker.properties b/src/it/projects/full-reporting/invoker.properties index 84ce06241..7327407c5 100644 --- a/src/it/projects/full-reporting/invoker.properties +++ b/src/it/projects/full-reporting/invoker.properties @@ -16,5 +16,3 @@ # under the License. invoker.profiles=reporting -# see MNG-5140 -invoker.maven.version = 2.2.2+ \ No newline at end of file diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml index 25e958e8c..30f726f94 100644 --- a/src/it/projects/full-reporting/pom.xml +++ b/src/it/projects/full-reporting/pom.xml @@ -1,5 +1,4 @@ - - - + 4.0.0 org.apache.maven maven-parent - 34 + 43 org.apache.maven.plugins.site.its @@ -39,11 +36,15 @@ under the License. http://localhost/issues + + @fluidoSkinVersion@ + + junit junit - 3.8.2 + 4.13.2 test @@ -69,9 +70,13 @@ under the License. org.apache.maven.plugins maven-checkstyle-plugin @checkstylePluginVersion@ - - sun_checks.xml - + + + org.apache.maven.shared + maven-shared-resources + 6 + + org.apache.maven.plugins @@ -96,7 +101,7 @@ under the License. false false - + index @@ -138,7 +143,10 @@ under the License. org.codehaus.mojo taglist-maven-plugin - 3.0.0 + @taglistPluginVersion@ + + false + diff --git a/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java b/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java index e9543294c..9f3658ecf 100644 --- a/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java +++ b/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java @@ -1,5 +1,3 @@ -package org.apache.maven.plugins.site.its; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,19 +16,24 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.maven.plugins.site.its; /** * Hello world! * */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); +public class App { + /** + * main + */ + public static void main(String[] args) { + System.out.println("Hello World!"); } - public void foo(){ - System.out.println( "foo" ); + /** + * foo + */ + public void foo() { + System.out.println("foo"); } } diff --git a/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App2.java b/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App2.java index 7fd9f925c..2682f829f 100644 --- a/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App2.java +++ b/src/it/projects/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App2.java @@ -1,5 +1,3 @@ -package org.apache.maven.plugins.site.its; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,19 +16,24 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.maven.plugins.site.its; /** * Hello world! * */ -public class App2 -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); +public class App2 { + /** + * main + */ + public static void main(String[] args) { + System.out.println("Hello World!"); } - public void foo(){ - System.out.println( "foo" ); + /** + * foo + */ + public void foo() { + System.out.println("foo"); } } diff --git a/src/it/projects/full-reporting/src/site/apt/index.apt.vm b/src/it/projects/full-reporting/src/site/apt/index.apt.vm index def785c82..90c9e7d36 100644 --- a/src/it/projects/full-reporting/src/site/apt/index.apt.vm +++ b/src/it/projects/full-reporting/src/site/apt/index.apt.vm @@ -28,7 +28,7 @@ Velocity processing - See doxia-siterendering: site decoration and documents with file names ending in <<<.vm>>> are processed by Velocity. + See doxia-siterendering: site and documents with file names ending in <<<.vm>>> are processed by Velocity. The velocity context defines some variables: @@ -45,8 +45,6 @@ Velocity processing *---------------------------------+--------------------+-------------------------------+ | <<>> | <<>> | $bodyContent | *---------------------------------+--------------------+-------------------------------+ -| <<>> | {{{../doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html}<<>>}} | $decoration.name | -*---------------------------------+--------------------+-------------------------------+ | <<>> | <<>> | $dateCreation | *---------------------------------+--------------------+-------------------------------+ | <<>> | <<>> | $dateRevision | @@ -63,6 +61,8 @@ Velocity processing *---------------------------------+--------------------+-------------------------------+ | <<>> | <<>>> | $supportedLocales | *---------------------------------+--------------------+-------------------------------+ +| <<>> | {{{../doxia-site-model/apidocs/org/apache/maven/doxia/site/SiteModel.html}<<>>}} | $site.name | +*---------------------------------+--------------------+-------------------------------+ |