You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2021/02/04 18:07:42 UTC
[httpcomponents-website] branch master updated (4719098 -> f8a1aca)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git.
from 4719098 Reference xref report resources from example pages (example sources no longer need to be deployed separately) /updated
new fe8411b switch to Fluido skin and add edit button
new f8a1aca prepare generated documentation integration: LATEST staging+releases
The 2 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:
pom.xml | 36 +++++++++++++++++++---
.../documentation.links | 3 ++
.../httpcomponents-core-5.1.x/documentation.links | 3 ++
src/site/site.xml | 15 ++++++---
4 files changed, 49 insertions(+), 8 deletions(-)
create mode 100644 src/site/resources/httpcomponents-client-5.0.x/documentation.links
create mode 100644 src/site/resources/httpcomponents-core-5.1.x/documentation.links
[httpcomponents-website] 01/02: switch to Fluido skin and add edit
button
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git
commit fe8411bce1f321cb946ca55986691559c3496bd0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Feb 2 12:05:02 2021 +0100
switch to Fluido skin and add edit button
---
pom.xml | 6 +++---
src/site/site.xml | 15 +++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f783da..1bd38a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,9 @@
<packaging>pom</packaging>
<scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-parent.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-parent.git</developerConnection>
- <url>https://github.com/apache/httpcomponents-parent/tree/${project.scm.tag}</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-website.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/httpcomponents-website.git</developerConnection>
+ <url>https://github.com/apache/httpcomponents-website/tree/${project.scm.tag}</url>
<tag>master</tag>
</scm>
diff --git a/src/site/site.xml b/src/site/site.xml
index 4f09db1..aed9344 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -23,11 +23,12 @@ under the License.
<!-- N.B. all non-body elements are automatically inherited -->
<version position="none" /><!-- no version display on unversioned part of the site -->
+ <edit>${project.scm.url}</edit>
<skin>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>maven-site-skin</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
</skin>
<bannerLeft>
@@ -43,10 +44,13 @@ under the License.
</bannerRight>
<body>
+ <breadcrumbs>
+ <item name="HttpComponents" href="http://hc.apache.org/index.html"/>
+ </breadcrumbs>
+
<!-- N.B. body links are automatically inherited -->
<links>
<item name="Apache" href="http://www.apache.org/"/>
- <item name="HttpComponents" href="http://hc.apache.org/index.html"/>
</links>
<!-- add standard menu links for all sub-sites -->
@@ -150,5 +154,8 @@ under the License.
<br/>
<div class="xleft">All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
</footer>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
+ </fluidoSkin>
</custom>
</project>
[httpcomponents-website] 02/02: prepare generated documentation
integration: LATEST staging+releases
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git
commit f8a1aca473b298e7715c2cd3528be3133087d59e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Fri Jan 29 08:48:45 2021 +0100
prepare generated documentation integration: LATEST staging+releases
---
pom.xml | 30 +++++++++++++++++++++-
.../documentation.links | 3 +++
.../httpcomponents-core-5.1.x/documentation.links | 3 +++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1bd38a5..d2e9a18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
<configuration>
<content>${project.reporting.outputDirectory}</content><!-- no need for site:stage, use target/site -->
<ignorePathsToDelete><!-- don't delete content until site svnpubsub location refactoring done -->
+ <ignorePathsToDelete>components</ignorePathsToDelete>
<ignorePathsToDelete>*.html</ignorePathsToDelete>
- <ignorePathsToDelete>doc</ignorePathsToDelete>
<ignorePathsToDelete>apidocs</ignorePathsToDelete>
<ignorePathsToDelete>xref</ignorePathsToDelete>
<ignorePathsToDelete>xref-test</ignorePathsToDelete>
@@ -126,6 +126,34 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.9</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>link-components</id>
+ <phase>site</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- links to components directories containing documentation generated from code -->
+ <symlink action="recreate" overwrite="true">
+ <fileset dir="${project.reporting.outputDirectory}" includes="**/documentation.links"/>
+ </symlink>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/src/site/resources/httpcomponents-client-5.0.x/documentation.links b/src/site/resources/httpcomponents-client-5.0.x/documentation.links
new file mode 100644
index 0000000..28d8f1b
--- /dev/null
+++ b/src/site/resources/httpcomponents-client-5.0.x/documentation.links
@@ -0,0 +1,3 @@
+# links property file for Ant's symlink task in pom.xml:
+# links to components in http://hc.apache.org/components/
+LATEST ../components/httpcomponents-client-5.0.x/LATEST
diff --git a/src/site/resources/httpcomponents-core-5.1.x/documentation.links b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
new file mode 100644
index 0000000..6a5bed1
--- /dev/null
+++ b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
@@ -0,0 +1,3 @@
+# links property file for Ant's symlink task in pom.xml:
+# links to components in http://hc.apache.org/components/
+LATEST ../components/httpcomponents-core-5.1.x/LATEST