Repository: oozie Updated Branches: refs/heads/master 5f6b9159d -> 0d584510b
OOZIE-3134 Improve documentation rendering: use fluido skin and better config (hboutemy via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/0d584510 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0d584510 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0d584510 Branch: refs/heads/master Commit: 0d584510b9350a525913130253b89cab874c9bed Parents: 5f6b915 Author: Andras Piros <andras.pi...@cloudera.com> Authored: Tue Feb 6 10:51:01 2018 -0300 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Tue Feb 6 10:51:01 2018 -0300 ---------------------------------------------------------------------- docs/pom.xml | 2 +- docs/src/site/site.xml | 28 ++++++++++++++++++++++++---- pom.xml | 6 +++--- release-log.txt | 1 + 4 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/0d584510/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index e5ab5e1..70f6e28 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,7 +17,7 @@ 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/maven-v4_0_0.xsd"> + 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.oozie</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/0d584510/docs/src/site/site.xml ---------------------------------------------------------------------- diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index da30f39..c9d3f1b 100644 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -15,18 +15,38 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project name="Oozie"> +<project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd" + name="Oozie"> <bannerLeft> <name>Oozie</name> + <src>https://oozie.apache.org/images/oozie_200x.png</src> + <href>https://oozie.apache.org/</href> </bannerLeft> + <!--bannerRight> + <src>https://oozie.apache.org/images/asf_logo_wide.png</src> + <href>http://www.apache.org/</href> + <width>300px</width> + </bannerRight--> + + <publishDate position="right"/> + <version position="right"/> + <skin> <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-stylus-skin</artifactId> - <version>1.1</version> + <artifactId>maven-fluido-skin</artifactId> + <version>1.4</version> </skin> - <body/> + <body> + <breadcrumbs> + <item name="Apache" href="http://www.apache.org/" /> + <item name="Oozie" href="../../" /> + <item name="docs" href="../" /> + <item name="${project.version}" href="./" /> + </breadcrumbs> + </body> </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/0d584510/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6bd1b7a..016a70f 100644 --- a/pom.xml +++ b/pom.xml @@ -1172,19 +1172,19 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>${activemq.version}</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> - <version>${activemq.version}</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-kahadb-store</artifactId> - <version>${activemq.version}</version> + <version>${activemq.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/0d584510/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4029944..3ded365 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3134 Improve documentation rendering: use fluido skin and better config (hboutemy via andras.piros) OOZIE-2847 Oozie Ha timing issue (dionusos via asasvari) OOZIE-1717 amend Add indexes to speed up db queries (asasvari) OOZIE-3168 Remove -secure option from DG_QuickStart.twiki and from oozie-setup.sh (kmarton via gezapeti)