From 649614b07629c4d8467aa4e9ca75ce91a2ed5885 Mon Sep 17 00:00:00 2001
From: Michael Bolz <michael.bolz@sap.com>
Date: Thu, 10 Sep 2015 14:39:14 +0200
Subject: [PATCH] [OLINGO-659] Refactor deploy plugin usage

---
 ext/karaf/karaf-fit/pom.xml |  7 +++++++
 ext/pom.xml                 | 12 ++++++++++++
 fit/pom.xml                 |  7 +++++++
 lib/commons-api/pom.xml     | 10 +++++++++-
 lib/commons-core/pom.xml    | 10 +++++++++-
 lib/server-api/pom.xml      | 10 +++++++++-
 lib/server-core/pom.xml     |  8 +++++++-
 pom.xml                     | 17 +++++++++++++++++
 samples/pom.xml             | 12 ++++++++++++
 9 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml
index 4cd50c159..3dda11074 100644
--- a/ext/karaf/karaf-fit/pom.xml
+++ b/ext/karaf/karaf-fit/pom.xml
@@ -134,6 +134,13 @@
   <build>
     <plugins>
       <!-- generate dependencies versions that are needed -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
diff --git a/ext/pom.xml b/ext/pom.xml
index 92a4bc2af..3c36e184c 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -35,6 +35,18 @@
     <relativePath>..</relativePath>
   </parent>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>${olingo.deploy.skip}</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <modules>
     <module>pojogen-maven-plugin</module>
     <module>client-proxy</module>
diff --git a/fit/pom.xml b/fit/pom.xml
index 41fe4c2dd..bb6bfa879 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -179,6 +179,13 @@
     </resources>
 
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index 47a411ada..d8f7e64e9 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -46,12 +46,20 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-		<version>${maven.bundle.plugin.version}</version>
+    		<version>${maven.bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index 8b464a8d1..004ae6362 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -77,12 +77,20 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-		<version>${maven.bundle.plugin.version}</version>
+    		<version>${maven.bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index 0d636f0dc..045b81d0c 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -51,12 +51,20 @@
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-		<version>${maven.bundle.plugin.version}</version>
+    		<version>${maven.bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index 6d9c70f46..81a9538b5 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -76,7 +76,13 @@
 
   <build>
     <plugins>
-
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6b2359bc3..b487888f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
     <!-- Project build settings -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.source>1.6</project.build.source>
+    <olingo.deploy.skip>true</olingo.deploy.skip>
   </properties>
 
   <dependencyManagement>
@@ -396,6 +397,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>${olingo.deploy.skip}</skip>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <version>1.5</version>
@@ -592,8 +600,17 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>apache.deploy</id>
+      <properties>
+        <olingo.deploy.skip>false</olingo.deploy.skip>
+      </properties>
+    </profile>
     <profile>
       <id>apache-release</id>
+      <properties>
+        <olingo.deploy.skip>false</olingo.deploy.skip>
+      </properties>
       <build>
         <plugins>
           <plugin>
diff --git a/samples/pom.xml b/samples/pom.xml
index c582e3767..e0a83f725 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -38,6 +38,18 @@
     <module>client</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>samples</id>