[OLINGO-659] Refactor deploy plugin usage

This commit is contained in:
Michael Bolz 2015-09-10 14:39:14 +02:00
parent 93992f9135
commit 649614b076
9 changed files with 89 additions and 4 deletions

View File

@ -134,6 +134,13 @@
<build> <build>
<plugins> <plugins>
<!-- generate dependencies versions that are needed --> <!-- 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> <plugin>
<groupId>org.apache.servicemix.tooling</groupId> <groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId> <artifactId>depends-maven-plugin</artifactId>

View File

@ -35,6 +35,18 @@
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </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> <modules>
<module>pojogen-maven-plugin</module> <module>pojogen-maven-plugin</module>
<module>client-proxy</module> <module>client-proxy</module>

View File

@ -179,6 +179,13 @@
</resources> </resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

View File

@ -46,8 +46,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

View File

@ -77,8 +77,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

View File

@ -51,8 +51,16 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

View File

@ -76,7 +76,13 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>

17
pom.xml
View File

@ -105,6 +105,7 @@
<!-- Project build settings --> <!-- Project build settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.source>1.6</project.build.source> <project.build.source>1.6</project.build.source>
<olingo.deploy.skip>true</olingo.deploy.skip>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -396,6 +397,13 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>${olingo.deploy.skip}</skip>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-remote-resources-plugin</artifactId> <artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
@ -592,8 +600,17 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>apache.deploy</id>
<properties>
<olingo.deploy.skip>false</olingo.deploy.skip>
</properties>
</profile>
<profile> <profile>
<id>apache-release</id> <id>apache-release</id>
<properties>
<olingo.deploy.skip>false</olingo.deploy.skip>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -38,6 +38,18 @@
<module>client</module> <module>client</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles> <profiles>
<profile> <profile>
<id>samples</id> <id>samples</id>