OOZIE-2723 JSON.org license is now CatX (rkanter, abhishekbafna via shwethags) - update
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/93c17cc2 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/93c17cc2 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/93c17cc2 Branch: refs/heads/oya Commit: 93c17cc28112b2319d5557a05507d46519174096 Parents: ed1e252 Author: Shwetha GS <[email protected]> Authored: Fri Nov 25 10:21:37 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Fri Nov 25 10:21:37 2016 +0530 ---------------------------------------------------------------------- NOTICE.txt | 3 +++ RELEASE_NOTES.txt | 4 ---- bin/create-release-artifact | 2 -- pom.xml | 1 - sharelib/hive/pom.xml | 4 ---- sharelib/hive2/pom.xml | 10 ---------- sharelib/pig/pom.xml | 4 ---- src/main/assemblies/distro-jetty.xml | 1 - src/main/assemblies/distro-tomcat.xml | 1 - 9 files changed, 3 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index b70f114..e2a937c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -9,6 +9,9 @@ Copyright 2011 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +This product includes org.json (http://www.json.org/java/index.html), +Copyright (c) 2002 JSON.org + Detailed License information for all components can be found in the documentation in the ooziedocs.war at index.html##LicenseInfo http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/RELEASE_NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt deleted file mode 100644 index 6af49f6..0000000 --- a/RELEASE_NOTES.txt +++ /dev/null @@ -1,4 +0,0 @@ -These notes are for Oozie 4.3.0 release. - -Oozie no longer includes JSON.org dependencies. If Hive or Hive2 action in workflow needs JSON.org dependencies, then they need to be -added manually into respective sharelib. http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/bin/create-release-artifact ---------------------------------------------------------------------- diff --git a/bin/create-release-artifact b/bin/create-release-artifact index cee5fa6..1f1bcd2 100755 --- a/bin/create-release-artifact +++ b/bin/create-release-artifact @@ -58,8 +58,6 @@ run tar czf oozie-${releaseVersion}.tar.gz oozie-$releaseVersion run cp oozie-$releaseVersion/release-log.txt . -run cp oozie-$releaseVersion/RELEASE_NOTES.txt . - run cd oozie-$releaseVersion run mvn apache-rat:check http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 551a622..7e67b77 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,6 @@ <httpcore.version>4.3.3</httpcore.version> <httpclient.version>4.3.6</httpclient.version> <kyro.version>2.22</kyro.version> - <json.version>20090211</json.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index 2b52a82..c5e9f12 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -91,10 +91,6 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> </exclusion> - <exclusion> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/sharelib/hive2/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive2/pom.xml b/sharelib/hive2/pom.xml index 4ef219a..e81bfbe 100644 --- a/sharelib/hive2/pom.xml +++ b/sharelib/hive2/pom.xml @@ -91,20 +91,10 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> </exclusion> - <exclusion> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>${json.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/sharelib/pig/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml index da246f9..67e5bf2 100644 --- a/sharelib/pig/pom.xml +++ b/sharelib/pig/pom.xml @@ -138,10 +138,6 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> </exclusion> - <exclusion> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/src/main/assemblies/distro-jetty.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro-jetty.xml b/src/main/assemblies/distro-jetty.xml index ba23a50..6e3db57 100644 --- a/src/main/assemblies/distro-jetty.xml +++ b/src/main/assemblies/distro-jetty.xml @@ -41,7 +41,6 @@ <include>NOTICE.txt</include> <include>README.txt</include> <include>release-log.txt</include> - <include>RELEASE_NOTES.txt</include> </includes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/oozie/blob/93c17cc2/src/main/assemblies/distro-tomcat.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro-tomcat.xml b/src/main/assemblies/distro-tomcat.xml index ba4f56b..82ba8f9 100644 --- a/src/main/assemblies/distro-tomcat.xml +++ b/src/main/assemblies/distro-tomcat.xml @@ -41,7 +41,6 @@ <include>NOTICE.txt</include> <include>README.txt</include> <include>release-log.txt</include> - <include>RELEASE_NOTES.txt</include> </includes> </fileSet> <fileSet>
