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 2013/09/09 06:44:34 UTC
[1/2] git commit: [JPA:] Changes to POM.xml of JPA Ref
Updated Branches:
refs/heads/master c631f168c -> 5457e7739
[JPA:] Changes to POM.xml of JPA Ref
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/d3c1691c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/d3c1691c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/d3c1691c
Branch: refs/heads/master
Commit: d3c1691c12b092b989868a83b9ac308d939c536d
Parents: b7e9f39
Author: Chandan V A <ch...@sap.com>
Authored: Mon Sep 9 10:11:31 2013 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Mon Sep 9 10:11:31 2013 +0530
----------------------------------------------------------------------
jpa-ref/pom.xml | 49 ++++++++++++++++++++++++++++++++++-
jpa-web/pom.xml | 73 ++++++++++++++++++++++++----------------------------
2 files changed, 81 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d3c1691c/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-ref/pom.xml b/jpa-ref/pom.xml
index 9148258..c9068f8 100644
--- a/jpa-ref/pom.xml
+++ b/jpa-ref/pom.xml
@@ -32,7 +32,54 @@
<artifactId>jpa.processor.ref</artifactId>
<packaging>jar</packaging>
<name>${project.groupId}-${project.artifactId}</name>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.olingo.odata2.jpa.processor.ref.factory;version=${project.version},
+ </Export-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- JPA Support -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d3c1691c/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-web/pom.xml b/jpa-web/pom.xml
index 9c81ef7..8e806f7 100644
--- a/jpa-web/pom.xml
+++ b/jpa-web/pom.xml
@@ -1,22 +1,14 @@
<?xml version="1.0"?>
-<!--
- 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.
--->
+<!-- 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. -->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -46,20 +38,22 @@
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>com.sap.research</groupId>
- <artifactId>nwcloud-maven-plugin</artifactId>
- <version>1.0.0.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.sap.research</groupId>
+ <artifactId>nwcloud-maven-plugin</artifactId>
+ <version>1.0.0.RELEASE</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
@@ -78,20 +72,15 @@
</dependency>
<dependency>
<groupId>org.apache.olingo.odata2</groupId>
- <artifactId>ref</artifactId>
+ <artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.odata2</groupId>
- <artifactId>core</artifactId>
+ <artifactId>api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.olingo.odata2</groupId>
<artifactId>jpa.processor.api</artifactId>
<version>${project.version}</version>
@@ -107,6 +96,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -117,7 +111,6 @@
<profiles>
<profile>
<id>dev</id>
-
<build>
<defaultGoal>cargo:run</defaultGoal>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2
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/5457e773
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/5457e773
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/5457e773
Branch: refs/heads/master
Commit: 5457e77396852d1c424c9cb11fd7f5b2d72491a7
Parents: d3c1691 c631f16
Author: Chandan V A <ch...@sap.com>
Authored: Mon Sep 9 10:12:07 2013 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Mon Sep 9 10:12:07 2013 +0530
----------------------------------------------------------------------
.../olingo/odata2/core/ContentNegotiator.java | 4 +-
.../olingo/odata2/core/ODataRequestHandler.java | 2 +-
.../odata2/core/batch/BatchRequestParser.java | 11 ++-
.../olingo/odata2/core/commons/ContentType.java | 93 ++++++++++++++++++--
.../odata2/core/ep/ProviderFacadeImpl.java | 2 +-
.../olingo/odata2/core/rest/RestUtil.java | 7 +-
.../core/batch/BatchRequestParserTest.java | 18 ++--
.../odata2/core/commons/ContentTypeTest.java | 87 +++++++++++++++---
8 files changed, 185 insertions(+), 39 deletions(-)
----------------------------------------------------------------------