You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/04/03 10:59:20 UTC
[1/2] git commit: [OLINGO-175] removed parent's license dependency
Repository: olingo-odata4
Updated Branches:
refs/heads/master aeb66aa82 -> a6817f32f
[OLINGO-175] removed parent's license dependency
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8888b051
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8888b051
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8888b051
Branch: refs/heads/master
Commit: 8888b051bb4844e20e93ad1ed9fc19adaa53b5be
Parents: 809519f
Author: fmartelli <fa...@gmail.com>
Authored: Thu Apr 3 10:58:06 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Apr 3 10:58:06 2014 +0200
----------------------------------------------------------------------
fit/pom.xml | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8888b051/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index b0c1d0a..6e53597 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -100,23 +100,12 @@
<version>${war.maven.plugin.version}</version>
<configuration>
<webResources>
- <!--
- HACK: Include legal files explicity, otherwise they will end up in the wrong path
- or in another jar file in the war.
- -->
<resource>
<directory>${project.build.outputDirectory}</directory>
<includes>
<include>META-INF/DEPENDENCIES*</include>
</includes>
</resource>
- <resource>
- <directory>${basedir}/../</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
</webResources>
<packagingExcludes>WEB-INF/classes/esigate.properties,WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
</configuration>
@@ -163,13 +152,6 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
</resources>
</build>
</project>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by fm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a6817f32
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a6817f32
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a6817f32
Branch: refs/heads/master
Commit: a6817f32f84b3b125ab08088ca859d1518fa340d
Parents: 8888b05 aeb66aa
Author: fmartelli <fa...@gmail.com>
Authored: Thu Apr 3 10:58:54 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Apr 3 10:58:54 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/AbstractServices.java | 14 +---
.../java/org/apache/olingo/fit/V3Services.java | 31 +++++++++
fit/src/main/resources/v3/openTypeMetadata.xml | 67 ++++++++++++++++++++
.../client/core/edm/EdmEntityContainerImpl.java | 13 ++--
.../client/core/edm/EdmEntityTypeImpl.java | 8 +++
.../olingo/client/core/edm/EdmSchemaImpl.java | 47 +++++++++++++-
.../apache/olingo/client/core/uri/URIUtils.java | 7 +-
.../client/core/it/v3/AbstractTestITCase.java | 6 +-
.../client/core/it/v3/OpenTypeTestITCase.java | 17 ++---
.../commons/api/edm/EdmEntityContainer.java | 23 +++++--
.../olingo/commons/api/edm/EdmEntityType.java | 11 +++-
.../olingo/commons/api/edm/EdmSchema.java | 36 ++++++++---
.../core/edm/AbstractEdmEntityContainer.java | 16 ++++-
.../commons/core/edm/AbstractEdmEntityType.java | 7 +-
.../commons/core/edm/AbstractEdmSchemaImpl.java | 26 ++++++++
.../core/edm/provider/EdmEntityTypeImpl.java | 11 +++-
16 files changed, 284 insertions(+), 56 deletions(-)
----------------------------------------------------------------------