sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1491711 - /sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
Date Tue, 11 Jun 2013 09:15:16 GMT
Author: desruisseaux
Date: Tue Jun 11 09:15:16 2013
New Revision: 1491711

URL: http://svn.apache.org/r1491711
Log:
Separate version number from branch name for easier merges.

Modified:
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java?rev=1491711&r1=1491710&r2=1491711&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
[UTF-8] Tue Jun 11 09:15:16 2013
@@ -41,9 +41,16 @@ import org.apache.maven.plugin.MojoExecu
  */
 public class BundleCreator extends AbstractMojo {
     /**
-     * The Apache SIS version.
+     * The Apache SIS version, without branch name.
      */
-    private static final String VERSION = "0.3-jdk7";
+    private static final String VERSION = "0.3";
+
+    /**
+     * The Apache SIS branch for which this plugin is creating a bundle.
+     * This is declared as a separated constant in order to make easier to update
+     * {@link #VERSION} without creating conflicts during branch merge.
+     */
+    private static final String BRANCH = "jdk7";
 
     /**
      * The root directory (without the "<code>target/binaries</code>" sub-directory)
where JARs
@@ -66,8 +73,9 @@ public class BundleCreator extends Abstr
             throw new MojoExecutionException("Directory not found: " + targetDirectory);
         }
         try {
-            final Packer packer = new Packer(targetDirectory, VERSION);
-            packer.addPack("sis-" + VERSION + ".jar");
+            final String fullVersion = VERSION + '-' + BRANCH;
+            final Packer packer = new Packer(targetDirectory, fullVersion);
+            packer.addPack("sis-" + fullVersion + ".jar");
             try {
                 packer.createJars();
             } finally {



Mime
View raw message