Repository: atlas Updated Branches: refs/heads/master b7b462e39 -> 5447608bf
ATLAS-2366: updated website for 1.0.0-alpha release; updated license text in the footer Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/5447608b Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/5447608b Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/5447608b Branch: refs/heads/master Commit: 5447608bf3fe491fc0219d6731ec55ac0062a176 Parents: b7b462e Author: Madhan Neethiraj <[email protected]> Authored: Wed Jan 24 20:56:08 2018 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jan 25 14:36:46 2018 -0800 ---------------------------------------------------------------------- addons/falcon-bridge/pom.xml | 7 ++++++- addons/hbase-bridge/pom.xml | 7 ++++++- addons/hdfs-model/pom.xml | 7 ++++++- addons/hive-bridge/pom.xml | 7 ++++++- addons/sqoop-bridge/pom.xml | 7 ++++++- addons/storm-bridge/pom.xml | 7 ++++++- docs/pom.xml | 7 ++++++- docs/src/site/site.xml | 15 +++++---------- docs/src/site/twiki/index.twiki | 2 +- pom.xml | 16 +++++++++++++++- webapp/pom.xml | 7 +++++++ 11 files changed, 70 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/falcon-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 26c2fd3..40e91d4 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -310,7 +310,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/hbase-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 874bf8c..28d3e8b 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -451,7 +451,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/hdfs-model/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml index b3f06b7..b5481ba 100644 --- a/addons/hdfs-model/pom.xml +++ b/addons/hdfs-model/pom.xml @@ -89,7 +89,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/hive-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 96da76d..14e4295 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -419,7 +419,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/sqoop-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml index 65c901b..f44002a 100644 --- a/addons/sqoop-bridge/pom.xml +++ b/addons/sqoop-bridge/pom.xml @@ -373,7 +373,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/addons/storm-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index 8e48367..2d41add 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -400,7 +400,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.3</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index 1e38757..770aaf8 100755 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -74,7 +74,12 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-twiki</artifactId> - <version>1.6</version> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> </dependency> </dependencies> <configuration> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/docs/src/site/site.xml ---------------------------------------------------------------------- diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index 4de52b6..187b434 100755 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -24,7 +24,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.7</version> </skin> <custom> @@ -55,12 +55,6 @@ <version position="right"/> <body> - <head> - <script type="text/javascript"> - $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } ); - </script> - </head> - <breadcrumbs> <item name="Apache" href="http://www.apache.org"/> <item name="Atlas" title="Apache Atlas" href="index.html"/> @@ -87,6 +81,8 @@ </menu> <menu name="Releases"> + <item name="1.0.0-alpha" + href="http://www.apache.org/dyn/closer.cgi/atlas/1.0.0-alpha/"/> <item name="0.8.1" href="http://www.apache.org/dyn/closer.cgi/atlas/0.8.1/"/> <item name="0.8-incubating" @@ -102,6 +98,7 @@ </menu> <menu name="Documentation"> + <item name="1.0.0-alpha" href="./1.0.0-alpha/index.html"/> <item name="0.8.1" href="./0.8.1/index.html"/> <item name="0.8-incubating" href="./0.8.0-incubating/index.html"/> <item name="0.7.1-incubating" href="./0.7.1-incubating/index.html"/> @@ -118,9 +115,7 @@ </menu> <footer> - é 2011-2012 The Apache Software Foundation. Apache Atlas, Atlas, Apache, - the Apache feather logo, and the Apache Metadata and Governance project logo are - trademarks of The Apache Software Foundation. + Copyright é 2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. </footer> </body> </project> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/docs/src/site/twiki/index.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/index.twiki b/docs/src/site/twiki/index.twiki index 198ac52..57d5b8a 100755 --- a/docs/src/site/twiki/index.twiki +++ b/docs/src/site/twiki/index.twiki @@ -67,7 +67,7 @@ capabilities around these data assets for data scientists, analysts and the data * <a href="api/v2/index.html">REST API Documentation</a> * [[Import-Export-API][Export & Import REST API Documentation]] - * <a href="api/rest.html">Legacy API Documentation</a> + * <a href="../api/rest.html">Legacy API Documentation</a> ---++ Developer Setup Documentation * [[EclipseSetup][Developer Setup: Eclipse]] http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5c4b4a7..5ed045a 100644 --- a/pom.xml +++ b/pom.xml @@ -568,6 +568,8 @@ <zkclient.version>0.8</zkclient.version> <enunciate-maven-plugin.version>2.10.1</enunciate-maven-plugin.version> <antlr4.plugin.version>4.5</antlr4.plugin.version> + <maven-site-plugin.version>3.7</maven-site-plugin.version> + <doxia.version>1.8</doxia.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> @@ -1718,7 +1720,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> + <version>${maven-site-plugin.version}</version> </plugin> <plugin> @@ -2082,6 +2084,18 @@ <configuration> <skip>${skipSite}</skip> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-twiki</artifactId> + <version>${doxia.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> + </dependency> + </dependencies> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/atlas/blob/5447608b/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 0c9624b..2dad786 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -722,6 +722,13 @@ <target>1.8</target> <skipEnunciate>${skipEnunciate}</skipEnunciate> </configuration> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3</version> + </dependency> + </dependencies> </plugin> </plugins> </build>
