From 8a128043e868481ed57c957214bbec17509aa01f Mon Sep 17 00:00:00 2001
From: Sergei Ivanov <sergei_ivanov@mail.ru>
Date: Wed, 29 Apr 2015 23:29:26 +0100
Subject: [PATCH] Upgraded maven plugins to the latest version and updated the
 release settings

---
 pom.xml                 | 80 +++++++++++++++++++++++++++++++++++++----
 src/changes/changes.xml |  9 +++++
 2 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71e2be85..4d742e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,10 @@
     <distributionManagement>
         <downloadUrl>https://bintray.com/sergei-ivanov/maven/maven-protoc-plugin/view</downloadUrl>
         <site>
-            <!-- release:perform checks this element to determine whether site-deploy goal needs to be run -->
+            <!--
+                release:perform checks this element to determine whether site-deploy goal needs to be run.
+                The actual site deployment is done by GitHub site-maven-plugin, so the URL here is not used.
+            -->
             <id>gh-pages</id>
             <url>https://github.com/sergei-ivanov/maven-protoc-plugin/tree/gh-pages</url>
         </site>
@@ -153,7 +156,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
@@ -162,6 +165,24 @@
                     <version>2.6</version>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.3</version>
+                    <configuration>
+                        <minmemory>128m</minmemory>
+                        <maxmemory>512m</maxmemory>
+                        <detectLinks>true</detectLinks>
+                        <show>package</show>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
@@ -177,7 +198,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.1</version>
+                    <version>2.5.2</version>
                 </plugin>
 
                 <plugin>
@@ -341,9 +362,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
+                <!-- Override the default release settings from the Super-POM -->
                 <configuration>
-                    <!-- Enforce integration tests during release -->
+                    <!-- Suppress the default release profile from Maven Super-POM -->
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <!-- Release profile that will be activated by release:perform -->
+                    <releaseProfiles>release</releaseProfiles>
+                    <!-- Enforce integration tests during both release:prepare and release:perform -->
                     <arguments>-P run-its</arguments>
+                    <!-- Not used in this project, but included for completeness -->
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
                 </configuration>
             </plugin>
 
@@ -429,7 +457,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.2</version>
+                <version>2.10.3</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>512m</maxmemory>
@@ -458,7 +486,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -488,6 +516,11 @@
 
     <profiles>
         <profile>
+            <!--
+                A separate profile to optionally enable integration tests
+                (beware that they can be very time and resource-consuming).
+                It is forcibly activated when running the release goals.
+            -->
             <id>run-its</id>
             <build>
                 <plugins>
@@ -537,6 +570,41 @@
                 </plugins>
             </reporting>
         </profile>
+
+        <profile>
+            <!--
+               A separate set of executions to be performed when running the release goals.
+           -->
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <!--
+                                Explicitly disable updating the release metadata in the remote repository,
+                                because otherwise that messes BinTray repository layout up.
+                                BinTray itself takes care of metadata when the artifacts are promoted.
+                            -->
+                            <updateReleaseInfo>false</updateReleaseInfo>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencies>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c652d7ee..e527a134 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,6 +7,15 @@
 
     <body>
 
+        <release version="0.4.2" date="2015-04-29" description="Bug fixes">
+            <action dev="sergei-ivanov" type="fix" issue="34">
+                Made the order of imports predictable and matching the order of dependencies.
+            </action>
+            <action dev="sergei-ivanov" type="fix">
+                Fixed release configuration.
+            </action>
+        </release>
+
         <release version="0.4.1" date="2015-04-27" description="Support for native protoc plugins">
             <action dev="sergei-ivanov" type="add" issue="33">
                 Added an option to download protoc binary artifact from Maven repo.