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 2014/03/21 10:20:49 UTC
[2/3] git commit: [OLINGO-210] Delete incubating from artifact name
[OLINGO-210] Delete incubating from artifact name
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/96f38266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/96f38266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/96f38266
Branch: refs/heads/master
Commit: 96f38266ff5354980e6b991683dfa83dec6f4bb8
Parents: cfe20cb
Author: Christian Amend <ch...@apache.org>
Authored: Fri Mar 21 09:35:51 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Mar 21 09:35:51 2014 +0100
----------------------------------------------------------------------
DISCLAIMER | 16 ----------------
README | 2 +-
.../annotation-processor-api/pom.xml | 6 +++---
.../annotation-processor-core/pom.xml | 14 +++++++-------
.../annotation-processor-ref/pom.xml | 14 +++++++-------
.../annotation-processor-web/pom.xml | 8 ++++----
odata2-annotation-processor/pom.xml | 4 ++--
odata2-dist/janos/pom.xml | 14 +++++++-------
.../janos/src/main/assembly/janos-assembly.xml | 10 +++++-----
odata2-dist/javadoc/pom.xml | 4 ++--
odata2-dist/jpa/pom.xml | 14 +++++++-------
.../jpa/src/main/assembly/jpa-assembly.xml | 10 +++++-----
odata2-dist/lib/pom.xml | 10 +++++-----
.../lib/src/main/assembly/lib-assembly.xml | 6 +++---
odata2-dist/pom.xml | 4 ++--
odata2-dist/ref/pom.xml | 20 ++++++++++----------
odata2-jpa-processor/jpa-api/pom.xml | 6 +++---
odata2-jpa-processor/jpa-core/pom.xml | 12 ++++++------
.../core/model/JPAEdmAssociationTest.java | 10 +++++-----
odata2-jpa-processor/jpa-ref/pom.xml | 6 +++---
odata2-jpa-processor/jpa-web/pom.xml | 14 +++++++-------
odata2-jpa-processor/pom.xml | 4 ++--
odata2-lib/odata-annotation/pom.xml | 4 ++--
odata2-lib/odata-api/pom.xml | 4 ++--
odata2-lib/odata-core/pom.xml | 8 ++++----
odata2-lib/odata-fit/pom.xml | 16 ++++++++--------
odata2-lib/odata-ref/pom.xml | 10 +++++-----
odata2-lib/odata-testutil/pom.xml | 8 ++++----
odata2-lib/odata-web/pom.xml | 8 ++++----
odata2-lib/pom.xml | 4 ++--
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
.../main/resources/archetype-resources/pom.xml | 10 +++++-----
odata2-sample/cars-jpa-archetype/pom.xml | 4 ++--
.../main/resources/archetype-resources/pom.xml | 10 +++++-----
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
.../main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/pom.xml | 4 ++--
pom.xml | 3 +--
38 files changed, 147 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 05e1815..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,16 +0,0 @@
-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/96f38266/README
----------------------------------------------------------------------
diff --git a/README b/README
index 5b53ce6..222df8b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
==========================
-Apache Olingo (Incubation)
+Apache Olingo
==========================
Apache Olingo is a Java library and extensions around
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-annotation-processor/annotation-processor-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 033166d..a6ad772 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<name>${project.artifactId}</name>
<build>
@@ -77,7 +77,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index c0871b2..57fef32 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -13,13 +13,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-odata2-annotation-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -67,29 +67,29 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 5a1f2a4..12cbfda 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -13,13 +13,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-odata2-annotation-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-ref</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -69,22 +69,22 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -95,7 +95,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-annotation-processor/annotation-processor-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 2075925..54dec5a 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -13,13 +13,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-odata2-annotation-processor-ref-web-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-ref-web</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -75,12 +75,12 @@
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-annotation-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 2b9b17a..2d3f6d8 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -11,13 +11,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index 23a66d3..7093bae 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -10,13 +10,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-odata2-dist-janos-incubating</artifactId>
+ <artifactId>olingo-odata2-dist-janos</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -71,31 +71,31 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/janos/src/main/assembly/janos-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/assembly/janos-assembly.xml b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
index e60d23c..9d5634b 100644
--- a/odata2-dist/janos/src/main/assembly/janos-assembly.xml
+++ b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
@@ -23,11 +23,11 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-odata2-core-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
- <include>org.apache.olingo:olingo-odata2-annotation-processor-api-incubating</include>
- <include>org.apache.olingo:olingo-odata2-annotation-processor-core-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-core</include>
+ <include>org.apache.olingo:olingo-odata2-api</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation</include>
+ <include>org.apache.olingo:olingo-odata2-annotation-processor-api</include>
+ <include>org.apache.olingo:olingo-odata2-annotation-processor-core</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 2f82b64..067961d 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -10,13 +10,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-odata2-dist-javadoc-incubating</artifactId>
+ <artifactId>olingo-odata2-dist-javadoc</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 788fdc3..bbe0002 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -10,13 +10,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-odata2-dist-jpa-incubating</artifactId>
+ <artifactId>olingo-odata2-dist-jpa</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -71,31 +71,31 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
index 1e2e2da..9c0c7b8 100644
--- a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
+++ b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
@@ -23,11 +23,11 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-odata2-core-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
- <include>org.apache.olingo:olingo-odata2-jpa-processor-api-incubating</include>
- <include>org.apache.olingo:olingo-odata2-jpa-processor-core-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-core</include>
+ <include>org.apache.olingo:olingo-odata2-api</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation</include>
+ <include>org.apache.olingo:olingo-odata2-jpa-processor-api</include>
+ <include>org.apache.olingo:olingo-odata2-jpa-processor-core</include>
<include>org.eclipse.persistence:javax.persistence</include>
</includes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index bc4e02f..43d68dd 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -10,13 +10,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-odata2-dist-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-dist-lib</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -71,19 +71,19 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/assembly/lib-assembly.xml b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
index 38fb94b..2b1eb94 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -23,9 +23,9 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>compile</scope>
<includes>
- <include>org.apache.olingo:olingo-odata2-core-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-incubating</include>
- <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-core</include>
+ <include>org.apache.olingo:olingo-odata2-api</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation</include>
</includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index f31d9c3..64b8811 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -10,13 +10,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-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 62fb5ff..2cb869d 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -10,13 +10,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-odata2-dist-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-dist-ref</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <artifactId>olingo-odata2-dist</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -76,42 +76,42 @@
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index d8ca788..bbac006 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>../</relativePath>
</parent>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -84,7 +84,7 @@
<!-- OData Java Library -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index c351821..d0525f9 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>../</relativePath>
</parent>
- <artifactId>olingo-odata2-jpa-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -80,7 +80,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
</dependency>
@@ -98,12 +98,12 @@
<!-- ########################## -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -112,7 +112,7 @@
<!-- ########################## -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
index 8c3b119..186a864 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
@@ -49,19 +49,19 @@ import org.apache.olingo.odata2.jpa.processor.core.mock.model.JPAAttributeMock;
import org.apache.olingo.odata2.jpa.processor.core.mock.model.JPAEdmMockData.SimpleType;
import org.apache.olingo.odata2.jpa.processor.core.mock.model.JPAEdmMockData.SimpleType.SimpleTypeA;
import org.easymock.EasyMock;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
public class JPAEdmAssociationTest extends JPAEdmTestModelView {
- private static JPAEdmAssociation objAssociation = null;
+ private JPAEdmAssociation objAssociation = null;
private static String ASSOCIATION_NAME = "SalesOrderHeader_String";
- private static JPAEdmAssociationTest localView = null;
+ private JPAEdmAssociationTest localView = null;
private static final String PUNIT_NAME = "salesorderprocessing";
private int variant;
- @BeforeClass
- public static void setup() {
+ @Before
+ public void setup() {
localView = new JPAEdmAssociationTest();
objAssociation = new JPAEdmAssociation(localView, localView, localView, 1);
try {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 4d384cf..c806fcf 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>olingo-odata2-jpa-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-ref</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -94,7 +94,7 @@
<!-- OData Annotation Support -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index e92010a..9801d0d 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -10,13 +10,13 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <artifactId>olingo-odata2-jpa-processor-ref-web-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-ref-web</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -68,27 +68,27 @@
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-jpa-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 42522e5..df6e66f 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -11,13 +11,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index aaa23e8..484b72a 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -16,12 +16,12 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<name>${project.artifactId}</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 42908a8..5c9b6c4 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -21,13 +21,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-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 6128d98..9933231 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -21,13 +21,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-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -189,7 +189,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index af54825..ad91faa 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -21,13 +21,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-odata2-fit-incubating</artifactId>
+ <artifactId>olingo-odata2-fit</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -83,7 +83,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/api_dependency</outputDirectory>
<overWrite>true</overWrite>
@@ -101,7 +101,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/core_dependency</outputDirectory>
<overWrite>true</overWrite>
@@ -119,7 +119,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-ref</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/ref_dependency</outputDirectory>
<overWrite>true</overWrite>
@@ -188,17 +188,17 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 7f641ec..82d683f 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -21,13 +21,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-odata2-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-ref</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -76,7 +76,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -87,13 +87,13 @@
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index c84b781..63bacfb 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -13,13 +13,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-odata2-testutil-incubating</artifactId>
+ <artifactId>olingo-odata2-testutil</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -53,12 +53,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index b37811a..3b1ce26 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -10,13 +10,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-odata2-ref-web-incubating</artifactId>
+ <artifactId>olingo-odata2-ref-web</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
@@ -69,12 +69,12 @@
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-ref-incubating</artifactId>
+ <artifactId>olingo-odata2-ref</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index a449ac5..e574903 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -11,13 +11,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-lib-incubating</artifactId>
+ <artifactId>olingo-odata2-lib</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-annotation-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index f35c2b2..c5ad861 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -14,14 +14,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-sample-cars-annotation-archetype-incubating</artifactId>
+ <artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
<version>1.2.0-RC02</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-sample-incubating</artifactId>
+ <artifactId>olingo-odata2-sample</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index b1e5460..c152975 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -95,29 +95,29 @@
<!-- Apache Olingo Library dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${version.olingo}</version>
</dependency>
<dependency>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<groupId>org.apache.olingo</groupId>
<type>jar</type>
<version>${version.olingo}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${version.olingo}</version>
</dependency>
<!-- Apache Olingo Annotation Processor Extension dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-api</artifactId>
<version>${version.olingo}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-annotation-processor-core</artifactId>
<version>${version.olingo}</version>
</dependency>
<!-- Additional dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-jpa-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index f8d69f2..4a96b26 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-sample-incubating</artifactId>
+ <artifactId>olingo-odata2-sample</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>olingo-odata2-sample-cars-jpa-archetype-incubating</artifactId>
+ <artifactId>olingo-odata2-sample-cars-jpa-archetype</artifactId>
<name>${project.artifactId}</name>
<packaging>maven-archetype</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
index 3af001e..6369839 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
@@ -30,31 +30,31 @@
<!-- OData Annotation Support -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <artifactId>olingo-odata2-api-annotation</artifactId>
<version>${version.olingo}</version>
</dependency>
<!--OData Core Support -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-api-incubating</artifactId>
+ <artifactId>olingo-odata2-api</artifactId>
<version>${version.olingo}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${version.olingo}</version>
</dependency>
<!--OData JPA Processor Support -->
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-api-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${version.olingo}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-jpa-processor-core-incubating</artifactId>
+ <artifactId>olingo-odata2-jpa-processor-core</artifactId>
<version>${version.olingo}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-service-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 877ec04..a548807 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-sample-cars-service-archetype-incubating</artifactId>
+ <artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
<version>1.2.0-RC02</version>
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-sample-incubating</artifactId>
+ <artifactId>olingo-odata2-sample</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index ddaa73d..161df3f 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -73,7 +73,7 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-core-incubating</artifactId>
+ <artifactId>olingo-odata2-core</artifactId>
<version>${version.olingo}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/odata2-sample/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index 4279e14..ec5db93 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -8,13 +8,13 @@
the License. --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-odata2-sample-incubating</artifactId>
+ <artifactId>olingo-odata2-sample</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/96f38266/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c235bf..9d68eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <artifactId>olingo-odata2-parent</artifactId>
<version>1.2.0-RC02</version>
<packaging>pom</packaging>
@@ -256,7 +256,6 @@
</properties>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
</resourceBundles>
</configuration>
</execution>