You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/02/19 11:47:58 UTC
[1/3] git commit: Ignoring NB stuff
Repository: incubator-olingo-odata4
Updated Branches:
refs/heads/master d64e868fb -> 30ca8f01a
Ignoring NB stuff
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/4aa69c29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/4aa69c29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/4aa69c29
Branch: refs/heads/master
Commit: 4aa69c298b86388ccbf9d84ae5e6a7c47abb739b
Parents: d64e868
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Feb 19 11:33:11 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Feb 19 11:33:11 2014 +0100
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/4aa69c29/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 147d7b1..2095344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ bin
classes
.DS_Store
*.local
+nb-configuration.xml
[3/3] git commit: [OLINGO-161] ref and fit POM files still
referencing 'producer' and 'consumer'
Posted by il...@apache.org.
[OLINGO-161] ref and fit POM files still referencing 'producer' and 'consumer'
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/30ca8f01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/30ca8f01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/30ca8f01
Branch: refs/heads/master
Commit: 30ca8f01a353ba10d53e825fbf82c3b976fdc426
Parents: 7e7af84
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Feb 19 11:47:44 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Feb 19 11:47:44 2014 +0100
----------------------------------------------------------------------
odata4-lib/odata4-fit/pom.xml | 4 ++--
odata4-lib/odata4-ref/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/30ca8f01/odata4-lib/odata4-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-fit/pom.xml b/odata4-lib/odata4-fit/pom.xml
index 73a5494..1bc9ad7 100644
--- a/odata4-lib/odata4-fit/pom.xml
+++ b/odata4-lib/odata4-fit/pom.xml
@@ -36,12 +36,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata4-producer-core-incubating</artifactId>
+ <artifactId>olingo-odata4-server-core-incubating</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata4-consumer-core-incubating</artifactId>
+ <artifactId>olingo-odata4-client-core-incubating</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/30ca8f01/odata4-lib/odata4-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-ref/pom.xml b/odata4-lib/odata4-ref/pom.xml
index 97b0a45..d57f322 100644
--- a/odata4-lib/odata4-ref/pom.xml
+++ b/odata4-lib/odata4-ref/pom.xml
@@ -37,12 +37,12 @@
<dependencies>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata4-producer-api-incubating</artifactId>
+ <artifactId>olingo-odata4-server-api-incubating</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata4-consumer-api-incubating</artifactId>
+ <artifactId>olingo-odata4-client-api-incubating</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
[2/3] git commit: Reformatting and adding ignore for NB stuff in RAT
config
Posted by il...@apache.org.
Reformatting and adding ignore for NB stuff in RAT config
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/7e7af845
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/7e7af845
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/7e7af845
Branch: refs/heads/master
Commit: 7e7af845a450e8c2bf5f76128f4d10d5e98355e3
Parents: 4aa69c2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Feb 19 11:46:22 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Feb 19 11:46:22 2014 +0100
----------------------------------------------------------------------
pom.xml | 411 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 211 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/7e7af845/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 28b8ad1..ec5487f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,203 +1,214 @@
<?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>
-
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata4-parent-incubating</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>${project.artifactId}</name>
-
- <inceptionYear>2013</inceptionYear>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
- </parent>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <url>http://olingo.incubator.apache.org</url>
-
- <mailingLists>
- <mailingList>
- <name>Apache Olingo Developers Mailinglist</name>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-olingo-dev/</archive>
- <post>mailto:dev@olingo.incubator.apache.org</post>
- <subscribe>mailto:dev-subscribe@olingo.incubator.apache.org</subscribe>
- </mailingList>
- </mailingLists>
-
- <modules>
- <module>odata4-lib</module>
- </modules>
-
- <properties>
- <antlr.version>4.1</antlr.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.9</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-runtime</artifactId>
- <version>${antlr.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.10</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <addGroupIdToProjectName>true</addGroupIdToProjectName>
- <addVersionToProjectName>true</addVersionToProjectName>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputFileFormat>xml</outputFileFormat>
- <consoleOutput>true</consoleOutput>
- <enableRSS>false</enableRSS>
- <linkXRef>false</linkXRef>
- <configLocation>src/checkstyle/config.xml</configLocation>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- <encoding>UTF-8</encoding>
- <failOnViolation>true</failOnViolation>
- <violationSeverity>warning</violationSeverity>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>rat-check</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/META-INF/services/*</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.ini</exclude>
- <exclude>**/MANIFEST.MF</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.git/**</exclude>
- <exclude>bin/**</exclude>
- <exclude>**/*.local</exclude>
- <exclude>**/*.project</exclude>
- <exclude>**/*.classpath</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.batch</exclude>
- <exclude>**/NOTICE</exclude>
- <exclude>**/DEPENDENCIES</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata4-parent-incubating</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>${project.artifactId}</name>
+
+ <inceptionYear>2013</inceptionYear>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ </parent>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <url>http://olingo.incubator.apache.org</url>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache Olingo Developers Mailinglist</name>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-olingo-dev/</archive>
+ <post>mailto:dev@olingo.incubator.apache.org</post>
+ <subscribe>mailto:dev-subscribe@olingo.incubator.apache.org</subscribe>
+ </mailingList>
+ </mailingLists>
+
+ <modules>
+ <module>odata4-lib</module>
+ </modules>
+
+ <properties>
+ <antlr.version>4.1</antlr.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ <version>${antlr.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.10</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <addGroupIdToProjectName>true</addGroupIdToProjectName>
+ <addVersionToProjectName>true</addVersionToProjectName>
+ <wtpversion>2.0</wtpversion>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>checkstyle</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputFileFormat>xml</outputFileFormat>
+ <consoleOutput>true</consoleOutput>
+ <enableRSS>false</enableRSS>
+ <linkXRef>false</linkXRef>
+ <configLocation>src/checkstyle/config.xml</configLocation>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <encoding>UTF-8</encoding>
+ <failOnViolation>true</failOnViolation>
+ <violationSeverity>warning</violationSeverity>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rat-check</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>**/META-INF/services/*</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.ini</exclude>
+ <exclude>**/MANIFEST.MF</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>**/*.local</exclude>
+ <exclude>**/*.project</exclude>
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.batch</exclude>
+ <exclude>**/NOTICE</exclude>
+ <exclude>**/DEPENDENCIES</exclude>
+ <exclude>**/nb-configuration.xml</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>