Repository: olingo-odata4 Updated Branches: refs/heads/master 825b7db6b -> 6c963396c
[OLINGO-342] Added NOTICE file for distribution Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c8976996 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c8976996 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c8976996 Branch: refs/heads/master Commit: c8976996a8c0025d9ec41c50764a324274a8e848 Parents: 825b7db Author: Michael Bolz <[email protected]> Authored: Fri Sep 19 13:36:56 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Fri Sep 19 13:36:56 2014 +0200 ---------------------------------------------------------------------- .../src/main/assembly/lib-assembly.xml | 1 + dist/android-lib/src/main/resources/NOTICE | 45 ++++++++++++++ .../src/main/assembly/lib-assembly.xml | 13 ++-- dist/client-lib/src/main/resources/NOTICE | 34 +++++++++++ .../src/main/assembly/lib-assembly.xml | 1 + dist/server-lib/src/main/resources/NOTICE | 62 ++++++++++++++++++++ 6 files changed, 150 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/android-lib/src/main/assembly/lib-assembly.xml ---------------------------------------------------------------------- diff --git a/dist/android-lib/src/main/assembly/lib-assembly.xml b/dist/android-lib/src/main/assembly/lib-assembly.xml index eb74830..21ac6cf 100644 --- a/dist/android-lib/src/main/assembly/lib-assembly.xml +++ b/dist/android-lib/src/main/assembly/lib-assembly.xml @@ -46,6 +46,7 @@ <outputDirectory>/</outputDirectory> <excludes> <exclude>LICENSE</exclude> + <exclude>NOTICE</exclude> </excludes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/android-lib/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/dist/android-lib/src/main/resources/NOTICE b/dist/android-lib/src/main/resources/NOTICE new file mode 100644 index 0000000..2dab7ea --- /dev/null +++ b/dist/android-lib/src/main/resources/NOTICE @@ -0,0 +1,45 @@ +Apache Olingo +Copyright 2013-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + +This distribution includes the Jackson JSON processor +Jackson is a high-performance, Free/Open Source JSON processing library. +It was originally written by Tatu Saloranta ([email protected]), and has +been in development since 2007. +It is currently developed by a community of developers, as well as supported +commercially by FasterXML.com. +## Licensing +Jackson core and extension components may licensed under different licenses. +To find the details that apply to this artifact see the accompanying LICENSE file. +For more information, including possible other licensing options, contact +FasterXML.com (http://fasterxml.com). +## Credits +A list of contributors may be found from CREDITS file, which is included +in some artifacts (usually source distributions); but is always available +from the source code management (SCM) system project uses. + + +This distribution includes SLF4J +Copyright (c) 2004-2013 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions. + http://slf4j.org/license.html + + +This distribution includes Sun Java Streaming XML Parser (https://sjsxp.java.net/) +Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. +The Jax-Rs API is dually licensed under the CDDL 1.1 and GPL2 w/ CPE license, +and is included in this software distribution under the CDDL 1.1 license. +For details, see the web site: https://glassfish.java.net/public/CDDL+GPL.html http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/client-lib/src/main/assembly/lib-assembly.xml ---------------------------------------------------------------------- diff --git a/dist/client-lib/src/main/assembly/lib-assembly.xml b/dist/client-lib/src/main/assembly/lib-assembly.xml index 462fb3b..0071d82 100644 --- a/dist/client-lib/src/main/assembly/lib-assembly.xml +++ b/dist/client-lib/src/main/assembly/lib-assembly.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under + the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may + obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to + in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> @@ -37,6 +37,7 @@ <outputDirectory>/</outputDirectory> <excludes> <exclude>LICENSE</exclude> + <exclude>NOTICE</exclude> </excludes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/client-lib/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/dist/client-lib/src/main/resources/NOTICE b/dist/client-lib/src/main/resources/NOTICE new file mode 100644 index 0000000..c21864e --- /dev/null +++ b/dist/client-lib/src/main/resources/NOTICE @@ -0,0 +1,34 @@ +Apache Olingo +Copyright 2013-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This distribution includes the Jackson JSON processor +Jackson is a high-performance, Free/Open Source JSON processing library. +It was originally written by Tatu Saloranta ([email protected]), and has +been in development since 2007. +It is currently developed by a community of developers, as well as supported +commercially by FasterXML.com. +## Licensing +Jackson core and extension components may licensed under different licenses. +To find the details that apply to this artifact see the accompanying LICENSE file. +For more information, including possible other licensing options, contact +FasterXML.com (http://fasterxml.com). +## Credits +A list of contributors may be found from CREDITS file, which is included +in some artifacts (usually source distributions); but is always available +from the source code management (SCM) system project uses. + +This distribution includes SLF4J +Copyright (c) 2004-2013 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions. + http://slf4j.org/license.html http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/server-lib/src/main/assembly/lib-assembly.xml ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/assembly/lib-assembly.xml b/dist/server-lib/src/main/assembly/lib-assembly.xml index ad7b927..5de2340 100644 --- a/dist/server-lib/src/main/assembly/lib-assembly.xml +++ b/dist/server-lib/src/main/assembly/lib-assembly.xml @@ -36,6 +36,7 @@ <outputDirectory>/</outputDirectory> <excludes> <exclude>LICENSE</exclude> + <exclude>NOTICE</exclude> </excludes> </fileSet> <fileSet> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8976996/dist/server-lib/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/resources/NOTICE b/dist/server-lib/src/main/resources/NOTICE new file mode 100644 index 0000000..32a4536 --- /dev/null +++ b/dist/server-lib/src/main/resources/NOTICE @@ -0,0 +1,62 @@ +Apache Olingo +Copyright 2013-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This distribution includes the Jackson JSON processor +Jackson is a high-performance, Free/Open Source JSON processing library. +It was originally written by Tatu Saloranta ([email protected]), and has +been in development since 2007. +It is currently developed by a community of developers, as well as supported +commercially by FasterXML.com. +## Licensing +Jackson core and extension components may licensed under different licenses. +To find the details that apply to this artifact see the accompanying LICENSE file. +For more information, including possible other licensing options, contact +FasterXML.com (http://fasterxml.com). +## Credits +A list of contributors may be found from CREDITS file, which is included +in some artifacts (usually source distributions); but is always available +from the source code management (SCM) system project uses. + +This distribution includes SLF4J +Copyright (c) 2004-2013 QOS.ch + All rights reserved. + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions. + http://slf4j.org/license.html + +This distribution includes TreeLayout Core (http://code.google.com/p/treelayout/) +Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of the abego Software GmbH nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. +(http://treelayout.googlecode.com/files/LICENSE.TXT) + +This distribution includes ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) +Copyright (c) 2012 Terence Parr and Sam Harwell +All rights reserved. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. +Neither the name of the author nor the names of its contributors may be used to +endorse or promote products derived from this software without specific prior written permission. +(http://www.antlr.org/license.html)
