Repository: oozie Updated Branches: refs/heads/master d5c4f3b7b -> 4e5b3cb59
http://git-wip-us.apache.org/repos/asf/oozie/blob/4e5b3cb5/docs/src/site/twiki/index.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/index.twiki b/docs/src/site/twiki/index.twiki deleted file mode 100644 index 3003fa9..0000000 --- a/docs/src/site/twiki/index.twiki +++ /dev/null @@ -1,111 +0,0 @@ -<noautolink> - ----+!! Oozie, Workflow Engine for Apache Hadoop - -Oozie v3 is a server based _Bundle Engine_ that provides a higher-level oozie abstraction that will batch a set of coordinator applications. The user will be able to start/stop/suspend/resume/rerun a set coordinator jobs in the bundle level resulting a better and easy operational control. - -Oozie v2 is a server based _Coordinator Engine_ specialized in running workflows based on time and data triggers. -It can continuously run workflows based on time (e.g. run it every hour), and data availability -(e.g. wait for my input data to exist before running my workflow). - -Oozie v1 is a server based _Workflow Engine_ specialized in running workflow jobs with actions that -execute Hadoop Map/Reduce and Pig jobs. - -%TOC% - ----++ Distribution Contents - -Oozie distribution consists of a single 'tar.gz' file containing: - - * Readme, license, notice & [[./release-log.txt][Release log]] files. - * Oozie server: =oozie-server= directory. - * Scripts: =bin/= directory, client and server scripts. - * Binaries: =lib/= directory, client JAR files. - * Configuration: =conf/= server configuration directory. - * Archives: - * =oozie-client-*.tar.gz=: Client tools. - * =oozie.war=: Oozie WAR file. - * =docs.zip=: Documentation. - * =oozie-examples-*.tar.gz=: Examples. - * =oozie-sharelib-*.tar.gz=: Share libraries (with Streaming, Pig JARs). - ----++ Quick Start - -Enough reading already? Follow the steps in [[DG_QuickStart][Oozie Quick Start]] to get Oozie up and running. - ----++ Developer Documentation - - * [[DG_Overview][Overview]] - * [[DG_QuickStart][Oozie Quick Start]] - * [[DG_Examples][Running the Examples]] - * [[WorkflowFunctionalSpec][Workflow Functional Specification]] - * [[CoordinatorFunctionalSpec][Coordinator Functional Specification]] - * [[BundleFunctionalSpec][Bundle Functional Specification]] - * [[https://docs.oracle.com/javaee/7/tutorial/jsf-el.htm][EL Expression Language Quick Reference]] - * [[DG_CommandLineTool][Command Line Tool]] - * [[DG_WorkflowReRun][Workflow Re-runs Explained]] - * [[DG_HCatalogIntegration][HCatalog Integration Explained]] - - * [[./client/apidocs/index.html][Oozie Client Javadocs]] - * [[./core/apidocs/index.html][Oozie Core Javadocs]] - * [[WebServicesAPI][Oozie Web Services API]] - * [[DG_ActionAuthentication][Action Authentication]] - ----+++ Action Extensions - - * [[DG_EmailActionExtension][Email Action]] - * [[DG_ShellActionExtension][Shell Action]] - * [[DG_HiveActionExtension][Hive Action]] - * [[DG_Hive2ActionExtension][Hive 2 Action]] - * [[DG_SqoopActionExtension][Sqoop Action]] - * [[DG_SshActionExtension][Ssh Action]] - * [[DG_DistCpActionExtension][DistCp Action]] - * [[DG_SparkActionExtension][Spark Action]] - * [[DG_CustomActionExecutor][Writing a Custom Action Executor]] - ----+++ Job Status and SLA Monitoring - - * [[DG_JMSNotifications][JMS Notifications for Job and SLA]] - * [[DG_SLAMonitoring][Configuring and Monitoring SLA]] - ----++ Administrator Documentation - - * [[AG_Install][Oozie Install]] - * [[AG_OozieLogging][Oozie Logging]] - * [[AG_HadoopConfiguration][Hadoop Configuration]] - * [[AG_ActionConfiguration][Action Configuration]] - * [[AG_Monitoring][Oozie Monitoring]] - * [[DG_CommandLineTool][Command Line Tool]] - * [[AG_OozieUpgrade][Oozie Upgrade]] - -#LicenseInfo ----++ Licensing Information - -Oozie is distributed under [[http://www.apache.org/licenses/LICENSE-2.0][Apache License 2.0]]. - -For details on the license of the dependent components, refer to the -[[./dependencies.html#Licenses][Dependencies Report, Licenses section]]. - -Oozie bundles an embedded Jetty 9.x. - -Some of the components in the dependencies report don't mention their license in the published POM. They are: - - * JDOM: [[http://www.jdom.org/docs/faq.html#a0030][JDOM License]] (Apache style). - * Oro: [[http://www.apache.org/licenses/LICENSE-2.0][Apache License 2.0]]. - -Oozie uses a modified version of the Apache Doxia core and twiki plugins to generate Oozie documentation. - ----++ Engineering Documentation - - * [[ENG_Building][Building Oozie]] - * [[./dependencies.html][Dependencies Report]] - ----++ MiniOozie Documentation - - * [[ENG_MiniOozie][Testing User Oozie Applications Using MiniOozie]] - ----++ Oozie User Authentication Documentation - - * [[ENG_Custom_Authentication][Create Custom Oozie Authentication]] - -</noautolink> http://git-wip-us.apache.org/repos/asf/oozie/blob/4e5b3cb5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 423d19d..d6440e4 100644 --- a/pom.xml +++ b/pom.xml @@ -1729,9 +1729,34 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <!-- Don't change version as doc generation may fail --> - <!-- (using custom doxia for twiki pages generation) --> - <version>2.0-beta-6</version> + <version>3.7</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-markdown</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>1.7</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -2011,7 +2036,7 @@ <exclude>work.log</exclude> <exclude>SecurityAuth.audit</exclude> <exclude>.gitignore</exclude> - <exclude>docs/src/site/twiki/*.twiki</exclude> + <exclude>docs/src/site/markdown/*.md</exclude> <exclude>examples/src/main/data/*</exclude> <exclude>core/src/test/resources/test-ioutils.txt</exclude> <exclude>core/src/test/resources/oldWorkFlowApp.serialized</exclude> http://git-wip-us.apache.org/repos/asf/oozie/blob/4e5b3cb5/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b835951..bf6c1c7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-2734 [docs] Switch from TWiki to Markdown (asalamon74 via andras.piros, pbacsko, gezapeti) OOZIE-3298 [MapReduce action] External ID is not filled properly and failing MR job is treated as SUCCEEDED (andras.piros via pbacsko, asasvari, gezapeti) OOZIE-3317 amend [build] Fix false positive precommit reports (kmarton via andras.piros) OOZIE-3160 PriorityDelayQueue put()/take() can cause significant CPU load due to busy waiting (pbacsko)
