Repository: nifi-minifi Updated Branches: refs/heads/master e9e9179f8 -> 7330d2ace
MINIFI-431 - Resolving dependency issues from Jersey 2.26 upgrade. MINIFI-431 - Cleaning up L&N for changes to jersey dependencies. MINIFI-432 - Updating copyrights to 2018. Signed-off-by: Pierre Villard <pierre.villard...@gmail.com> This closes #112. Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/7330d2ac Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/7330d2ac Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/7330d2ac Branch: refs/heads/master Commit: 7330d2ace59d072a0578c13e1f4cff147d87490f Parents: e9e9179 Author: Aldrin Piri <ald...@apache.org> Authored: Fri Jan 26 09:56:46 2018 -0500 Committer: Pierre Villard <pierre.villard...@gmail.com> Committed: Fri Feb 2 10:12:54 2018 +0100 ---------------------------------------------------------------------- NOTICE | 2 +- minifi-assembly/NOTICE | 34 +++++++---------- minifi-c2/minifi-c2-assembly/NOTICE | 39 +++++++++++++++----- minifi-docs/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../minifi-framework/minifi-resources/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../src/main/resources/META-INF/NOTICE | 2 +- minifi-nar-bundles/minifi-standard-nar/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../src/main/resources/META-INF/NOTICE | 6 +-- minifi-toolkit/minifi-toolkit-assembly/NOTICE | 8 ++-- pom.xml | 14 +++---- 14 files changed, 70 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 6ee6948..db373ef 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NiFi - MiNiFi -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-assembly/NOTICE b/minifi-assembly/NOTICE index 7e2a8b0..826cfe5 100644 --- a/minifi-assembly/NOTICE +++ b/minifi-assembly/NOTICE @@ -1,5 +1,5 @@ Apache NiFi MiNiFi -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -643,18 +643,17 @@ Common Development and Distribution License 1.1 The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. - (CDDL 1.1) (GPL2 w/ CPE) jersey-core-client (org.glassfish.jersey.core:jersey-client:jar:2.19 - https://jersey.java.net/jersey-client/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-core-common (org.glassfish.jersey.core:jersey-common:jar:2.19 - https://jersey.java.net/jersey-common/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.19 - https://jersey.java.net/jersey-core/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-spring (com.sun.jersey:jersey-spring:jar:1.19 - https://jersey.java.net/jersey-spring/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-servlet (com.sun.jersey:jersey-servlet:jar:1.19 - https://jersey.java.net/jersey-servlet/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-multipart (com.sun.jersey:jersey-multipart:jar:1.19 - https://jersey.java.net/jersey-multipart/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:jar:1.19 - https://jersey.java.net/jersey-server/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.19 - https://jersey.java.net/jersey-json/) - (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - http://jaxb.java.net/) - (CDDL 1.1) (GPL2 w/ CPE) Java Architecture For XML Binding (javax.xml.bind:jaxb-api:jar:2.2.2 - https://jaxb.dev.java.net/) - (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net) + (CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42 - https://hk2.java.net/external/javax.inject) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - http://jsp.java.net) (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - http://jstl.java.net) @@ -668,13 +667,8 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider (org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net) (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - http://glassfish.org/osgi-resource-locator) (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - http://jcp.org/en/jsr/detail?id=250) - (CDDL 1.1) (GPL2 w/ CPE) HK2 API module (org.glassfish.hk2:hk2-api:jar:2.4.0-b25 - https://hk2.java.net/hk2-api) - (CDDL 1.1) (GPL2 w/ CPE) ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:jar:2.4.0-b25 - https://hk2.java.net/hk2-locator) - (CDDL 1.1) (GPL2 w/ CPE) HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:jar:2.4.0-b25 - https://hk2.java.net/hk2-utils) - (CDDL 1.1) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.4.0-b25 - https://hk2.java.net/external/aopalliance-repackaged) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) - (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.0.1 - http://jax-rs-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) jersey-repackaged-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:bundle:2.19 - https://jersey.java.net/project/project/jersey-guava/) + (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) ************************ Common Development and Distribution License 1.0 http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-c2/minifi-c2-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-assembly/NOTICE b/minifi-c2/minifi-c2-assembly/NOTICE index ba48154..bf1b825 100644 --- a/minifi-c2/minifi-c2-assembly/NOTICE +++ b/minifi-c2/minifi-c2-assembly/NOTICE @@ -1,5 +1,5 @@ Apache NiFi MiNiFi -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -40,7 +40,7 @@ The following binary components are provided under the Apache Software License v and can be found in the org.apache.nifi.util.hive package This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive): - Copyright 2008-2017 The Apache Software Foundation + Copyright 2008-2018 The Apache Software Foundation The derived work is adapted from release-1.2.1/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java and can be found in the org.apache.hadoop.hive.ql.io.orc package @@ -193,7 +193,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO - Copyright 2002-2017 The Apache Software Foundation + Copyright 2002-2018 The Apache Software Foundation (ASLv2) Apache ZooKeeper The following NOTICE information applies: @@ -227,13 +227,32 @@ Common Development and Distribution License 1.1 The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. + (CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - https://jersey.github.io/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) + (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42 - https://hk2.java.net/external/javax.inject) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) - (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.19 - https://jersey.java.net/jersey-json/) - (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - http://jaxb.java.net/) - (CDDL 1.1) (GPL2 w/ CPE) Java Architecture For XML Binding (javax.xml.bind:jaxb-api:jar:2.2.2 - https://jaxb.dev.java.net/) - (CDDL 1.1) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.4.0-b25 - https://hk2.java.net/external/aopalliance-repackaged) - (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/) - (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.19 - https://jersey.java.net/jersey-core/) + (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - http://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - http://jstl.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 (org.glassfish:javax.el:jar:3.0.0 - http://el-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - http://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API (javax.el:javax.el-api:jar:3.0.0 - http://uel-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API (javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:jar:1.2.1 - http://jcp.org/en/jsr/detail?id=52) + (CDDL 1.1) (GPL2 w/ CPE) Java Servlet API (javax.servlet:javax.servlet-api:jar:3.1.0 - http://servlet-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - http://java.net/projects/jms-spec/pages/Home) + (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - http://json-processing-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider (org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - http://glassfish.org/osgi-resource-locator) + (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - http://jcp.org/en/jsr/detail?id=250) + (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) + (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) ************************ http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-docs/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-docs/NOTICE b/minifi-docs/NOTICE index ea46c45..541988b 100644 --- a/minifi-docs/NOTICE +++ b/minifi-docs/NOTICE @@ -1,5 +1,5 @@ minifi-docs -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE index df3fd8a..03df4d3 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-framework-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE index cfbf867..627722c 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE @@ -1,5 +1,5 @@ minifi-resources -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE index 53337de..0b666b2 100644 --- a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-provenance-reporting-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE index 21e07f9..0600287 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-provenance-repository-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/NOTICE index d9e41aa..33e9348 100644 --- a/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-ssl-context-service-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-ssl-context-service-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-standard-nar/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi-nar-bundles/minifi-standard-nar/pom.xml index 464ca42..adf15e2 100644 --- a/minifi-nar-bundles/minifi-standard-nar/pom.xml +++ b/minifi-nar-bundles/minifi-standard-nar/pom.xml @@ -58,7 +58,7 @@ limitations under the License. </dependency> <!-- Manage provided dependencies in lib --> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE index 50e1527..312a504 100644 --- a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-standard-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt) Copyright 2013-2014 Bazaarvoice, Inc @@ -18,7 +18,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE index 336de26..5afd780 100644 --- a/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ minifi-update-attribute-nar -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -29,4 +29,4 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO - Copyright 2002-2017 The Apache Software Foundation + Copyright 2002-2018 The Apache Software Foundation http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/minifi-toolkit/minifi-toolkit-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-assembly/NOTICE b/minifi-toolkit/minifi-toolkit-assembly/NOTICE index ebdfa69..2621631 100644 --- a/minifi-toolkit/minifi-toolkit-assembly/NOTICE +++ b/minifi-toolkit/minifi-toolkit-assembly/NOTICE @@ -1,5 +1,5 @@ Apache NiFi -Copyright 2014-2017 The Apache Software Foundation +Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache NiFi The following NOTICE information applies: Apache NiFi - Copyright 2014-2017 The Apache Software Foundation + Copyright 2014-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -37,7 +37,7 @@ The following binary components are provided under the Apache Software License v and can be found in the org.apache.nifi.util.hive package This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive): - Copyright 2008-2017 The Apache Software Foundation + Copyright 2008-2018 The Apache Software Foundation The derived work is adapted from release-1.2.1/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java and can be found in the org.apache.hadoop.hive.ql.io.orc package @@ -174,7 +174,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO - Copyright 2002-2017 The Apache Software Foundation + Copyright 2002-2018 The Apache Software Foundation (ASLv2) Apache ZooKeeper The following NOTICE information applies: http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/7330d2ac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4daa098..e46e19e 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ limitations under the License. <org.apache.nifi.version>1.5.0</org.apache.nifi.version> <logback.version>1.2.3</logback.version> <jetty.version>9.4.3.v20170317</jetty.version> - <jersey.version>1.19</jersey.version> + <jersey.version>2.26</jersey.version> <yammer.metrics.version>2.2.0</yammer.metrics.version> <spring.version>4.2.4.RELEASE</spring.version> <spring.security.version>4.0.3.RELEASE</spring.security.version> @@ -751,7 +751,7 @@ limitations under the License. <dependency> <groupId>com.sun.jersey.contribs</groupId> <artifactId>jersey-spring</artifactId> - <version>${jersey.version}</version> + <version>1.19.4</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -1072,13 +1072,13 @@ limitations under the License. <version>1.7.7</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> + <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <version>${jersey.version}</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> </dependency> <dependency> @@ -1087,8 +1087,8 @@ limitations under the License. <version>${jersey.version}</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> <version>${jersey.version}</version> </dependency> <dependency>
