Add version to exported packages (#7222)

Change-Id: I8c22329258cbd8d4dc2f892ae5ba6fa0b9b37a10

diff --git a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java b/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java
index bf9bd7e068032098a5e81eea2cb023851dfcf9c9..33c822193a284a6b76bd98e9bd2d338d2a67e2fe 100644 (file)
--- a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java
+++ b/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java
@@ -29,9 +29,11 @@ public class GeneratePackageExports {
         if (args.length < 2) {
             System.err
                     .println("Invalid number of parameters\n"
-                            + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>");
+                            + "Usage: java -cp .. GenerateManifest <package.jar> <accepted package prefixes>\n"
+                            + "Use -Dvaadin.version to specify the version to be used for the packages");
             System.exit(1);
         }
+        String vaadinVersion = System.getProperty("vaadin.version");
 
         // Open the JAR
         String jarFilename = args[0];
@@ -57,7 +59,7 @@ public class GeneratePackageExports {
             return;
         }
 
-        String exportPackage = sortAndJoinPackages(packages);
+        String exportPackage = sortAndJoinPackages(packages, vaadinVersion);
 
         // Read old manifest
         Manifest oldMF = null;
@@ -95,7 +97,8 @@ public class GeneratePackageExports {
         }
     }
 
-    private static String sortAndJoinPackages(HashSet<String> packages) {
+    private static String sortAndJoinPackages(HashSet<String> packages,
+            String vaadinVersion) {
         // Produce an ordered listing of the package names
         String packageArray[] = new String[packages.size()];
         packages.toArray(packageArray);
@@ -105,8 +108,11 @@ public class GeneratePackageExports {
             if (i != 0) {
                 joinedPackages.append(",");
             }
-
-            joinedPackages.append(packageArray[i]);
+            String packageAndVersion = packageArray[i];
+            if (vaadinVersion != null) {
+                packageAndVersion += ";version=\"" + vaadinVersion + "\"";
+            }
+            joinedPackages.append(packageAndVersion);
         }
 
         return joinedPackages.toString();

diff --git a/common.xml b/common.xml
index 4b86bfaa331b28f276a938774630baf5f0bfa672..0875fea71af02c38e36482902f8d0ecc27fe0365 100644 (file)
--- a/common.xml
+++ b/common.xml
@@ -244,6 +244,7 @@
                        <arg value="com/vaadin" />
                        <arg value="com/google" />
                        <classpath refid="vaadin.buildhelpers.classpath" />
+                       <jvmarg value="-Dvaadin.version=${vaadin.version}" />
                </java>
        </target>