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/09/11 13:33:45 UTC
git commit: [OLINGO-342] Renaming for release
Repository: olingo-odata4
Updated Branches:
refs/heads/OLINGO-342_Release_OData_4.0.0-beta-01 [created] 134a575a1
[OLINGO-342] Renaming for release
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/134a575a
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/134a575a
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/134a575a
Branch: refs/heads/OLINGO-342_Release_OData_4.0.0-beta-01
Commit: 134a575a1762f9ed9d36078e3ed31f2046b0f562
Parents: dff439f
Author: Michael Bolz <mi...@sap.com>
Authored: Thu Sep 11 09:45:50 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Sep 11 12:43:34 2014 +0200
----------------------------------------------------------------------
dist/android-lib/pom.xml | 11 +++++-----
.../src/main/assembly/lib-assembly.xml | 2 +-
dist/client-lib/pom.xml | 19 ++++++++---------
.../src/main/assembly/lib-assembly.xml | 10 ++++-----
dist/javadoc/pom.xml | 10 ++++-----
dist/pom.xml | 5 ++---
dist/server-lib/pom.xml | 17 +++++++--------
.../src/main/assembly/lib-assembly.xml | 22 ++++++++++----------
ext/client-android/pom.xml | 16 +++++++-------
ext/client-proxy/pom.xml | 6 +++---
ext/pojogen-maven-plugin/pom.xml | 4 ++--
.../src/it/exchangeMail/pom.xml | 2 +-
.../src/it/exchangeMailNoBasePkg/pom.xml | 2 +-
.../src/it/v3Sample/pom.xml | 2 +-
.../src/it/v4Sample/pom.xml | 2 +-
ext/pom.xml | 4 ++--
fit/pom.xml | 12 +++++------
fit/src/it/actionOverloadingV3/pom.xml | 2 +-
fit/src/it/demoV4/pom.xml | 2 +-
fit/src/it/openTypeV3/pom.xml | 2 +-
fit/src/it/openTypeV4/pom.xml | 2 +-
fit/src/it/primitiveKeysServiceV3/pom.xml | 2 +-
fit/src/it/staticServiceV3/pom.xml | 2 +-
fit/src/it/staticServiceV4/pom.xml | 2 +-
lib/client-api/pom.xml | 6 +++---
lib/client-core/pom.xml | 8 +++----
lib/commons-api/pom.xml | 4 ++--
lib/commons-core/pom.xml | 6 +++---
lib/pom.xml | 4 ++--
lib/server-api/pom.xml | 6 +++---
lib/server-core/pom.xml | 8 +++----
lib/server-tecsvc/pom.xml | 12 +++++------
lib/server-test/pom.xml | 8 +++----
pom.xml | 8 +++----
samples/client/pom.xml | 6 +++---
35 files changed, 115 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/android-lib/pom.xml
----------------------------------------------------------------------
diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml
index 8ac3492..443aa84 100644
--- a/dist/android-lib/pom.xml
+++ b/dist/android-lib/pom.xml
@@ -23,21 +23,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist-android-lib</artifactId>
+ <artifactId>odata-dist-android-lib</artifactId>
<packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>Olingo-OData-Client-for-Android</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist</artifactId>
+ <artifactId>odata-dist</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>
-
+ <finalName>${name}-${version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -88,7 +87,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-android</artifactId>
+ <artifactId>odata-client-android</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/android-lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/dist/android-lib/src/main/assembly/lib-assembly.xml b/dist/android-lib/src/main/assembly/lib-assembly.xml
index f64702d..eb74830 100644
--- a/dist/android-lib/src/main/assembly/lib-assembly.xml
+++ b/dist/android-lib/src/main/assembly/lib-assembly.xml
@@ -36,7 +36,7 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-client-android</include>
+ <include>org.apache.olingo:odata-client-android</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/client-lib/pom.xml
----------------------------------------------------------------------
diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml
index db854c1..180a214 100644
--- a/dist/client-lib/pom.xml
+++ b/dist/client-lib/pom.xml
@@ -23,21 +23,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist-client-lib</artifactId>
+ <artifactId>odata-dist-client-lib</artifactId>
<packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>Olingo-OData-Client-for-Java</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist</artifactId>
+ <artifactId>odata-dist</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>
-
+ <finalName>${name}-${version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -88,33 +87,33 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-api</artifactId>
+ <artifactId>odata-client-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-core</artifactId>
+ <artifactId>odata-client-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/client-lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/dist/client-lib/src/main/assembly/lib-assembly.xml b/dist/client-lib/src/main/assembly/lib-assembly.xml
index 874c4c2..462fb3b 100644
--- a/dist/client-lib/src/main/assembly/lib-assembly.xml
+++ b/dist/client-lib/src/main/assembly/lib-assembly.xml
@@ -23,11 +23,11 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-commons-api</include>
- <include>org.apache.olingo:olingo-commons-core</include>
- <include>org.apache.olingo:olingo-client-api</include>
- <include>org.apache.olingo:olingo-client-core</include>
- <include>org.apache.olingo:olingo-client-proxy</include>
+ <include>org.apache.olingo:odata-commons-api</include>
+ <include>org.apache.olingo:odata-commons-core</include>
+ <include>org.apache.olingo:odata-client-api</include>
+ <include>org.apache.olingo:odata-client-core</include>
+ <include>org.apache.olingo:odata-client-proxy</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
index 4120963..4d3cfac 100644
--- a/dist/javadoc/pom.xml
+++ b/dist/javadoc/pom.xml
@@ -23,20 +23,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist-javadoc</artifactId>
+ <artifactId>odata-dist-javadoc</artifactId>
<packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>Olingo-OData-JavaDoc</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist</artifactId>
+ <artifactId>odata-dist</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>
+ <finalName>${name}-${version}</finalName>
<resources>
<resource>
<directory>target/maven-shared-archive-resources</directory>
@@ -55,7 +55,6 @@
</configuration>
</plugin>
</plugins>
-
</build>
<profiles>
@@ -92,5 +91,4 @@
</build>
</profile>
</profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index cb43a29..7c47bf9 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -23,15 +23,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist</artifactId>
+ <artifactId>odata-dist</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/server-lib/pom.xml
----------------------------------------------------------------------
diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml
index 0ea4293..937957a 100644
--- a/dist/server-lib/pom.xml
+++ b/dist/server-lib/pom.xml
@@ -23,21 +23,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist-server-lib</artifactId>
+ <artifactId>odata-dist-server-lib</artifactId>
<packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>Olingo-OData-Server-for-Java</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-dist</artifactId>
+ <artifactId>odata-dist</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>
-
+ <finalName>${name}-${version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -88,26 +87,26 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-api</artifactId>
+ <artifactId>odata-server-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-core</artifactId>
+ <artifactId>odata-server-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/dist/server-lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/dist/server-lib/src/main/assembly/lib-assembly.xml b/dist/server-lib/src/main/assembly/lib-assembly.xml
index dd8fe21..ad7b927 100644
--- a/dist/server-lib/src/main/assembly/lib-assembly.xml
+++ b/dist/server-lib/src/main/assembly/lib-assembly.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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
+<!-- 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. -->
<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">
@@ -17,16 +17,16 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory></outputDirectory>
- <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-commons-api</include>
- <include>org.apache.olingo:olingo-commons-core</include>
- <include>org.apache.olingo:olingo-server-api</include>
- <include>org.apache.olingo:olingo-server-core</include>
+ <include>org.apache.olingo:odata-commons-api</include>
+ <include>org.apache.olingo:odata-commons-core</include>
+ <include>org.apache.olingo:odata-server-api</include>
+ <include>org.apache.olingo:odata-server-core</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/client-android/pom.xml
----------------------------------------------------------------------
diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml
index 51572fd..04aa8f2 100644
--- a/ext/client-android/pom.xml
+++ b/ext/client-android/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-client-android</artifactId>
+ <artifactId>odata-client-android</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-ext</artifactId>
+ <artifactId>odata-ext</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -66,11 +66,11 @@
<configuration>
<artifactSet>
<includes>
- <include>org.apache.olingo:olingo-client-proxy</include>
- <include>org.apache.olingo:olingo-client-core</include>
- <include>org.apache.olingo:olingo-client-api</include>
- <include>org.apache.olingo:olingo-commons-core</include>
- <include>org.apache.olingo:olingo-commons-api</include>
+ <include>org.apache.olingo:odata-client-proxy</include>
+ <include>org.apache.olingo:odata-client-core</include>
+ <include>org.apache.olingo:odata-client-api</include>
+ <include>org.apache.olingo:odata-commons-core</include>
+ <include>org.apache.olingo:odata-commons-api</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.slf4j:slf4j-api</include>
<include>commons-io:commons-io</include>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/client-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml
index 187493d..1606b8d 100644
--- a/ext/client-proxy/pom.xml
+++ b/ext/client-proxy/pom.xml
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>Java client API for OData services: Proxy.</description>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-ext</artifactId>
+ <artifactId>odata-ext</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-core</artifactId>
+ <artifactId>odata-client-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pojogen-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml
index 0446155..19ee2d6 100644
--- a/ext/pojogen-maven-plugin/pom.xml
+++ b/ext/pojogen-maven-plugin/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-ext</artifactId>
+ <artifactId>odata-ext</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
index b918061..8955597 100644
--- a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
index 2cc2fa0..b5441e9 100644
--- a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml b/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml
index bd6b698..14a2f07 100644
--- a/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml
+++ b/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml b/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
index b918061..8955597 100644
--- a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
+++ b/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
index 6286b02..50ec06f 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-ext</artifactId>
+ <artifactId>odata-ext</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 1944f02..7b18ab7 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-fit</artifactId>
+ <artifactId>odata-fit</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,13 +37,13 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
</dependency>
@@ -118,13 +118,13 @@
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-core</artifactId>
+ <artifactId>odata-client-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-tecsvc</artifactId>
+ <artifactId>odata-server-tecsvc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/actionOverloadingV3/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/actionOverloadingV3/pom.xml b/fit/src/it/actionOverloadingV3/pom.xml
index ccafdb0..baaefd9 100644
--- a/fit/src/it/actionOverloadingV3/pom.xml
+++ b/fit/src/it/actionOverloadingV3/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/demoV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/demoV4/pom.xml b/fit/src/it/demoV4/pom.xml
index 9a0b779..1b1b1c2 100644
--- a/fit/src/it/demoV4/pom.xml
+++ b/fit/src/it/demoV4/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/openTypeV3/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/openTypeV3/pom.xml b/fit/src/it/openTypeV3/pom.xml
index 17ea3a3..a554c4e 100644
--- a/fit/src/it/openTypeV3/pom.xml
+++ b/fit/src/it/openTypeV3/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/openTypeV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/openTypeV4/pom.xml b/fit/src/it/openTypeV4/pom.xml
index ae86b86..151b5db 100644
--- a/fit/src/it/openTypeV4/pom.xml
+++ b/fit/src/it/openTypeV4/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/primitiveKeysServiceV3/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/primitiveKeysServiceV3/pom.xml b/fit/src/it/primitiveKeysServiceV3/pom.xml
index fca00e0..c5b4479 100644
--- a/fit/src/it/primitiveKeysServiceV3/pom.xml
+++ b/fit/src/it/primitiveKeysServiceV3/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/staticServiceV3/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/staticServiceV3/pom.xml b/fit/src/it/staticServiceV3/pom.xml
index 5bcbdbf..a95fe6b 100644
--- a/fit/src/it/staticServiceV3/pom.xml
+++ b/fit/src/it/staticServiceV3/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/fit/src/it/staticServiceV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/staticServiceV4/pom.xml b/fit/src/it/staticServiceV4/pom.xml
index a6f7f07..f18a5eb 100644
--- a/fit/src/it/staticServiceV4/pom.xml
+++ b/fit/src/it/staticServiceV4/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<groupId>org.apache.olingo</groupId>
<version>@project.version@</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/client-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index 0f7faa3..57c2fb8 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-client-api</artifactId>
+ <artifactId>odata-client-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/client-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml
index fa202ae..37bf03e 100644
--- a/lib/client-core/pom.xml
+++ b/lib/client-core/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-client-core</artifactId>
+ <artifactId>odata-client-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,12 +37,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-api</artifactId>
+ <artifactId>odata-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/commons-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index 56b0a87..4b3d9a2 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/commons-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index 2d3127b..94a4a9d 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/pom.xml
----------------------------------------------------------------------
diff --git a/lib/pom.xml b/lib/pom.xml
index dc0397d..f099688 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index acabe5a..d54228c 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-server-api</artifactId>
+ <artifactId>odata-server-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/server-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index 70cf3a2..1c96a57 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-server-core</artifactId>
+ <artifactId>odata-server-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,12 +37,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-api</artifactId>
+ <artifactId>odata-server-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/server-tecsvc/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml
index 8cfbfe2..4a4ac5f 100644
--- a/lib/server-tecsvc/pom.xml
+++ b/lib/server-tecsvc/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-server-tecsvc</artifactId>
+ <artifactId>odata-server-tecsvc</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -114,24 +114,24 @@
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-api</artifactId>
+ <artifactId>odata-server-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-core</artifactId>
+ <artifactId>odata-server-core</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-api</artifactId>
+ <artifactId>odata-commons-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-commons-core</artifactId>
+ <artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/lib/server-test/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml
index 367e5b1..4aa3309 100644
--- a/lib/server-test/pom.xml
+++ b/lib/server-test/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-server-test</artifactId>
+ <artifactId>odata-server-test</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-lib</artifactId>
+ <artifactId>odata-lib</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -37,12 +37,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-core</artifactId>
+ <artifactId>odata-server-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-server-tecsvc</artifactId>
+ <artifactId>odata-server-tecsvc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ee072d..dbc9a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>Olingo-OData</name>
<inceptionYear>2013</inceptionYear>
@@ -51,7 +51,7 @@
<mailingLists>
<mailingList>
<name>Apache Olingo Developers Mailinglist</name>
- <archive>http://mail-archives.apache.org/mod_mbox/olingo-dev/</archive>
+ <archive>http://mail-archives.apache.org/mod_mbox/odata-dev/</archive>
<post>mailto:dev@olingo.apache.org</post>
<subscribe>mailto:dev-subscribe@olingo.apache.org</subscribe>
</mailingList>
@@ -291,7 +291,7 @@
<build>
- <finalName>${project.artifactId}-${project.version}</finalName>
+ <finalName>${name}-${project.version}</finalName>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/134a575a/samples/client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/client/pom.xml b/samples/client/pom.xml
index be1a642..3f2d404 100644
--- a/samples/client/pom.xml
+++ b/samples/client/pom.xml
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-client-samples</artifactId>
+ <artifactId>odata-client-samples</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>Olingo client customization samples.</description>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-parent</artifactId>
+ <artifactId>odata-parent</artifactId>
<version>4.0.0-beta-01-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-client-proxy</artifactId>
+ <artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>