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/01/27 16:35:24 UTC
[2/3] git commit: [OLINGO-71] Improve Notice files and Rat check
[OLINGO-71] Improve Notice files and Rat check
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/f345f5d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/f345f5d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/f345f5d5
Branch: refs/heads/master
Commit: f345f5d55c1c42af70b233e13428e559d8e900d4
Parents: 999d2b6
Author: Christian Amend <ch...@apache.org>
Authored: Mon Jan 27 14:54:22 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Mon Jan 27 16:02:32 2014 +0100
----------------------------------------------------------------------
.../janos/src/main/assembly/janos-assembly.xml | 1 -
odata2-dist/janos/src/main/resources/NOTICE | 5 -
.../jpa/src/main/assembly/jpa-assembly.xml | 1 -
odata2-dist/jpa/src/main/resources/NOTICE | 5 -
.../lib/src/main/assembly/lib-assembly.xml | 1 -
odata2-dist/lib/src/main/resources/NOTICE | 5 -
.../ref/src/main/assembly/ref-assembly.xml | 1 -
odata2-dist/ref/src/main/resources/NOTICE | 5 -
.../META-INF/maven/archetype-metadata.xml | 7 +
.../projects/basic/archetype.properties | 7 +
.../META-INF/maven/archetype-metadata.xml | 7 +
.../projects/basic/archetype.properties | 7 +
pom.xml | 760 +++++++++----------
13 files changed, 407 insertions(+), 405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/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 9abb225..3536af5 100644
--- a/odata2-dist/janos/src/main/assembly/janos-assembly.xml
+++ b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
@@ -37,7 +37,6 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-dist/janos/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/resources/NOTICE b/odata2-dist/janos/src/main/resources/NOTICE
deleted file mode 100644
index 7aff19d..0000000
--- a/odata2-dist/janos/src/main/resources/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Olingo (Incubating)
- Copyright 2013 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/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 0551feb..b595fa0 100644
--- a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
+++ b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
@@ -38,7 +38,6 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-dist/jpa/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/src/main/resources/NOTICE b/odata2-dist/jpa/src/main/resources/NOTICE
deleted file mode 100644
index 7aff19d..0000000
--- a/odata2-dist/jpa/src/main/resources/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Olingo (Incubating)
- Copyright 2013 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/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 115107c..ab99614 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -35,7 +35,6 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
</excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-dist/lib/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/resources/NOTICE b/odata2-dist/lib/src/main/resources/NOTICE
deleted file mode 100644
index 7aff19d..0000000
--- a/odata2-dist/lib/src/main/resources/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Olingo (Incubating)
- Copyright 2013 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-dist/ref/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/assembly/ref-assembly.xml b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
index b875f62..1422bd0 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -43,7 +43,6 @@
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>NOTICE</exclude>
<exclude>LICENSE</exclude>
</excludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-dist/ref/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/resources/NOTICE b/odata2-dist/ref/src/main/resources/NOTICE
deleted file mode 100644
index 7aff19d..0000000
--- a/odata2-dist/ref/src/main/resources/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Olingo (Incubating)
- Copyright 2013 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-sample/cars-annotation-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5a10f46..2ee2313 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,4 +1,11 @@
<?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. -->
<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
name="olingo-odata2-sample-cars-annotation-incubating"
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-sample/cars-annotation-archetype/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/src/test/resources/projects/basic/archetype.properties b/odata2-sample/cars-annotation-archetype/src/test/resources/projects/basic/archetype.properties
index 5bb9a2b..276eec4 100644
--- a/odata2-sample/cars-annotation-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/odata2-sample/cars-annotation-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,11 @@
#Thu Jan 09 06:21:45 CET 2014
+# 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.
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-sample/cars-service-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/odata2-sample/cars-service-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6a4f0ae..c45b09e 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,4 +1,11 @@
<?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. -->
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="olingo-odata2-sample-cars-service-incubating"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/odata2-sample/cars-service-archetype/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/src/test/resources/projects/basic/archetype.properties b/odata2-sample/cars-service-archetype/src/test/resources/projects/basic/archetype.properties
index ac7b438..d29e092 100644
--- a/odata2-sample/cars-service-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/odata2-sample/cars-service-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,11 @@
#Tue Oct 29 12:59:58 CET 2013
+# 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.
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f345f5d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dad4163..ef6641a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,45 +8,45 @@
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>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
- <packaging>pom</packaging>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-parent-incubating</artifactId>
+ <version>1.1.0-RC02</version>
+ <packaging>pom</packaging>
- <name>${project.artifactId}</name>
+ <name>${project.artifactId}</name>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
- </parent>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ </parent>
- <inceptionYear>2013</inceptionYear>
+ <inceptionYear>2013</inceptionYear>
- <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>
+ <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>
+ <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>
+ <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>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javadoc.phase>package</javadoc.phase>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <javadoc.phase>package</javadoc.phase>
<!-- required for correct Sonar coverage data reporting (list of artifactIds) -->
<projectsToInstrument>org.apache.olingo.odata2.api,org.apache.olingo.odata2.core,org.apache.olingo.odata2.ref</projectsToInstrument>
@@ -64,363 +64,361 @@
<commonslang.version>3.1</commonslang.version>
<gson.version>2.2.2</gson.version>
- <antlr.version>3.4</antlr.version>
+ <antlr.version>3.4</antlr.version>
- <mockito.version>1.9.0</mockito.version>
- <junit.version>4.10</junit.version>
- <xmlunit.version>1.3</xmlunit.version>
+ <mockito.version>1.9.0</mockito.version>
+ <junit.version>4.10</junit.version>
+ <xmlunit.version>1.3</xmlunit.version>
- <version.eclipselink>2.5.1</version.eclipselink>
- <version.javax.persistence>2.0.5</version.javax.persistence>
- </properties>
+ <version.eclipselink>2.5.1</version.eclipselink>
+ <version.javax.persistence>2.0.5</version.javax.persistence>
+ </properties>
- <modules>
- <module>odata2-lib</module>
- <module>odata2-jpa-processor</module>
- <module>odata2-annotation-processor</module>
- <module>odata2-dist</module>
- <module>odata2-sample</module>
- </modules>
+ <modules>
+ <module>odata2-lib</module>
+ <module>odata2-jpa-processor</module>
+ <module>odata2-annotation-processor</module>
+ <module>odata2-dist</module>
+ <module>odata2-sample</module>
+ </modules>
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
+ <build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.9</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>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>${antlr.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <revisionOnScmFailure>?</revisionOnScmFailure>
- <timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
- </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>
- <excludes>**/archetype-resources/**/*</excludes>
- </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>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>org/apache/olingo/odata2/**/api/**/*.class</exclude>
- <exclude>org/apache/olingo/odata2/**/ref/**/*.class</exclude>
- <exclude>org/apache/olingo/odata2/**/testutil/**/*.class</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.9</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>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>${antlr.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ </plugin>
+ <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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>?</revisionOnScmFailure>
+ <timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>
+ </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>
+ <excludes>**/archetype-resources/**/*</excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <projectName>Apache Olingo</projectName>
+ </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>
+ </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>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <instrumentation>
+ <excludes>
+ <exclude>org/apache/olingo/odata2/**/api/**/*.class</exclude>
+ <exclude>org/apache/olingo/odata2/**/ref/**/*.class</exclude>
+ <exclude>org/apache/olingo/odata2/**/testutil/**/*.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>build.fast</id>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <javadoc.phase></javadoc.phase>
- </properties>
- </profile>
- <profile>
- <id>build.default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <defaultGoal>clean install</defaultGoal>
- </build>
- </profile>
- <profile>
- <id>build.quality</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <failOnViolation>true</failOnViolation>
- <violationSeverity>error</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>rat</goal>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/MANIFEST.MF</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.git/**</exclude>
- <exclude>bin/**</exclude>
- <exclude>**/*.project</exclude>
- <exclude>**/*.classpath</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.batch</exclude>
- <exclude>**/NOTICE</exclude>
- <exclude>**/DEPENDENCIES</exclude>
- <exclude>**/archetype-resources/**</exclude>
- <exclude>**/archetype-metadata.xml</exclude>
- <exclude>**/archetype.properties</exclude>
- <exclude>**/nb-configuration.xml</exclude>
- <exclude>**/glassfish-web.xml</exclude>
- <exclude>**/*.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc-jar</id>
- <phase>${javadoc.phase}</phase>
- <goals>
- <goal>aggregate-jar</goal>
- </goals>
- <configuration>
- <tags>
- <tag>
- <name>org.apache.olingo.odata2.DoNotImplement</name>
- <placement>a</placement>
- <head>Do not implement this interface or derive from class.</head>
- </tag>
- </tags>
- <excludePackageNames>
+ <profiles>
+ <profile>
+ <id>build.fast</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <javadoc.phase/>
+ </properties>
+ </profile>
+ <profile>
+ <id>build.default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>clean install</defaultGoal>
+ </build>
+ </profile>
+ <profile>
+ <id>build.quality</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ <violationSeverity>error</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>rat</goal>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>**/MANIFEST.MF</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>**/*.project</exclude>
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.batch</exclude>
+ <exclude>**/NOTICE</exclude>
+ <exclude>**/DEPENDENCIES</exclude>
+ <exclude>**/goal.txt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>${javadoc.phase}</phase>
+ <goals>
+ <goal>aggregate-jar</goal>
+ </goals>
+ <configuration>
+ <tags>
+ <tag>
+ <name>org.apache.olingo.odata2.DoNotImplement</name>
+ <placement>a</placement>
+ <head>Do not implement this interface or derive from class.</head>
+ </tag>
+ </tags>
+ <excludePackageNames>
org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*
- </excludePackageNames>
- <additionalJOptions>
- <additionalJOption>-quiet</additionalJOption>
- </additionalJOptions>
- <groups>
- <group>
- <title>OData Lib</title>
- <packages>org.apache.olingo.odata2.api:org.apache.olingo.odata2.api.*</packages>
- </group>
- <group>
- <title>OData Reference Scenario</title>
- <packages>org.apache.olingo.odata2.ref:org.apache.olingo.odata2.ref.*</packages>
- </group>
- <group>
- <title>OData JPA Processor</title>
- <packages>org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
- </group>
- <group>
- <title>OData Annotation Processor</title>
- <packages>org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
- </group>
- <group>
- <title>OData JPA Reference Scenario</title>
- <packages>org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
- </group>
- <group>
- <title>OData Annotation Reference Scenario</title>
- <packages>org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
- </group>
- </groups>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </excludePackageNames>
+ <additionalJOptions>
+ <additionalJOption>-quiet</additionalJOption>
+ </additionalJOptions>
+ <groups>
+ <group>
+ <title>OData Lib</title>
+ <packages>org.apache.olingo.odata2.api:org.apache.olingo.odata2.api.*</packages>
+ </group>
+ <group>
+ <title>OData Reference Scenario</title>
+ <packages>org.apache.olingo.odata2.ref:org.apache.olingo.odata2.ref.*</packages>
+ </group>
+ <group>
+ <title>OData JPA Processor</title>
+ <packages>org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
+ </group>
+ <group>
+ <title>OData Annotation Processor</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
+ </group>
+ <group>
+ <title>OData JPA Reference Scenario</title>
+ <packages>org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
+ </group>
+ <group>
+ <title>OData Annotation Reference Scenario</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<repositories>
<repository>