You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2013/09/26 17:44:10 UTC
[1/4] git commit: Issue OLINGO-25 - make release - fix pom issues
Updated Branches:
refs/heads/master d2c66bdb9 -> d17ba4f8a
Issue OLINGO-25 - make release
- fix pom issues
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/e321e253
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/e321e253
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/e321e253
Branch: refs/heads/master
Commit: e321e2539461d6c5c160fe87cfab726362a48cab
Parents: d2c66bd
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Sep 26 16:38:24 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Sep 26 17:14:48 2013 +0200
----------------------------------------------------------------------
odata2-lib/odata-web/pom.xml | 196 ++++++++--------
.../odata-web/src/main/version/version.html | 3 -
odata2-processor-jpa/jpa-web/pom.xml | 230 +++++++++----------
pom.xml | 55 +++--
4 files changed, 239 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e321e253/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 22a277c..807f6c0 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -1,112 +1,104 @@
<?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 the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
<project 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>
+ 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</artifactId>
- <packaging>war</packaging>
- <name>${project.artifactId}</name>
+ <artifactId>olingo.odata2.ref.web</artifactId>
+ <packaging>war</packaging>
+ <name>${project.artifactId}</name>
- <parent>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.lib</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <build>
- <resources>
- <resource>
- <directory>src/main/version</directory>
- <filtering>true</filtering>
- <targetPath>../${project.build.finalName}/gen</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/version</directory>
+ <filtering>true</filtering>
+ <targetPath>../${project.build.finalName}/gen</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>target/maven-shared-archive-resources</directory>
+ </resource>
+ </resources>
- <plugins>
- <plugin>
- <groupId>com.sap.research</groupId>
- <artifactId>nwcloud-maven-plugin</artifactId>
- <version>1.0.0.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>com.sap.research</groupId>
+ <artifactId>nwcloud-maven-plugin</artifactId>
+ <version>1.0.0.RELEASE</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
- </build>
-
- <dependencies>
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.ref</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <!-- required because of auto detection of web facet 2.5 -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.ref</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
<profiles>
- <profile>
- <id>dev</id>
-
- <build>
- <defaultGoal>cargo:run</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.2</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profile>
+ <id>dev</id>
+
+ <build>
+ <defaultGoal>cargo:run</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.4.2</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e321e253/odata2-lib/odata-web/src/main/version/version.html
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/src/main/version/version.html b/odata2-lib/odata-web/src/main/version/version.html
index 19f938f..6d76d0b 100644
--- a/odata2-lib/odata-web/src/main/version/version.html
+++ b/odata2-lib/odata-web/src/main/version/version.html
@@ -23,8 +23,5 @@
<tr><td>name</td><td>${name}</td></tr>
<tr><td>version</td><td>${version}</td></tr>
<tr><td>timestamp</td><td>${timestamp}</td></tr>
-<tr><td>basedir</td><td>${basedir}</td></tr>
<tr><td>project.build.finalName</td><td>${project.build.finalName}</td></tr>
-<tr><td>build server</td><td>${env.HOSTNAME}</td></tr>
-<tr><td>user</td><td>${env.USER}</td></tr>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e321e253/odata2-processor-jpa/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/pom.xml b/odata2-processor-jpa/jpa-web/pom.xml
index d463af9..be713f3 100644
--- a/odata2-processor-jpa/jpa-web/pom.xml
+++ b/odata2-processor-jpa/jpa-web/pom.xml
@@ -1,127 +1,123 @@
<?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>olingo.odata2.jpa.processor.ref.web</artifactId>
- <packaging>war</packaging>
- <name>${project.artifactId}</name>
+ <artifactId>olingo.odata2.jpa.processor.ref.web</artifactId>
+ <packaging>war</packaging>
+ <name>${project.artifactId}</name>
- <parent>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.processor-jpa</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <build>
- <resources>
- <resource>
- <directory>src/main/version</directory>
- <filtering>true</filtering>
- <targetPath>../${project.build.finalName}/gen</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/version</directory>
+ <filtering>true</filtering>
+ <targetPath>../${project.build.finalName}/gen</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.sap.research</groupId>
- <artifactId>nwcloud-maven-plugin</artifactId>
- <version>1.0.0.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.sap.research</groupId>
+ <artifactId>nwcloud-maven-plugin</artifactId>
+ <version>1.0.0.RELEASE</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- </build>
+ </build>
- <dependencies>
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.jpa.processor.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.jpa.processor.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo.odata2.jpa.processor.ref</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <!-- required because of auto detection of web facet 2.5 -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.jpa.processor.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.jpa.processor.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo.odata2.jpa.processor.ref</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>dev</id>
- <build>
- <defaultGoal>cargo:run</defaultGoal>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <build>
+ <defaultGoal>cargo:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.2</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.4.2</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e321e253/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e11638a..33b59f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
<build>
<finalName>${project.groupId}-${project.artifactId}-${project.version}</finalName>
+
<pluginManagement>
<plugins>
<plugin>
@@ -266,6 +267,36 @@
<violationSeverity>warning</violationSeverity>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <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>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ <includes>
+ <include>META-INF/*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -283,29 +314,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
- <plugins>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>${project.build.directory}/maven-shared-archive-resources</directory>
- <includes>
- <include>META-INF/*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
+ <defaultGoal>clean install</defaultGoal>
</build>
</profile>
<profile>
[2/4] git commit: Issue OLINGO-25 - make release - apply copyright
Posted by sk...@apache.org.
Issue OLINGO-25 - make release - apply copyright
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/b87a5848
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b87a5848
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b87a5848
Branch: refs/heads/master
Commit: b87a5848066ddc58f2f3e7c35af45bde9b621315
Parents: e321e25
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Sep 26 17:20:08 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Sep 26 17:20:08 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/DataDeleteSQLs.properties | 19 +++++++++++++++++++
.../src/main/resources/MaterialSQLs.properties | 19 +++++++++++++++++++
.../src/main/resources/NoteSQLs.properties | 19 +++++++++++++++++++
.../main/resources/SQLInsertConfig.properties | 19 +++++++++++++++++++
.../resources/SalesOrderHeaderSQLs.properties | 19 +++++++++++++++++++
.../main/resources/SalesOrderItemSQLs.properties | 19 +++++++++++++++++++
.../src/main/resources/StoreSQLs.properties | 19 +++++++++++++++++++
7 files changed, 133 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/DataDeleteSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/DataDeleteSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/DataDeleteSQLs.properties
index 007c8bb..19f859d 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/DataDeleteSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/DataDeleteSQLs.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
#Config file for deleting the entities. They are deleted in the order provided in the below comma-separated string.
#It is mandatory due to referential constaints.
delete_queries = DELETE FROM T_NOTE,DELETE FROM T_SALESORDERITEM,DELETE FROM T_MATERIAL_T_STORE,DELETE FROM T_MATERIAL,DELETE FROM T_STORE,DELETE FROM T_SALESORDERHEADER
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/MaterialSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/MaterialSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/MaterialSQLs.properties
index 5ddd692..0faf9ce 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/MaterialSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/MaterialSQLs.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
material_query_1 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, PRICE, MEASUREMENT_UNIT) values(111, 'Test_Material_Name_1', 'Test_Type_Code_1', 111.1, 'Dollar');
material_query_2 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, PRICE, MEASUREMENT_UNIT) values(112, 'Test_Material_Name_2', 'Test_Type_Code_2', 112.1, 'Pound');
material_query_3 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, PRICE, MEASUREMENT_UNIT) values(113, 'Test_Material_Name_3', 'Test_Type_Code_3', 113.1, 'Yen');
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/NoteSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/NoteSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/NoteSQLs.properties
index 4025585..347c37a 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/NoteSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/NoteSQLs.properties
@@ -1 +1,20 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
note_query_1 = insert into T_NOTE (SO_ID , text, createdBy, creationDate,creationTime) values(2, 'Test_Note_1', 'CreatedBy_1','2013-01-01 00:00:00','00:00:23');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/SQLInsertConfig.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/SQLInsertConfig.properties b/odata2-processor-jpa/jpa-web/src/main/resources/SQLInsertConfig.properties
index bc70637..915a8e8 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/SQLInsertConfig.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/SQLInsertConfig.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
#This file contains names of file which will contain the SQL statements to be executed by Data generator. Add a file name here and it will be picked up by Generator
#You need to put the file names in order you want to get them called. First Entry will be inserted first.
insert_file_names = SalesOrderHeaderSQLs,StoreSQLs,MaterialSQLs,SalesOrderItemSQLs,NoteSQLs
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderHeaderSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderHeaderSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderHeaderSQLs.properties
index 61296dd..bc3e5a3 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderHeaderSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderHeaderSQLs.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
query1 = insert into T_SALESORDERHEADER (SO_ID, BUYER_ID, BUYER_NAME, CURRENCY_CODE, DELIVERY_STATUS, creationDate, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(20130320170725, 1, 'buyerName_1', 'INR', '01', '2012-11-01 00:01:00', 1, 'Test_Street_Name_1', 'Test_City_1', 'Test_Country_1');
query2 = insert into T_SALESORDERHEADER (SO_ID, BUYER_ID, BUYER_NAME, CURRENCY_CODE, DELIVERY_STATUS, creationDate, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(2, 2, 'buyerName_2', 'USD', '01', '2013-01-02 00:00:00', 2, 'Test_Street_Name_2', 'Test_City_2', 'Test_Country_2');
query3 = insert into T_SALESORDERHEADER (SO_ID, BUYER_ID, BUYER_NAME, CURRENCY_CODE, DELIVERY_STATUS, creationDate, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(3, 3, 'buyerName_3', 'USD', '02', '2013-01-01 14:00:00', 3, 'Test_Street_Name_3', 'Test_City_3', 'Test_Country_3');
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderItemSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderItemSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderItemSQLs.properties
index 1e8288a..46c8655 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderItemSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/SalesOrderItemSQLs.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
line_item_query1 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id ) values(111, 1, 1.1, 1.11, 3, 11);
line_item_query2 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id ) values(112, 1, 1.1, 1.12, 2, 10);
line_item_query3 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id ) values(113, 1, 1.1, 1.13, 3, 9);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b87a5848/odata2-processor-jpa/jpa-web/src/main/resources/StoreSQLs.properties
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/resources/StoreSQLs.properties b/odata2-processor-jpa/jpa-web/src/main/resources/StoreSQLs.properties
index a5cbecb..69af954 100644
--- a/odata2-processor-jpa/jpa-web/src/main/resources/StoreSQLs.properties
+++ b/odata2-processor-jpa/jpa-web/src/main/resources/StoreSQLs.properties
@@ -1,3 +1,22 @@
+#-------------------------------------------------------------------------------
+# 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.
+#-------------------------------------------------------------------------------
+
store_query_1 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(131, 'Test_Store_1', 1, 'Test_Street_Name_1', 'Test_City_1', 'Test_Country_1');
store_query_2 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(132, 'Test_Store_2', 1, 'Test_Street_Name_2', 'Test_City_2', 'Test_Country_2');
store_query_3 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY) values(133, 'Test_Store_3', 1, 'Test_Street_Name_3', 'Test_City_3', 'Test_Country_3');
[3/4] git commit: Issue OLINGO-25 - make release - set version
1.0.0-RC01 2nd try
Posted by sk...@apache.org.
Issue OLINGO-25 - make release - set version 1.0.0-RC01 2nd try
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/606a23bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/606a23bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/606a23bf
Branch: refs/heads/master
Commit: 606a23bf94a7d06d8d690336db1c4fb0f0d3dfe8
Parents: b87a584
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Sep 26 17:27:02 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Sep 26 17:27:02 2013 +0200
----------------------------------------------------------------------
odata2-dist/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-processor-jpa/jpa-api/pom.xml | 2 +-
odata2-processor-jpa/jpa-core/pom.xml | 2 +-
odata2-processor-jpa/jpa-ref/pom.xml | 2 +-
odata2-processor-jpa/jpa-web/pom.xml | 2 +-
odata2-processor-jpa/pom.xml | 2 +-
pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 4c019b5..00906bf 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index d6d70c7..176b9e9 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 574b3a3..835f5b4 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 9c99585..ed95366 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 77372ca..00efe92 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 3b23be2..cb5f38a 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index aa001a8..338161b 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 807f6c0..f07a6bd 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 9dbac2e..a24c7b7 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-processor-jpa/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-api/pom.xml b/odata2-processor-jpa/jpa-api/pom.xml
index 121b2b4..9858ecd 100644
--- a/odata2-processor-jpa/jpa-api/pom.xml
+++ b/odata2-processor-jpa/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-processor-jpa/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-core/pom.xml b/odata2-processor-jpa/jpa-core/pom.xml
index 8d142bb..e8c8e36 100644
--- a/odata2-processor-jpa/jpa-core/pom.xml
+++ b/odata2-processor-jpa/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-processor-jpa/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-ref/pom.xml b/odata2-processor-jpa/jpa-ref/pom.xml
index 604e47d..17621fb 100644
--- a/odata2-processor-jpa/jpa-ref/pom.xml
+++ b/odata2-processor-jpa/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-processor-jpa/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/pom.xml b/odata2-processor-jpa/jpa-web/pom.xml
index be713f3..39f7d85 100644
--- a/odata2-processor-jpa/jpa-web/pom.xml
+++ b/odata2-processor-jpa/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/odata2-processor-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/pom.xml b/odata2-processor-jpa/pom.xml
index 0e5ca7a..4b63385 100644
--- a/odata2-processor-jpa/pom.xml
+++ b/odata2-processor-jpa/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/606a23bf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 33b59f9..3861cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0-RC01</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
[4/4] git commit: Issue OLINGO-25 - make release - set version
1.1.0-SNAPSHOT 2nd try
Posted by sk...@apache.org.
Issue OLINGO-25 - make release - set version 1.1.0-SNAPSHOT 2nd try
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/d17ba4f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/d17ba4f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/d17ba4f8
Branch: refs/heads/master
Commit: d17ba4f8a643e515fa39629fd39311e5be22bf7d
Parents: 606a23b
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Sep 26 17:27:05 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Sep 26 17:27:05 2013 +0200
----------------------------------------------------------------------
odata2-dist/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-processor-jpa/jpa-api/pom.xml | 2 +-
odata2-processor-jpa/jpa-core/pom.xml | 2 +-
odata2-processor-jpa/jpa-ref/pom.xml | 2 +-
odata2-processor-jpa/jpa-web/pom.xml | 2 +-
odata2-processor-jpa/pom.xml | 2 +-
pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 00906bf..4c019b5 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 176b9e9..d6d70c7 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 835f5b4..574b3a3 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index ed95366..9c99585 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 00efe92..77372ca 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index cb5f38a..3b23be2 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 338161b..aa001a8 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index f07a6bd..807f6c0 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.lib</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index a24c7b7..9dbac2e 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-processor-jpa/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-api/pom.xml b/odata2-processor-jpa/jpa-api/pom.xml
index 9858ecd..121b2b4 100644
--- a/odata2-processor-jpa/jpa-api/pom.xml
+++ b/odata2-processor-jpa/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-processor-jpa/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-core/pom.xml b/odata2-processor-jpa/jpa-core/pom.xml
index e8c8e36..8d142bb 100644
--- a/odata2-processor-jpa/jpa-core/pom.xml
+++ b/odata2-processor-jpa/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-processor-jpa/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-ref/pom.xml b/odata2-processor-jpa/jpa-ref/pom.xml
index 17621fb..604e47d 100644
--- a/odata2-processor-jpa/jpa-ref/pom.xml
+++ b/odata2-processor-jpa/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-processor-jpa/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/pom.xml b/odata2-processor-jpa/jpa-web/pom.xml
index 39f7d85..be713f3 100644
--- a/odata2-processor-jpa/jpa-web/pom.xml
+++ b/odata2-processor-jpa/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.processor-jpa</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/odata2-processor-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/pom.xml b/odata2-processor-jpa/pom.xml
index 4b63385..0e5ca7a 100644
--- a/odata2-processor-jpa/pom.xml
+++ b/odata2-processor-jpa/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d17ba4f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3861cfc..33b59f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo.odata2.parent</artifactId>
- <version>1.0.0-RC01</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>