Repository: incubator-edgent Updated Branches: refs/heads/develop cf5580553 -> 465d0761f
- Ensured the distributions are not deployed - Fixed a configuration-issue in the assembly plugin configuration - Removed the "distribution" profile from the "release:perform" step in the documentation Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/465d0761 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/465d0761 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/465d0761 Branch: refs/heads/develop Commit: 465d0761feb7dd8367d5688d9911e8f24b52d356 Parents: cf55805 Author: Christofer Dutz <[email protected]> Authored: Mon Dec 11 10:50:18 2017 +0100 Committer: Christofer Dutz <[email protected]> Committed: Mon Dec 11 10:50:28 2017 +0100 ---------------------------------------------------------------------- distribution/pom.xml | 16 +++++++++++++--- platforms/android/distribution/pom.xml | 14 +++++++++++++- platforms/java7/distribution/pom.xml | 16 +++++++++++++--- src/site/asciidoc/releasing.adoc | 2 +- 4 files changed, 40 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/465d0761/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 6e74dbc..a96e40f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -36,9 +36,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptor>src/assembly/distribution.xml</descriptor> - </configuration> <executions> <execution> <id>create-archive</id> @@ -46,6 +43,11 @@ <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/distribution.xml</descriptor> + </descriptors> + </configuration> </execution> </executions> </plugin> @@ -64,6 +66,14 @@ </execution> </executions> </plugin> + <!-- We don't want to deploy the distributions to Maven --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/465d0761/platforms/android/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index 44bd8e6..dded491 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -37,7 +37,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <descriptor>src/assembly/distribution.xml</descriptor> </configuration> <executions> <execution> @@ -46,6 +45,11 @@ <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/distribution.xml</descriptor> + </descriptors> + </configuration> </execution> </executions> </plugin> @@ -64,6 +68,14 @@ </execution> </executions> </plugin> + <!-- We don't want to deploy the distributions to Maven --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/465d0761/platforms/java7/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml index ab2f332..4b90bb7 100644 --- a/platforms/java7/distribution/pom.xml +++ b/platforms/java7/distribution/pom.xml @@ -36,9 +36,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptor>src/assembly/distribution.xml</descriptor> - </configuration> <executions> <execution> <id>create-archive</id> @@ -46,6 +43,11 @@ <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/distribution.xml</descriptor> + </descriptors> + </configuration> </execution> </executions> </plugin> @@ -64,6 +66,14 @@ </execution> </executions> </plugin> + <!-- We don't want to deploy the distributions to Maven --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/465d0761/src/site/asciidoc/releasing.adoc ---------------------------------------------------------------------- diff --git a/src/site/asciidoc/releasing.adoc b/src/site/asciidoc/releasing.adoc index 3212d83..39ca1ca 100644 --- a/src/site/asciidoc/releasing.adoc +++ b/src/site/asciidoc/releasing.adoc @@ -69,7 +69,7 @@ After changing to the release version, the plugin does a full build with all tes In this phase the previously prepared release is built, tested and deployed to the remote repo configured in the pom. To be 100% sure the build doesn't require any files eventually omitted from source control, the `release:perform` step checks out the previously created tag to a directory `target/checkout` and runs the build there. - mvn release:perform -DreleaseProfiles=platform-android,platform-java7,distribution + mvn release:perform -DreleaseProfiles=platform-android,platform-java7 After this step is successful, all artifacts are located in a so-called `staging repository` at https://repository.apache.org/
