Repository: atlas Updated Branches: refs/heads/branch-0.8 0198bab58 -> 281ec4fbf
ATLAS-2366: updated website license text in the footer (branch-0.8) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/281ec4fb Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/281ec4fb Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/281ec4fb Branch: refs/heads/branch-0.8 Commit: 281ec4fbf868e3bda44920230d310b1199837858 Parents: 0198bab Author: Madhan Neethiraj <[email protected]> Authored: Thu Jan 25 19:38:44 2018 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jan 25 20:11:12 2018 -0800 ---------------------------------------------------------------------- addons/falcon-bridge/pom.xml | 7 ++++++- addons/hbase-bridge/pom.xml | 7 ++++++- addons/hive-bridge/pom.xml | 7 ++++++- addons/sqoop-bridge/pom.xml | 7 ++++++- addons/storm-bridge/pom.xml | 7 ++++++- docs/pom.xml | 10 +++++++++- docs/src/site/site.xml | 25 +++++++++---------------- pom.xml | 19 +++++++++++++++++-- webapp/pom.xml | 7 +++++++ 9 files changed, 72 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/281ec4fb/addons/falcon-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 8916a70..25a0369 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -341,7 +341,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/281ec4fb/addons/hbase-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 5d6f857..6df279a 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -471,7 +471,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/281ec4fb/addons/hive-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 9d387ba..47acfc4 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-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/281ec4fb/addons/sqoop-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml index 1425cc2..eb82532 100644 --- a/addons/sqoop-bridge/pom.xml +++ b/addons/sqoop-bridge/pom.xml @@ -402,7 +402,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/281ec4fb/addons/storm-bridge/pom.xml ---------------------------------------------------------------------- diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index 4268c23..f8c2713 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -477,7 +477,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/281ec4fb/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index 685347e..597e935 100755 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -74,9 +74,17 @@ <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> + <port>9090</port> + </configuration> <executions> <execution> <goals> http://git-wip-us.apache.org/repos/asf/atlas/blob/281ec4fb/docs/src/site/site.xml ---------------------------------------------------------------------- diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index 4de52b6..c4288fd 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"/> @@ -102,12 +96,13 @@ </menu> <menu name="Documentation"> - <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"/> - <item name="0.7-incubating" href="./0.7.0-incubating/index.html"/> - <item name="0.6-incubating" href="./0.6.0-incubating/index.html"/> - <item name="0.5-incubating" href="./0.5.0-incubating/index.html"/> + <item name="latest" href="../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"/> + <item name="0.7-incubating" href="../0.7.0-incubating/index.html"/> + <item name="0.6-incubating" href="../0.6.0-incubating/index.html"/> + <item name="0.5-incubating" href="../0.5.0-incubating/index.html"/> </menu> <menu name="ASF"> @@ -118,9 +113,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/281ec4fb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fbd786a..2819c32 100644 --- a/pom.xml +++ b/pom.xml @@ -544,6 +544,9 @@ <jettison.version>1.3.7</jettison.version> <paranamer.version>2.7</paranamer.version> <zkclient.version>0.8</zkclient.version> + <enunciate-maven-plugin.version>2.10.1</enunciate-maven-plugin.version> + <maven-site-plugin.version>3.7</maven-site-plugin.version> + <doxia.version>1.8</doxia.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> @@ -1623,7 +1626,7 @@ <dependency> <groupId>com.webcohesion.enunciate</groupId> <artifactId>enunciate-core-annotations</artifactId> - <version>2.8.0</version> + <version>${enunciate-maven-plugin.version}</version> </dependency> @@ -1836,7 +1839,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> @@ -2182,6 +2185,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/281ec4fb/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 9e23885..c94927b 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -747,6 +747,13 @@ <target>1.7</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>
