You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/11/12 06:34:38 UTC
[08/40] git commit: [OLINGO-33] - fix minor license issue
[OLINGO-33] - fix minor license issue
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/0587689b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/0587689b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/0587689b
Branch: refs/heads/PocEdmAnnotationsExtension
Commit: 0587689b33c2c0a4c2b08ea17c034d1722374373
Parents: 7199fc3
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Oct 17 17:03:00 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Oct 17 17:03:00 2013 +0200
----------------------------------------------------------------------
odata2-dist/jpa/src/main/assembly/jpa-assembly.xml | 1 +
odata2-dist/jpa/src/main/resources/NOTICE | 5 +++++
odata2-dist/lib/src/main/assembly/lib-assembly.xml | 3 ++-
odata2-dist/lib/src/main/resources/NOTICE | 5 +++++
odata2-dist/ref/src/main/assembly/ref-assembly.xml | 1 +
odata2-dist/ref/src/main/resources/NOTICE | 5 +++++
6 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/0587689b/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..0551feb 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/0587689b/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..7aff19d
--- /dev/null
+++ b/odata2-dist/jpa/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Olingo (Incubating)
+ Copyright 2013 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/0587689b/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 970a9f4..1bd91a9 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -37,7 +37,8 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
- </excludes>
+ <exclude>NOTICE</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/0587689b/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..7aff19d
--- /dev/null
+++ b/odata2-dist/lib/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Olingo (Incubating)
+ Copyright 2013 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/0587689b/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 27c2947..2409375 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -36,6 +36,7 @@
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
<excludes>
+ <exclude>NOTICE</exclude>
<exclude>LICENSE</exclude>
</excludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/0587689b/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..7aff19d
--- /dev/null
+++ b/odata2-dist/ref/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Olingo (Incubating)
+ Copyright 2013 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).