diff --git a/pom.xml b/pom.xml index 15213f58..d369442b 100644 --- a/pom.xml +++ b/pom.xml @@ -637,36 +637,6 @@ under the License. ${project.build.directory}/site/mskins-72/ - - copy-mskins-76 - - copy-resources - - site - - - - ${project.build.directory}/it/mskins-76/target/site/ - - - ${project.build.directory}/site/mskins-76/ - - - - copy-mskins-76_topbar - - copy-resources - - site - - - - ${project.build.directory}/it/mskins-76_topbar/target/site/ - - - ${project.build.directory}/site/mskins-76_topbar/ - - copy-mskins-85 diff --git a/src/it/mskins-76/pom.xml b/src/it/mskins-76/pom.xml deleted file mode 100644 index b39993ee..00000000 --- a/src/it/mskins-76/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.skins - maven-skins - @project.parent.version@ - - - org.apache.maven.skins.its - @project.artifactId@-mskins-76 - @project.version@ - jar - - @project.name@ IT, MSKINS-76 - https://maven.apache.org/skins/@project.artifactId@/mskins-76/ - - - @project.name@ - @project.description@ - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - - junit - junit - 3.8.2 - test - - - - - - - org.apache.maven.plugins - maven-site-plugin - @sitePluginVersion@ - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - @projectInfoReportsPluginVersion@ - - false - false - - - - - - diff --git a/src/it/mskins-76/src/site/apt/index.apt.vm b/src/it/mskins-76/src/site/apt/index.apt.vm deleted file mode 100644 index 90eb4fa9..00000000 --- a/src/it/mskins-76/src/site/apt/index.apt.vm +++ /dev/null @@ -1,36 +0,0 @@ - ------ - ${project.name} - ------ - Michael Koch - ------ - 2013-02-19 - ------ - -~~ 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 - -${project.name} - - This is a test for ${skinName} with a large Flattr button. - ${skinDescription} - -* Actual configuration - -%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml} diff --git a/src/it/mskins-76/src/site/site.xml b/src/it/mskins-76/src/site/site.xml deleted file mode 100644 index b98f1581..00000000 --- a/src/it/mskins-76/src/site/site.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - ${skinGroupId} - ${skinArtifactId} - ${skinVersion} - - - - - - - - 448050/Open-Source-Initiative-OSI - http://opensource.org/ - - - - - - - - - - - - - - - - diff --git a/src/it/mskins-76/verify.groovy b/src/it/mskins-76/verify.groovy deleted file mode 100644 index fbeb7e3c..00000000 --- a/src/it/mskins-76/verify.groovy +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -File index = new File( basedir, "target/site/index.html" ) -assert index.exists() -String text = index.text.normalize() -assert text.contains( '''\ - '''.normalize() ) - -assert text.contains( '''\ - - '''.normalize() ) diff --git a/src/it/mskins-76_topbar/pom.xml b/src/it/mskins-76_topbar/pom.xml deleted file mode 100644 index b39993ee..00000000 --- a/src/it/mskins-76_topbar/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.skins - maven-skins - @project.parent.version@ - - - org.apache.maven.skins.its - @project.artifactId@-mskins-76 - @project.version@ - jar - - @project.name@ IT, MSKINS-76 - https://maven.apache.org/skins/@project.artifactId@/mskins-76/ - - - @project.name@ - @project.description@ - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - - junit - junit - 3.8.2 - test - - - - - - - org.apache.maven.plugins - maven-site-plugin - @sitePluginVersion@ - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - @projectInfoReportsPluginVersion@ - - false - false - - - - - - diff --git a/src/it/mskins-76_topbar/src/site/apt/index.apt.vm b/src/it/mskins-76_topbar/src/site/apt/index.apt.vm deleted file mode 100644 index 41e46dcd..00000000 --- a/src/it/mskins-76_topbar/src/site/apt/index.apt.vm +++ /dev/null @@ -1,36 +0,0 @@ - ------ - ${project.name} - ------ - Michael Koch - ------ - 2013-02-19 - ------ - -~~ 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 - -${project.name} - - This is a test for ${skinName} with a compact Flattr button placed in the top bar. - ${skinDescription} - -* Actual configuration - -%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml} diff --git a/src/it/mskins-76_topbar/src/site/site.xml b/src/it/mskins-76_topbar/src/site/site.xml deleted file mode 100644 index 15e9a057..00000000 --- a/src/it/mskins-76_topbar/src/site/site.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - ${skinGroupId} - ${skinArtifactId} - ${skinVersion} - - - - - - - - 448050/Open-Source-Initiative-OSI - http://opensource.org/ - - - true - false - - - - - - - - - - - - - - diff --git a/src/it/mskins-76_topbar/verify.groovy b/src/it/mskins-76_topbar/verify.groovy deleted file mode 100644 index 3f0299b4..00000000 --- a/src/it/mskins-76_topbar/verify.groovy +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -File index = new File( basedir, "target/site/index.html" ) -assert index.exists() -String text = index.text.normalize() -assert text.contains( '''\ - '''.normalize() ) - -assert text.contains( '''\ - - '''.normalize() ) diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm index 98766264..9649832a 100644 --- a/src/main/resources/META-INF/maven/site-macros.vm +++ b/src/main/resources/META-INF/maven/site-macros.vm @@ -553,49 +553,6 @@ $indent ## #**##end #end ## -#macro( flattrHead ) -#**##if( $site.getCustomChild( 'fluidoSkin.flattr.thing' ) - && ( $site.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) ) - -#**##end -#end -## -#macro( flattrBody $sideBarEnabled ) -#**##if( $site.getCustomChild( 'fluidoSkin.flattr.thing' ) - && ( $site.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) ) -#* *##set( $flattrThing = $site.getCustomValue( 'fluidoSkin.flattr.thing' ) ) -#* *##set( $flattrUrl = $site.getCustomValue( 'fluidoSkin.flattr.url', $project.url ) ) -## -#* *##set( $styleModifier = "" ) -#* *##if( $site.getCustomValue( 'fluidoSkin.flattr.style', '' ).equalsIgnoreCase( 'compact' ) ) -#* *##set( $styleModifier = 'rev="flattr;button:compact;"' ) -#* *##end -## -#* *##if( $sideBarEnabled ) -
-#* *##else -
  • -#* *##end -## - - -## -#* *##if( $sideBarEnabled ) -
