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 2022/05/06 09:55:32 UTC
[maven-fluido-skin] branch MSKINS-183 updated (e869ad2 -> 92218f1)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSKINS-183
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
discard e869ad2 [MSKINS-183] Drop Ohloh widgets
new 92218f1 [MSKINS-183] Drop Ohloh widgets
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e869ad2)
\
N -- N -- N refs/heads/MSKINS-183 (92218f1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/site/apt/index.apt.vm | 1 +
1 file changed, 1 insertion(+)
[maven-fluido-skin] 01/01: [MSKINS-183] Drop Ohloh widgets
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSKINS-183
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit 92218f1a425335f93b6e23a7634676b9b544265c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri May 6 01:45:01 2022 +0200
[MSKINS-183] Drop Ohloh widgets
---
src/it/mskins-25/pom.xml | 76 ------------------------
src/it/mskins-25/src/site/apt/index.apt.vm | 36 -----------
src/it/mskins-25/src/site/site.xml | 58 ------------------
src/main/resources/META-INF/maven/site-macros.vm | 44 --------------
src/main/resources/META-INF/maven/site.vm | 2 -
src/main/resources/css/maven-base.css | 1 -
src/site/apt/ITs.apt | 2 -
src/site/apt/index.apt.vm | 53 -----------------
8 files changed, 272 deletions(-)
diff --git a/src/it/mskins-25/pom.xml b/src/it/mskins-25/pom.xml
deleted file mode 100644
index dd185dd..0000000
--- a/src/it/mskins-25/pom.xml
+++ /dev/null
@@ -1,76 +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.skins</groupId>
- <artifactId>maven-skins</artifactId>
- <version>@project.parent.version@</version>
- </parent>
-
- <groupId>org.apache.maven.skins.its</groupId>
- <artifactId>@project.artifactId@-mskins-25</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>@project.name@ IT, MSKINS-25</name>
- <url>http://maven.apache.org/skins/@project.artifactId@/mskins-25/</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>
- <version>@projectInfoReportsPluginVersion@</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
diff --git a/src/it/mskins-25/src/site/apt/index.apt.vm b/src/it/mskins-25/src/site/apt/index.apt.vm
deleted file mode 100644
index b61a44e..0000000
--- a/src/it/mskins-25/src/site/apt/index.apt.vm
+++ /dev/null
@@ -1,36 +0,0 @@
- ------
- ${project.name}
- ------
- Hervé Boutemy
- ------
- 2011-10-15
- ------
-
-~~ 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 sidebar enabled and Google Search.
- ${skinDescription}
-
-* Actual configuration
-
-%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
diff --git a/src/it/mskins-25/src/site/site.xml b/src/it/mskins-25/src/site/site.xml
deleted file mode 100644
index 62c42d0..0000000
--- a/src/it/mskins-25/src/site/site.xml
+++ /dev/null
@@ -1,58 +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>
- <ohloh>
- <projectId>3499</projectId>
- <widget>factoids</widget>
- </ohloh>
- </fluidoSkin>
- </custom>
- <!-- END SNIPPET: skin-custom-config -->
-
- <publishDate format="yyyy-MM-dd" position="right" />
- <version position="right" />
-
- <body>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- </menu>
-
- <menu ref="reports"/>
-
- </body>
-
-</project>
\ No newline at end of file
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 2101692..25ab4f5 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -728,50 +728,6 @@ $indent </ul>##
#**##end
#end
##
-#macro ( ohloh )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.ohloh.projectId' ) )
-#* *##set ( $projectId = $decoration.getCustomValue( 'fluidoSkin.ohloh.projectId' ) )
-##
-#* *##set( $widget = "users_logo.js" )
-##
-#* *##if ( $decoration.getCustomChild( 'fluidoSkin.ohloh.widget' ) )
-#* *##set( $definedWidget = $decoration.getCustomValue( 'fluidoSkin.ohloh.widget' ) )
-##
-#* *##if ( $definedWidget.equalsIgnoreCase( "users-logo" ) )
-#* *##set( $widget = "users_logo.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users-green" ) )
-#* *##set( $widget = "users.js?style=green" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users-red" ) )
-#* *##set( $widget = "users.js?style=red" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users-blue" ) )
-#* *##set( $widget = "users.js?style=blue" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users-gray" ) )
-#* *##set( $widget = "users.js?style=gray" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users-rainbow" ) )
-#* *##set( $widget = "users.js?style=rainbow" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "users" ) )
-#* *##set( $widget = "users.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "thin-badge" ) )
-#* *##set( $widget = "thin_badge.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "partner-badge" ) )
-#* *##set( $widget = "partner_badge.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "languages" ) )
-#* *##set( $widget = "languages.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "factoids" ) )
-#* *##set( $widget = "factoids.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "cocomo" ) )
-#* *##set( $widget = "cocomo.js" )
-#* *##elseif ( $definedWidget.equalsIgnoreCase( "stats" ) )
-#* *##set( $widget = "basic_stats.js" )
-#* *##end
-#**##end
-##
- <div id="ohloh" class="pull-right">
- <script src="https://www.ohloh.net/p/${projectId}/widgets/project_${widget}"></script>
- </div>
- #end
-#end
-##
#macro ( flattrHead )
#**##if ( $decoration.getCustomChild( 'fluidoSkin.flattr.thing' )
&& ( $decoration.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) )
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 7d4c660..d84dc30 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -290,8 +290,6 @@
#* *##builtByLogo( $decoration.poweredBy )
#* *#</p>
#* *##end
-##
-#* *##ohloh()
</div>
</footer>
#**##piwik()
diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css
index e3ad8fa..072cc38 100644
--- a/src/main/resources/css/maven-base.css
+++ b/src/main/resources/css/maven-base.css
@@ -20,5 +20,4 @@
.clear{clear:both;visibility: hidden;}
.clear hr{display: none;}
.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left: 7px;}
-#ohloh {margin-bottom: 10px;}
#poweredBy{text-align: center}
diff --git a/src/site/apt/ITs.apt b/src/site/apt/ITs.apt
index 6f4fb4c..ac13f3d 100644
--- a/src/site/apt/ITs.apt
+++ b/src/site/apt/ITs.apt
@@ -46,8 +46,6 @@ Maven Fuido Skin ITs
* {{{./mskins-24_topbar/index.html}Twitter (topbar)}}
- * {{{./mskins-25/index.html}Ohloh}}
-
* {{{./mskins-33/index.html}Like}}
* {{{./mskins-161-sidebar-fb-like-share}Like with share}}
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 0195ffe..c1ee68c 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -385,59 +385,6 @@ Welcome to ${project.name}!
By default, it is rendered in the sidebar, if the topbar only is available it will be rendered there.
-** Ohloh widgets
-
- Since version <<1.1>>, fluido-skin supports the Ohloh {{{https://www.ohloh.net/p/maven2/widgets}widgets}}
- to simplify its integration. Users must define:
-
- * <<<custom.fluidoSkin.ohloh.projectId>>>: <<required>>, it is the project identifier in Ohloh (could be the numeric id or the project name);
-
- * <<<custom.fluidoSkin.ohloh.widget>>>: <<optional>>, it is the kind of widget has to be rendered, admitted values are:
-
- * <<<users-logo>>> (default)
-
- * <<<users-green>>>
-
- * <<<users-red>>>
-
- * <<<users-blue>>>
-
- * <<<users-gray>>>
-
- * <<<users-rainbow>>>
-
- * <<<users>>>
-
- * <<<thin-badge>>>
-
- * <<<partner-badge>>>
-
- * <<<languages>>>
-
- * <<<factoids>>>
-
- * <<<cocomo>>>
-
- * <<<stats>>>
-
-
-+-----+
-<project name="xxx">
- [...]
- <custom>
- <fluidoSkin>
- <ohloh>
- <projectId>3499</projectId>
- <widget>factoids</widget>
- </ohloh>
- </fluidoSkin>
- </custom>
- [...]
-</project>
-+-----+
-
- Ohloh widgets will be rendered always in the footer as last element
-
** Facebook like button
Since version <<1.2>>, fluido-skin supports the Facebook {{{https://developers.facebook.com/docs/plugins/like-button}like}}