Repository: flex-typedefs Updated Branches: refs/heads/feature-autobuild/example-maven-dirs [created] 39ff5cf05
- Refactored the directory structure of the example projects to be maven-style Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/39ff5cf0 Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/39ff5cf0 Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/39ff5cf0 Branch: refs/heads/feature-autobuild/example-maven-dirs Commit: 39ff5cf0548c49bc24448d775a62531775942702 Parents: e0f9b7a Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Thu Oct 27 17:14:56 2016 +0200 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Thu Oct 27 17:14:56 2016 +0200 ---------------------------------------------------------------------- pom.xml | 115 ++++++++++++++++++++++++++++--------------------- src/site/site.xml | 72 +++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/39ff5cf0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a6a28de..2a27122 100644 --- a/pom.xml +++ b/pom.xml @@ -54,9 +54,8 @@ <!-- Only configure the site distribution as the rest is handled by the apache parent --> <distributionManagement> <site> - <id>website</id> - <!-- TODO: Set this to the correct url --> - <url>scp://www.mycompany.com/www/docs/project/</url> + <id>apache.website</id> + <url>scm:git:https://git-wip-us.apache.org/repos/asf/flex-typedefs.git</url> </site> </distributionManagement> @@ -128,6 +127,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> + <!-- Downgraded to 3.4 as 3.5 and 3.5.1 seem to have issues with the velocity tools --> <version>3.4</version> <configuration> <generateReports>true</generateReports> @@ -139,58 +139,73 @@ </configuration> <dependencies> <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>1.5.3</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>1.6</version> + </dependency> + <!-- All dependencies needed by the reflow skin --> + <dependency> + <groupId>lt.velykis.maven.skins</groupId> + <artifactId>reflow-velocity-tools</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> + <!-- add support for scm/git site deployment --> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-scm</artifactId> + <version>2.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-api</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-manager-plexus</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>1.9.5</version> </dependency> </dependencies> </plugin> + <!-- + Make the maven-site-plugin stage the output in the "asf-site" branch + --> <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>1.5.3</version> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj-diagram</artifactId> - <version>1.3.1</version> - </dependency> - </dependencies> - <configuration> - <requires> - <require>asciidoctor-diagram</require> - </requires> - <attributes> - <!-- Example below shows how to specify in this pom instead of System's PATH, the location of dot command of Graphviz, required by PlantUML libraries --> - <!-- Windows: - <graphvizdot>C:\Program Files (x86)\Graphviz2.38\bin\dot.exe</graphvizdot> - --> - <!-- *nix : - <graphvizdot>/usr/local/bin/dot</graphvizdot> - --> - </attributes> - </configuration> - <!--executions> - <execution> - <id>generate-html-doc</id> - <phase>generate-resources</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - <configuration> - <backend>html5</backend> - <attributes> - <imagesdir>./images</imagesdir> - <toc>left</toc> - <icons>font</icons> - <sectanchors>true</sectanchors> - <idprefix /> - <idseparator>-</idseparator> - </attributes> - </configuration> - </execution> - </executions--> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <!-- deploy site with maven-scm-publish-plugin --> + <goals> + <goal>publish-scm</goal> + </goals> + <configuration> + <!-- mono-module doesn't require site:stage --> + <content>${project.build.directory}/site</content> + <!-- branch where to deploy --> + <scmBranch>asf-site</scmBranch> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/39ff5cf0/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..4a32d1e --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + 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 name="Maven" xmlns="https://maven.apache.org/xsd/decoration-1.7.0.xsd"> + + <skin> + <groupId>lt.velykis.maven.skins</groupId> + <artifactId>reflow-maven-skin</artifactId> + <version>1.1.1</version> + </skin> + + <!-- + Details on how to configure the reflow skin: + http://andriusvelykis.github.io/reflow-maven-skin/skin/ + --> + <custom> + <reflowSkin> + <theme>site</theme> + <titleTemplate>Apache Flex� - %2$s</titleTemplate> + <breadcrumbs>false</breadcrumbs> + <highlightJs>true</highlightJs> + </reflowSkin> + </custom> + + <bannerLeft> + <name>Apache Flex</name> + <src>img/logo-flex.png</src> + <href>http://flex.apache.org/</href> + </bannerLeft> + + <bannerRight> + <name>An Apache Project</name> + <src>img/logo-asf.png</src> + <href>http://www.apache.org</href> + </bannerRight> + + <body> + <head> + <link rel="icon" type="image/x-icon" href="img/favicon.ico"/> + <link rel="apple-touch-icon" href="img/apple-touch-icon-60.png"/> + <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76.png"/> + <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120.png"/> + <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152.png"/> + </head> + + <links> + <item name="Apache Flex Homepage" href="http://flex.apache.org/" /> + <!--item name="Apache FlexJS Homepage" href="http://flex.apache.org/" /--> + <item name="Apache Flex Wiki" href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki"/> + </links> + + <menu ref="reports" /> + <menu ref="parent" /> + <menu ref="modules" /> + </body> +</project> \ No newline at end of file