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 2014/03/16 10:06:03 UTC
[14/50] [abbrv] git commit: [OLINGO-117] Merge branch 'master' into
delta
[OLINGO-117] Merge branch 'master' into delta
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/5b4a4594
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/5b4a4594
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/5b4a4594
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 5b4a459424cb6018f47c19d5e127f916e8818546
Parents: b6696a6 7c281ff
Author: Stephan Klevenz <sk...@apache.org>
Authored: Mon Feb 10 10:16:50 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Feb 10 10:24:44 2014 +0100
----------------------------------------------------------------------
NOTICE | 11 +-
.../annotation-processor-ref/pom.xml | 17 +-
.../src/main/resources/META-INF/NOTICE | 23 +
.../janos/src/main/assembly/janos-assembly.xml | 2 +-
odata2-dist/janos/src/main/resources/NOTICE | 17 +-
.../jpa/src/main/assembly/jpa-assembly.xml | 2 +-
odata2-dist/jpa/src/main/resources/NOTICE | 24 +-
.../lib/src/main/assembly/lib-assembly.xml | 2 +-
odata2-dist/lib/src/main/resources/NOTICE | 17 +-
.../ref/src/main/assembly/ref-assembly.xml | 2 +-
odata2-dist/ref/src/main/resources/NOTICE | 47 +-
.../core/ODataJPAResponseBuilderDefault.java | 21 +-
.../core/access/data/JPAEntityParser.java | 36 +-
.../core/ODataJPAResponseBuilderTest.java | 1 +
.../jpa-web/src/main/resources/META-INF/NOTICE | 44 +
odata2-lib/odata-core/pom.xml | 27 +-
odata2-lib/odata-fit/pom.xml | 12 +
.../odata-fit/src/test/resources/log4j.xml | 39 +
odata2-lib/odata-ref/pom.xml | 23 +-
odata2-lib/odata-testutil/pom.xml | 22 +-
.../src/main/resources/META-INF/NOTICE | 23 +
.../META-INF/maven/archetype-metadata.xml | 7 +
.../projects/basic/archetype.properties | 7 +
.../META-INF/maven/archetype-metadata.xml | 7 +
.../projects/basic/archetype.properties | 7 +
pom.xml | 805 +++++++++----------
26 files changed, 768 insertions(+), 477 deletions(-)
----------------------------------------------------------------------