You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/05 04:14:41 UTC
[maven-fluido-skin] branch master updated: [MSKINS-145] remove
googlePlus code from skins
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
The following commit(s) were added to refs/heads/master by this push:
new 2a3e4a0 [MSKINS-145] remove googlePlus code from skins
2a3e4a0 is described below
commit 2a3e4a090edd5a53b84266284e5f3eca7523c6c0
Author: Robert Kleinschmager <ro...@kleinschmager.net>
AuthorDate: Fri May 3 20:24:28 2019 +0200
[MSKINS-145] remove googlePlus code from skins
Removed from template, tests, documentation and own skin
Closes #7
---
pom.xml | 30 ---------
src/it/mskins-34/pom.xml | 75 -----------------------
src/it/mskins-34/src/site/apt/index.apt.vm | 36 -----------
src/it/mskins-34/src/site/site.xml | 45 --------------
src/it/mskins-34_topbar/pom.xml | 75 -----------------------
src/it/mskins-34_topbar/src/site/apt/index.apt.vm | 36 -----------
src/it/mskins-34_topbar/src/site/site.xml | 47 --------------
src/main/resources/META-INF/maven/site-macros.vm | 19 ------
src/main/resources/META-INF/maven/site.vm | 3 -
src/site/apt/ITs.apt | 4 --
src/site/apt/index.apt.vm | 21 -------
src/site/site.xml | 1 -
12 files changed, 392 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca5a9d1..e30b1da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -601,36 +601,6 @@ under the License.
</configuration>
</execution>
<execution>
- <id>copy-mskins-34</id>
- <phase>site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${project.build.directory}/it/mskins-34/target/site/</directory>
- </resource>
- </resources>
- <outputDirectory>${project.build.directory}/site/mskins-34/</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-mskins-34_topbar</id>
- <phase>site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${project.build.directory}/it/mskins-34_topbar/target/site/</directory>
- </resource>
- </resources>
- <outputDirectory>${project.build.directory}/site/mskins-34_topbar/</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>copy-mskins-41</id>
<phase>site</phase>
<goals>
diff --git a/src/it/mskins-34/pom.xml b/src/it/mskins-34/pom.xml
deleted file mode 100644
index 7a58b12..0000000
--- a/src/it/mskins-34/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>@project.parent.version@</version>
- </parent>
-
- <groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-34</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>@project.name@ IT, MSKINS-34</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-34/</url>
-
- <properties>
- <skinName>@project.name@</skinName>
- <skinDescription>@project.description@</skinDescription>
- <skinGroupId>@project.groupId@</skinGroupId>
- <skinArtifactId>@project.artifactId@</skinArtifactId>
- <skinVersion>@project.version@</skinVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>@sitePluginVersion@</version>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
diff --git a/src/it/mskins-34/src/site/apt/index.apt.vm b/src/it/mskins-34/src/site/apt/index.apt.vm
deleted file mode 100644
index 7b90750..0000000
--- a/src/it/mskins-34/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,36 +0,0 @@
- ------
- ${project.name}
- ------
- Simo
- ------
- 2012-03-18
- ------
-
-~~ 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 Facebook like button.
- ${skinDescription}
-
-* Actual configuration
-
-%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-34/src/site/site.xml b/src/it/mskins-34/src/site/site.xml
deleted file mode 100644
index 3f9e710..0000000
--- a/src/it/mskins-34/src/site/site.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * 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.
- */
- -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
- name="${skinName}">
-
- <skin>
- <groupId>${skinGroupId}</groupId>
- <artifactId>${skinArtifactId}</artifactId>
- <version>${skinVersion}</version>
- </skin>
-
- <!-- START SNIPPET: skin-custom-config -->
- <custom>
- <fluidoSkin>
- <googlePlusOne />
- </fluidoSkin>
- </custom>
- <!-- END SNIPPET: skin-custom-config -->
-
- <publishDate format="yyyy-MM-dd" position="right" />
- <version position="right" />
-
-</project>
diff --git a/src/it/mskins-34_topbar/pom.xml b/src/it/mskins-34_topbar/pom.xml
deleted file mode 100644
index 7a58b12..0000000
--- a/src/it/mskins-34_topbar/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>@project.parent.version@</version>
- </parent>
-
- <groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-34</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>@project.name@ IT, MSKINS-34</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-34/</url>
-
- <properties>
- <skinName>@project.name@</skinName>
- <skinDescription>@project.description@</skinDescription>
- <skinGroupId>@project.groupId@</skinGroupId>
- <skinArtifactId>@project.artifactId@</skinArtifactId>
- <skinVersion>@project.version@</skinVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>@sitePluginVersion@</version>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
diff --git a/src/it/mskins-34_topbar/src/site/apt/index.apt.vm b/src/it/mskins-34_topbar/src/site/apt/index.apt.vm
deleted file mode 100644
index 7b90750..0000000
--- a/src/it/mskins-34_topbar/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,36 +0,0 @@
- ------
- ${project.name}
- ------
- Simo
- ------
- 2012-03-18
- ------
-
-~~ 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 Facebook like button.
- ${skinDescription}
-
-* Actual configuration
-
-%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-34_topbar/src/site/site.xml b/src/it/mskins-34_topbar/src/site/site.xml
deleted file mode 100644
index 7830d98..0000000
--- a/src/it/mskins-34_topbar/src/site/site.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * 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.
- */
- -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
- name="${skinName}">
-
- <skin>
- <groupId>${skinGroupId}</groupId>
- <artifactId>${skinArtifactId}</artifactId>
- <version>${skinVersion}</version>
- </skin>
-
- <!-- START SNIPPET: skin-custom-config -->
- <custom>
- <fluidoSkin>
- <googlePlusOne />
- <topBarEnabled>true</topBarEnabled>
- <sideBarEnabled>false</sideBarEnabled>
- </fluidoSkin>
- </custom>
- <!-- END SNIPPET: skin-custom-config -->
-
- <publishDate format="yyyy-MM-dd" position="right" />
- <version position="right" />
-
-</project>
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index ca19b3a..077d7e9 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -688,25 +688,6 @@ $indent </ul>##
##
##
##
-#macro ( googlePlusOne $sideBarEnabled )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.googlePlusOne' ) && $project.url )
-#* *##set( $dataSize = 'tall' )
-#* *##if( !$sideBarEnabled )
-#* *##set( $dataSize = 'medium' )
-#* *##end
- <script type="text/javascript">asyncJs( 'https://apis.google.com/js/plusone.js' )</script>
-#* *##if( !$sideBarEnabled )
- <ul class="nav pull-right"><li style="margin-top: 10px;">
-#* *##end
- <div class="g-plusone" data-href="$project.url" data-size="$dataSize" #if( !$sideBarEnabled ) width="60px" align="right" #end></div>
-#* *##if( !$sideBarEnabled )
- </li></ul>
-#* *##end
-#**##end
-#end
-##
-##
-##
#macro ( facebookLike $sideBarEnabled )
#**##if ( $decoration.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
## ## kindly hardcoded
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index d6ea885..7f8f504 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -133,7 +133,6 @@
##
#* *##if ( !$sideBarEnabled )
#* *##facebookLike( $sideBarEnabled )
-#* *##googlePlusOne( $sideBarEnabled )
#* *##followTwitter( $sideBarEnabled )
#* *##flattrBody( $sideBarEnabled )
#* *##end
@@ -213,8 +212,6 @@
#* *##end
<hr />
<div id="poweredBy">
-#* *##googlePlusOne( $sideBarEnabled )
- <div class="clear"></div>
#* *##facebookLike( $sideBarEnabled )
<div class="clear"></div>
#* *##followTwitter( $sideBarEnabled )
diff --git a/src/site/apt/ITs.apt b/src/site/apt/ITs.apt
index fb98dae..73ca80c 100644
--- a/src/site/apt/ITs.apt
+++ b/src/site/apt/ITs.apt
@@ -50,10 +50,6 @@ Maven Fuido Skin ITs
* {{{./mskins-33_topbar/index.html}Like (topbar)}}
- * {{{./mskins-34/index.html}Google +1}}
-
- * {{{./mskins-34_topbar/index.html}Google +1 (topbar)}}
-
* {{{./mskins-10/index.html}MSKINS-10}}
* {{{./mskins-13/index.html}MSKINS-13}}
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index aab1c33..6ab6124 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -436,27 +436,6 @@ Welcome to ${project.name}!
<<Note>> in order the Facebook like button appears, <<<$\{project.url\}>>> property <<must>> be set in the <<<pom.xml>>>!
-** Google plusone button
-
- Since version <<1.2>>, fluido-skin supports the Google {{{https://developers.google.com/+/plugins/+1button/}plusone}}
- integration. Users have just to declare:
-
-+-----+
-<project name="xxx">
- [...]
- <custom>
- <fluidoSkin>
- <googlePlusOne />
- </fluidoSkin>
- </custom>
- [...]
-</project>
-+-----+
-
- By default, it is rendered in the sidebar, if the topbar only is available it will be rendered there.
-
- <<Note>> in order the Google plusone button appears, <<<$\{project.url\}>>> property <<must>> be set in the <<<pom.xml>>>!
-
** Piwik web analytics
Since version <<1.3.1>>, fluido-skin supports inserting {{{http://piwik.org/}Piwik web analytics}}
diff --git a/src/site/site.xml b/src/site/site.xml
index 29222ef..b6a8d77 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -32,7 +32,6 @@ under the License.
<custom>
<fluidoSkin>
- <googlePlusOne />
<facebookLike />
<gitHub>
<projectId>apache/${project.artifactId}</projectId>