[SYNCOPE-854] Taking care of licensing...
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c9c25c66 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c9c25c66 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c9c25c66 Branch: refs/heads/master Commit: c9c25c669c6c689c0d4ad1fc08334fc17b1f0161 Parents: b0ea2f8 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Sep 1 14:56:08 2016 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Sep 1 14:56:08 2016 +0200 ---------------------------------------------------------------------- deb/enduser/LICENSE | 5 +++++ deb/enduser/NOTICE | 5 +++++ pom.xml | 35 +++++++++++++++++++++++++++-------- standalone/LICENSE | 5 +++++ standalone/NOTICE | 5 +++++ 5 files changed, 47 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c9c25c66/deb/enduser/LICENSE ---------------------------------------------------------------------- diff --git a/deb/enduser/LICENSE b/deb/enduser/LICENSE index 91decd5..9b36e0e 100644 --- a/deb/enduser/LICENSE +++ b/deb/enduser/LICENSE @@ -758,6 +758,11 @@ This is licensed under the MIT license, see above. == +For Bootstrap File Input (http://plugins.krajee.com/file-input): +This is licensed under the BSD license, see above. + +== + For ng-password-strength (https://github.com/subarroca/ng-password-strength): This is licensed under the MIT license, see above. http://git-wip-us.apache.org/repos/asf/syncope/blob/c9c25c66/deb/enduser/NOTICE ---------------------------------------------------------------------- diff --git a/deb/enduser/NOTICE b/deb/enduser/NOTICE index 71a2b40..7bd2008 100644 --- a/deb/enduser/NOTICE +++ b/deb/enduser/NOTICE @@ -127,6 +127,11 @@ Copyright (c) <2014> <pascal.pre...@gmail.com> == +This product includes software developed by the Bootstrap File Input project. +Copyright (c) 2014 - 2016, Kartik Visweswaran Krajee.com All rights reserved. + +== + This product contains unmodified binary redistributions for H2 database engine, which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) or under the (unmodified) EPL 1.0 (Eclipse Public License). http://git-wip-us.apache.org/repos/asf/syncope/blob/c9c25c66/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e4acc4b..4243ee8 100644 --- a/pom.xml +++ b/pom.xml @@ -402,6 +402,7 @@ under the License. <bootstrap.version>3.3.7</bootstrap.version> <bootstrap-select.version>1.7.3</bootstrap-select.version> + <bootstrap-fileinput.version>4.3.4</bootstrap-fileinput.version> <bootbox.version>4.4.0</bootbox.version> <font-awesome.version>4.6.3</font-awesome.version> <ionicons.version>2.0.1</ionicons.version> @@ -420,7 +421,6 @@ under the License. <angular-ui-select.version>0.17.1</angular-ui-select.version> <angular-treasure-overlay-spinner.version>1.1.0</angular-treasure-overlay-spinner.version> <angular-translate.version>2.11.1</angular-translate.version> - <bootstrap-fileinput.version>4.3.4</bootstrap-fileinput.version> <ng-password-strength.version>0.2.1</ng-password-strength.version> <lodash.version>4.15.0</lodash.version> @@ -689,6 +689,16 @@ under the License. <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> <version>${jackson.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -1107,6 +1117,21 @@ under the License. <version>${bootstrap-select.version}</version> </dependency> <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>bootstrap-fileinput</artifactId> + <version>${bootstrap-fileinput.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>jquery</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>bootstrap</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.webjars</groupId> <artifactId>font-awesome</artifactId> <version>${font-awesome.version}</version> @@ -1222,12 +1247,6 @@ under the License. <dependency> <groupId>org.webjars.bower</groupId> - <artifactId>bootstrap-fileinput</artifactId> - <version>${bootstrap-fileinput.version}</version> - </dependency> - - <dependency> - <groupId>org.webjars.bower</groupId> <artifactId>ng-password-strength</artifactId> <version>${ng-password-strength.version}</version> <exclusions> @@ -1456,7 +1475,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> + <version>3.0.0</version> <configuration> <webResources> <resource> http://git-wip-us.apache.org/repos/asf/syncope/blob/c9c25c66/standalone/LICENSE ---------------------------------------------------------------------- diff --git a/standalone/LICENSE b/standalone/LICENSE index f7a5aa0..2be4eb6 100644 --- a/standalone/LICENSE +++ b/standalone/LICENSE @@ -1112,6 +1112,11 @@ This is licensed under the MIT license, see above. == +For Bootstrap File Input (http://plugins.krajee.com/file-input): +This is licensed under the BSD license, see above. + +== + For ng-password-strength (https://github.com/subarroca/ng-password-strength): This is licensed under the MIT license, see above. http://git-wip-us.apache.org/repos/asf/syncope/blob/c9c25c66/standalone/NOTICE ---------------------------------------------------------------------- diff --git a/standalone/NOTICE b/standalone/NOTICE index f6b7fd0..901bb5b 100644 --- a/standalone/NOTICE +++ b/standalone/NOTICE @@ -245,6 +245,11 @@ Copyright (c) <2014> <pascal.pre...@gmail.com> == +This product includes software developed by the Bootstrap File Input project. +Copyright (c) 2014 - 2016, Kartik Visweswaran Krajee.com All rights reserved. + +== + This product contains unmodified binary redistributions for H2 database engine, which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) or under the (unmodified) EPL 1.0 (Eclipse Public License).
