You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2013/09/23 12:48:48 UTC
git commit: Issue OLINGO-18: Add LICENSE, NOTICE and DISCLAIMER
Updated Branches:
refs/heads/master 80c0e6cef -> ba5f1d31c
Issue OLINGO-18: Add LICENSE, NOTICE and DISCLAIMER
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/ba5f1d31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/ba5f1d31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/ba5f1d31
Branch: refs/heads/master
Commit: ba5f1d31ce50a33328fb15a9aa3ca937018524ea
Parents: 80c0e6c
Author: Stephan Klevenz <sk...@apache.org>
Authored: Mon Sep 23 11:27:37 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Sep 23 12:48:36 2013 +0200
----------------------------------------------------------------------
DISCLAIMER | 16 ++++++
README | 43 ++++++++++++++
odata-dist/pom.xml | 4 --
odata-dist/src/main/assembly/src-assembly.xml | 65 ----------------------
4 files changed, 59 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/ba5f1d31/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..05e1815
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,16 @@
+Apache Olingo is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Olingo project you
+can go to the following pages:
+
+http://olingo.incubator.apache.org/
+http://incubator.apache.org/projects/olingo.html
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/ba5f1d31/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..946e5b3
--- /dev/null
+++ b/README
@@ -0,0 +1,43 @@
+=============
+Apache Olingo
+=============
+
+Apache Olingo is a collection of Java libraries, frameworks and tools around
+the OData protocol specification
+
+Apache Olingo supports the specification version
+ - OData 2.0 <http://www.odata.org/documentation/odata-v2-documentation/>
+
+Building Apache Olingo
+======================
+
+You can build Apache Olingo like this:
+
+ mvn clean install
+
+You need Maven 3 with Java 6 (or higher) for the build.
+Set the environment variable MAVEN_OPTS to
+'-Xmx1024m -XX:MaxPermSize=256m' to give Maven more memory.
+
+License (see also package specific LICENSE files)
+=================================================
+
+Collective work: Copyright 2010-2013 The Apache Software Foundation.
+
+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.
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/ba5f1d31/odata-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata-dist/pom.xml b/odata-dist/pom.xml
index d4c0018..9ca7375 100644
--- a/odata-dist/pom.xml
+++ b/odata-dist/pom.xml
@@ -55,7 +55,6 @@
<configuration>
<attach>true</attach>
<appendAssemblyId>true</appendAssemblyId>
-<!-- <finalName>${project.groupId}-${project.artifactId}-${project.version}</finalName> -->
<descriptors>
<descriptor>
src/main/assembly/lib-assembly.xml
@@ -64,9 +63,6 @@
src/main/assembly/jpa-assembly.xml
</descriptor>
<descriptor>
- src/main/assembly/src-assembly.xml
- </descriptor>
- <descriptor>
src/main/assembly/javadoc-assembly.xml
</descriptor>
<descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/ba5f1d31/odata-dist/src/main/assembly/src-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/src-assembly.xml b/odata-dist/src/main/assembly/src-assembly.xml
deleted file mode 100644
index bb8183d..0000000
--- a/odata-dist/src/main/assembly/src-assembly.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Lice nsed 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">
-
- <id>src</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <includes>
- <include>org.apache.olingo.odata2:api</include>
- <include>org.apache.olingo.odata2:core</include>
- <include>org.apache.olingo.odata2:api.annotation</include>
- <include>org.apache.olingo.odata2:ref</include>
- <include>org.apache.olingo.odata2:jpa.processor.api</include>
- <include>org.apache.olingo.odata2:jpa.processor.core</include>
- </includes>
-
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main</directory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-
-
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- <exclude>NOTICE</exclude>
- <exclude>readme.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/src/main/resources</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>DEPENDENCIES</include>
- <include>NOTICE</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>