You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2017/01/27 05:18:57 UTC

incubator-joshua git commit: Final preparation for RC#3

Repository: incubator-joshua
Updated Branches:
  refs/heads/master f55827739 -> 1f6aec431


Final preparation for RC#3


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/1f6aec43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/1f6aec43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/1f6aec43

Branch: refs/heads/master
Commit: 1f6aec431c9343ea0afbefe830f6ff9c7a2f3f7d
Parents: f558277
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Thu Jan 26 21:18:50 2017 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Thu Jan 26 21:18:50 2017 -0800

----------------------------------------------------------------------
 CHANGES.md      |  2 +-
 doap_joshua.rdf |  2 +-
 pom.xml         | 53 +++++++++++++++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1f6aec43/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index ca65ef1..6b773a9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Apache Joshua 6.1 (Jan 17th, 2017)
+Apache Joshua 6.1 (Jan 26th, 2017)
 ==================================
 Release Report - https://s.apache.org/joshua6.1
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1f6aec43/doap_joshua.rdf
----------------------------------------------------------------------
diff --git a/doap_joshua.rdf b/doap_joshua.rdf
index 125d15a..e5f28ae 100644
--- a/doap_joshua.rdf
+++ b/doap_joshua.rdf
@@ -37,7 +37,7 @@
     <release>
       <Version>
         <name>6.1 release</name>
-        <created>2017-01-17</created>
+        <created>2017-01-26</created>
         <revision>6.1</revision>
       </Version>
     </release>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1f6aec43/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 794efa7..3476d35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,6 +273,25 @@
             <updateReleaseInfo>true</updateReleaseInfo>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>${maven-assembly-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>assembly</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <attach>true</attach>
+            <skipAssembly>false</skipAssembly>
+            <tarLongFileMode>posix</tarLongFileMode>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -284,29 +303,6 @@
           <target>${javac.target.version}</target>
         </configuration>
       </plugin>
-      <!-- Generates the distribution package -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptors>
-            <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
-          </descriptors>
-          <attach>true</attach>
-          <skipAssembly>false</skipAssembly>
-          <tarLongFileMode>posix</tarLongFileMode>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.19.1</version>
@@ -375,6 +371,17 @@
           </execution>
         </executions>
       </plugin>
+      <!-- Generates the distribution package -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <inherited>false</inherited>
+        <configuration>
+          <descriptors>
+            <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>