-#* *##else - -#* *##end -#**##end -#end -## #macro( generatedBy ) Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end## #end diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm index aef0d4a8..5e0604fe 100644 --- a/src/main/resources/META-INF/maven/site.vm +++ b/src/main/resources/META-INF/maven/site.vm @@ -53,7 +53,6 @@ #**##if( $headContent )$headContent#end #**##googleAnalytics() #**##matomo() -#**##flattrHead() #**##forkMeOnGitHubHead() #**##set( $topBarEnabled = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.topBarEnabled', 'false' ) ) && !$standalone ) @@ -150,7 +149,6 @@ #* *##if( !$sideBarEnabled ) #* *##facebookLike( $sideBarEnabled ) #* *##followTwitter( $sideBarEnabled ) -#* *##flattrBody( $sideBarEnabled ) #* *##end ## ## ## MSKINS-31 @@ -226,8 +224,6 @@
#* *##followTwitter( $sideBarEnabled )
-#* *##flattrBody( $sideBarEnabled ) -
#* *##builtByLogo( $site.poweredBy ) diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index ac2ffbfe..5f2398d1 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -38,7 +38,7 @@ Welcome to ${project.name}! Notice: since version 1.5 of this skin, Velocity 1.7 (used by Maven Site Plugin version 3.5) is required. But in previous versions of the skin, it was Velocity 1.5, which has some incompatibilities. If you need to mix versions, please see {{{/plugins/maven-site-plugin/migrate.html}the migration guide}} to override - Velocity version used by Maven Site Plugin as per your specific skin and site plugin requirements. + Velocity version used by Maven Site Plugin as per your specific skin and site plugin requirements. * Usage @@ -436,32 +436,7 @@ Welcome to ${project.name}! ** {Flattr button} - Since version <<1.3.1>>, fluido-skin supports {{{http://flattr.com}Flattr}} {{{http://flattr.com/support/button}button}} integration. - Users have to declare: - - * <<>>: <>, ID of the Flattr thing. This is the part after the <<>> part of the URL of the Flattr button. - - * <<>>: <>, URL of the Flattr thing. Either this or the <<<$\{project.url\}>>> must be set for the button to appear. (<<<$\{project.url\}>>> by default.) - - * <<>>: <>, style of the Flattr button. <<>> and <<>> are supported. (<<>> by default.) - -+-----+ - - [...] - - - - 12345/Example-Org - http://example.org/ - - - - - [...] - -+-----+ - - By default, it is rendered in the sidebar, if the topbar only is available it will be rendered there. + As of version <<2.0.0-M9>>, support for Flattr buttons in fluido-skin has been removed. ** {Skip generation date}