Moved Vaadin-Widgetsets to client package where it belongs (#9593)

diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 9327e6da5fe8635d129daf156dd7479a5e59fdd8..be32dea853c04c1761d40950ca3a03c0f6f30346 100644 (file)
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -106,8 +106,6 @@
 
                <jar file="${compiled.jar}" compress="true">
                        <manifest>
-                               <attribute name="Vaadin-Package-Version" value="1" />
-                               <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
                                <attribute name="Implementation-Vendor" value="Vaadin Ltd" />
                                <attribute name="Implementation-URL" value="http://vaadin.com" />
                                <attribute name="Implementation-Version" value="${vaadin.version}" />

diff --git a/client/build.xml b/client/build.xml
index 47b113e90fc7c0f9a3353d1c50594ebaaa4d4ffb..03c9c914012568825e903c73123cbf60c3bd9c15 100644 (file)
--- a/client/build.xml
+++ b/client/build.xml
@@ -22,9 +22,16 @@
        <path id="classpath.tests.custom" />
 
        <target name="jar">
+               <property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
                <antcall target="common.jar">
                        <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
                </antcall>
+               <jar destfile="${jar.file}" update="true">
+                       <manifest>
+                               <attribute name="Vaadin-Package-Version" value="1" />
+                               <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
+                       </manifest>
+               </jar>
                <!-- Hack to add validation dependency with source classifier -->
                <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
                <copy file="${pom.xml}" tofile="${temp.pom}">