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/10/17 16:08:53 UTC

git commit: [OLINGO-35] optimize maven build

Updated Branches:
  refs/heads/master b8a4d646a -> 41beff3e7


[OLINGO-35] optimize maven build


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/41beff3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/41beff3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/41beff3e

Branch: refs/heads/master
Commit: 41beff3e7972ba36bca85749a96ac8aa8adcfcbd
Parents: b8a4d64
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Oct 15 10:22:27 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Oct 17 16:07:10 2013 +0200

----------------------------------------------------------------------
 pom.xml | 102 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/41beff3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0bf73f2..a1a4eab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>olingo-odata2-parent-incubating</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    
+
     <name>${project.artifactId}</name>
 
     <parent>
@@ -147,6 +147,11 @@
                     <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>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -206,50 +211,6 @@
                 </configuration>
             </plugin>
             <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.processor.core:org.apache.olingo.odata2.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.processor.api:org.apache.olingo.odata2.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>
-                            </groups>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <executions>
                     <execution>
@@ -369,6 +330,57 @@
                 </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.processor.core:org.apache.olingo.odata2.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.processor.api:org.apache.olingo.odata2.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>
+                                    </groups>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencies>