Repository: olingo-odata4 Updated Branches: refs/heads/master 93992f913 -> 9ffe4c892
[OLINGO-659] Refactor deploy plugin usage Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/649614b0 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/649614b0 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/649614b0 Branch: refs/heads/master Commit: 649614b07629c4d8467aa4e9ca75ce91a2ed5885 Parents: 93992f9 Author: Michael Bolz <[email protected]> Authored: Thu Sep 10 14:39:14 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Thu Sep 10 14:49:39 2015 +0200 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/ext/karaf/karaf-fit/pom.xml ---------------------------------------------------------------------- diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml index 4cd50c1..3dda110 100644 --- a/ext/karaf/karaf-fit/pom.xml +++ b/ext/karaf/karaf-fit/pom.xml @@ -135,6 +135,13 @@ <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> <version>1.2</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/ext/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pom.xml b/ext/pom.xml index 92a4bc2..3c36e18 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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index 41fe4c2..bb6bfa8 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -181,6 +181,13 @@ <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> <configuration> <includes> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/lib/commons-api/pom.xml ---------------------------------------------------------------------- diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index 47a411a..d8f7e64 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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/lib/commons-core/pom.xml ---------------------------------------------------------------------- diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index 8b464a8..004ae63 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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/lib/server-api/pom.xml ---------------------------------------------------------------------- diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml index 0d636f0..045b81d 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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/lib/server-core/pom.xml ---------------------------------------------------------------------- diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml index 6d9c70f..81a9538 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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6b2359b..b487888 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> @@ -397,6 +398,13 @@ </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> <dependencies> @@ -593,7 +601,16 @@ <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> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/649614b0/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index c582e37..e0a83f7 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>
