Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-772] Set version to 4.1.0-SNAPSHOT

This commit is contained in:
Michael Bolz 2015-09-21 14:46:33 +02:00
parent ca40833b20
commit c9d42e49fa
40 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/android-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/client-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/javadoc/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/server-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/client-android/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

8
ext/client-proxy/pom.xml
View File

@ -27,11 +27,11 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>Java client API for OData services: Proxy.</description>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -44,7 +44,7 @@
<artifactId>odata-client-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -58,7 +58,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

2
ext/karaf/karaf-features/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>

4
ext/karaf/karaf-fit/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
@ -100,7 +100,7 @@
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>

16
ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java
View File

@ -50,18 +50,18 @@ public class CarServiceTest extends OlingoOSGiTestSupport {
public void testServiceStarted() throws Exception {
// check if the bundle is started
assertBundleStarted("org.apache.olingo.odata-server-osgi-sample");
// use the jdk http client to verify the server side
verifyContent(getContent(SERVICE_URL));
verifyContent(getContent(SERVICE_URL + "$metadata"));
verifyContent(getContent(SERVICE_URL + "Cars"));
verifyContent(getContent(SERVICE_URL + "Cars(1)"));
verifyContent(getContent(SERVICE_URL + "Cars(1)/Price"));
}
}
private static void verifyContent(String content) {
// this is currently a simple test to check if there is no error
@ -88,7 +88,7 @@ public class CarServiceTest extends OlingoOSGiTestSupport {
in.close();
}
}
}
@Configuration
@ -96,7 +96,7 @@ public class CarServiceTest extends OlingoOSGiTestSupport {
return new Option[] {
olingoBaseConfig(),
features(olingoUrl, "olingo-server", "olingo-client"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.0.0"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.1.0-SNAPSHOT"),
logLevel(LogLevel.INFO)
};
}

2
ext/karaf/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

16
ext/pojogen-maven-plugin/pom.xml
View File

@ -27,11 +27,11 @@
<packaging>maven-plugin</packaging>
<name>${project.artifactId}</name>
<description>Java client API for OData services: Maven plugin generating POJOs from metadata.</description>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -45,7 +45,7 @@
<artifactId>odata-client-proxy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@ -59,7 +59,7 @@
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@ -69,7 +69,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -102,7 +102,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
@ -129,9 +129,9 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

2
ext/pom.xml
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
fit/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/client-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

10
lib/client-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -45,7 +45,7 @@
<artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -61,9 +61,9 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -97,7 +97,7 @@
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>

4
lib/commons-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>

6
lib/commons-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -44,7 +44,7 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@ -77,7 +77,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>

2
lib/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/server-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

4
lib/server-core-ext/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
@ -109,4 +109,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
</project>

2
lib/server-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/server-tecsvc/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

4
lib/server-test/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@ -71,7 +71,7 @@
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
<build>

2
pom.xml
View File

@ -25,7 +25,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Olingo-OData</name>

4
samples/client/pom.xml
View File

@ -27,11 +27,11 @@
<artifactId>odata-client-sample</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

24
samples/osgi/server/README.txt
View File

@ -86,7 +86,7 @@ To install the required bundles, you can simply install the Karaf olingo-server
The following commands will install the olingo-server feature.
```
feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.0.0/xml/features
feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features
feature:install olingo-server
```
@ -95,16 +95,16 @@ feature:install olingo-server
To install this sample bundle, run the karaf console command.
```
bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.0.0
bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.1.0-SNAPSHOT
```
Shown below is the output from running the above Karaf console commands.
```
karaf@root()> feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.0.0/xml/features
Adding feature url mvn:org.apache.olingo/odata-karaf-features/4.0.0/xml/features
karaf@root()> feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features
Adding feature url mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features
karaf@root()> feature:install olingo-server
karaf@root()> bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.0.0
karaf@root()> bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.1.0-SNAPSHOT
Bundle ID: 109
```
@ -123,16 +123,16 @@ START LEVEL 100 , List Threshold: 50
102 | Active | 50 | 2.4.2 | Jackson-core
103 | Active | 50 | 2.4.2 | Jackson-annotations
104 | Active | 50 | 2.4.2 | jackson-databind
105 | Active | 50 | 4.0.0.RC01 | odata-commons-api
106 | Active | 50 | 4.0.0.RC01 | odata-commons-core
107 | Active | 50 | 4.0.0.RC01 | odata-server-api
108 | Active | 50 | 4.0.0.RC01 | odata-server-core
109 | Active | 80 | 4.0.0.RC01 | odata-server-osgi-sample
105 | Active | 50 | 4.0.0 | odata-commons-api
106 | Active | 50 | 4.0.0 | odata-commons-core
107 | Active | 50 | 4.0.0 | odata-server-api
108 | Active | 50 | 4.0.0 | odata-server-core
109 | Active | 80 | 4.0.0 | odata-server-osgi-sample
karaf@root()> web:list
ID | State | Web-State | Level | Web-ContextPath | Name
-----------------------------------------------------------------------------------------------------
109 | Active | Deployed | 80 | /olingo-cars | odata-server-osgi-sample (4.0.0.RC01)
karaf@root()>
109 | Active | Deployed | 80 | /olingo-cars | odata-server-osgi-sample (4.0.0)
karaf@root()>
```
#### Test this sample

2
samples/osgi/server/pom.xml
View File

@ -30,7 +30,7 @@ under the License.
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

2
samples/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modules>

2
samples/server/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
samples/tutorials/p0_all/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/p1_read/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

10
samples/tutorials/p2_readep/pom.xml
View File

@ -1,8 +1,8 @@
<?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
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->
<project 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -19,7 +19,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/p3_write/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

6
samples/tutorials/p4_navigation/pom.xml
View File

@ -32,10 +32,10 @@
<build>
<finalName>DemoService</finalName>
</build>
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>
@ -76,7 +76,7 @@
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>

2
samples/tutorials/p5_queryoptions-tcs/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p6_queryoptions-es/pom.xml
View File

@ -32,10 +32,10 @@
<build>
<finalName>DemoService</finalName>
</build>
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/p7_queryoptions-o/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/p8_queryoptions-f/pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.0.0</odata.version>
<odata.version>4.1.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.0.0</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>