You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/01/28 13:21:14 UTC
[2/3] git commit: [OLINGO-71] Add custom notice files for distribution
[OLINGO-71] Add custom notice files for distribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/58849673
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/58849673
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/58849673
Branch: refs/heads/master
Commit: 58849673f6eeb1817d7c952ef11667989b8a994a
Parents: 058df4e
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jan 28 10:33:41 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jan 28 11:00:00 2014 +0100
----------------------------------------------------------------------
NOTICE | 11 +++--
.../src/main/resources/META-INF/NOTICE | 23 ++++++++++
.../janos/src/main/assembly/janos-assembly.xml | 1 +
odata2-dist/janos/src/main/resources/NOTICE | 14 +++++++
.../jpa/src/main/assembly/jpa-assembly.xml | 1 +
odata2-dist/jpa/src/main/resources/NOTICE | 21 ++++++++++
.../lib/src/main/assembly/lib-assembly.xml | 1 +
odata2-dist/lib/src/main/resources/NOTICE | 14 +++++++
.../ref/src/main/assembly/ref-assembly.xml | 1 +
odata2-dist/ref/src/main/resources/NOTICE | 44 ++++++++++++++++++++
.../jpa-web/src/main/resources/META-INF/NOTICE | 44 ++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 23 ++++++++++
12 files changed, 194 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7aff19d..65d59ef 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,8 @@
-Apache Olingo (Incubating)
- Copyright 2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+Apache Olingo
+Copyright 2013-2014 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/incubator-olingo-odata2/blob/58849673/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/NOTICE b/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..42d6647
--- /dev/null
+++ b/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,23 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
+
+This distribution includes the JAXB Reference Implementation.
+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 JAXB Reference Implementation 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 JAXB Reference Implementation
+web site: http://jaxb.java.net/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/janos/src/main/assembly/janos-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/assembly/janos-assembly.xml b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
index 3536af5..e60d23c 100644
--- a/odata2-dist/janos/src/main/assembly/janos-assembly.xml
+++ b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
@@ -37,6 +37,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/janos/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/resources/NOTICE b/odata2-dist/janos/src/main/resources/NOTICE
new file mode 100644
index 0000000..9b57afe
--- /dev/null
+++ b/odata2-dist/janos/src/main/resources/NOTICE
@@ -0,0 +1,14 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
index b595fa0..1e2e2da 100644
--- a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
+++ b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
@@ -38,6 +38,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/jpa/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/src/main/resources/NOTICE b/odata2-dist/jpa/src/main/resources/NOTICE
new file mode 100644
index 0000000..400c1ef
--- /dev/null
+++ b/odata2-dist/jpa/src/main/resources/NOTICE
@@ -0,0 +1,21 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
+
+This distribution includes the Javax Persistence API.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The Javax Persistence API is dually licensed under the Eclipse Public License v1.0
+and Eclipse Distribution License v. 1.0, and is included in this software
+distribution under the Eclipse Public License v1.0. For details, see the
+Javax Persistence API web site: http://www.eclipse.org/eclipselink
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/assembly/lib-assembly.xml b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
index ab99614..38fb94b 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -35,6 +35,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/lib/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/resources/NOTICE b/odata2-dist/lib/src/main/resources/NOTICE
new file mode 100644
index 0000000..9b57afe
--- /dev/null
+++ b/odata2-dist/lib/src/main/resources/NOTICE
@@ -0,0 +1,14 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/ref/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/assembly/ref-assembly.xml b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
index 1422bd0..699ac78 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -44,6 +44,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-dist/ref/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/resources/NOTICE b/odata2-dist/ref/src/main/resources/NOTICE
new file mode 100644
index 0000000..381f016
--- /dev/null
+++ b/odata2-dist/ref/src/main/resources/NOTICE
@@ -0,0 +1,44 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
+
+This distribution includes the JAXB Reference Implementation.
+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 JAXB Reference Implementation 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 JAXB Reference Implementation
+web site: http://jaxb.java.net/
+
+This distribution includes the SDO API.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The SDO API is dually licensed under the Eclipse Public License v1.0 and
+Eclipse Distribution License v. 1.0, and is included in this software
+distribution under the Eclipse Public License v1.0. For details, see the
+SDO API web site: http://www.eclipse.org/eclipselink
+
+This distribution includes the EclipseLink (non-OSGi) Library.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The EclipseLink (non-OSGi) Library is dually licensed under the
+Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0,
+and is included in this software distribution under the Eclipse Public License v1.0.
+For details, see the EclipseLink web site: http://www.eclipse.org/eclipselink
+
+This distribution includes the Javax Persistence API.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The Javax Persistence API is dually licensed under the Eclipse Public License v1.0
+and Eclipse Distribution License v. 1.0, and is included in this software
+distribution under the Eclipse Public License v1.0. For details, see the
+Javax Persistence API web site: http://www.eclipse.org/eclipselink
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/NOTICE b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..381f016
--- /dev/null
+++ b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,44 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
+
+This distribution includes the JAXB Reference Implementation.
+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 JAXB Reference Implementation 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 JAXB Reference Implementation
+web site: http://jaxb.java.net/
+
+This distribution includes the SDO API.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The SDO API is dually licensed under the Eclipse Public License v1.0 and
+Eclipse Distribution License v. 1.0, and is included in this software
+distribution under the Eclipse Public License v1.0. For details, see the
+SDO API web site: http://www.eclipse.org/eclipselink
+
+This distribution includes the EclipseLink (non-OSGi) Library.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The EclipseLink (non-OSGi) Library is dually licensed under the
+Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0,
+and is included in this software distribution under the Eclipse Public License v1.0.
+For details, see the EclipseLink web site: http://www.eclipse.org/eclipselink
+
+This distribution includes the Javax Persistence API.
+Copyright(c) 2014 The Eclipse Foundation. All Rights Reserved.
+The Javax Persistence API is dually licensed under the Eclipse Public License v1.0
+and Eclipse Distribution License v. 1.0, and is included in this software
+distribution under the Eclipse Public License v1.0. For details, see the
+Javax Persistence API web site: http://www.eclipse.org/eclipselink
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/58849673/odata2-lib/odata-web/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/src/main/resources/META-INF/NOTICE b/odata2-lib/odata-web/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..42d6647
--- /dev/null
+++ b/odata2-lib/odata-web/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,23 @@
+
+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 Jax-Rs API.
+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 Jax-Rs API web site: http://jax-rs-spec.java.net
+
+This distribution includes the JAXB Reference Implementation.
+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 JAXB Reference Implementation 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 JAXB Reference Implementation
+web site: http://jaxb.java.net/
\ No newline at end of file