From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Thu, 31 Mar 2016 14:12:49 +0000 (+0300)
Subject: Add transitive dependencies for vaadin-all zip to lib folder
X-Git-Tag: 7.7.0.alpha1~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8df3680762f219d3e07dca74435e8fca90905a68;p=vaadin-framework.git

Add transitive dependencies for vaadin-all zip to lib folder

Change-Id: I020ddda7a11390c9a15e755abf0fc2528fe1cc3a
---

diff --git a/all/README.TXT b/all/README.TXT
deleted file mode 100644
index 24d8afb44c..0000000000
--- a/all/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-This Vaadin zip contains all the jars of the Vaadin Framework. Additionally all dependencies are provided in the lib folder.
-
-To use in a web project:
-1. Copy all vaadin-* files except vaadin-client and vaadin-client-compiler to WEB-INF/lib in your project
-2. Copy lib/*.jar to WEB-INF/lib in your project
-3. Copy vaadin-client and vaadin-client-compiler to a lib folder which is on your classpath but will not be deployed. These files are only needed when compiling a module (widget set) to Javascript.
-
-If you are using Eclipse and a standard WTP (Dynamic Web Project or Vaadin Project), step 3 can be:
-Create a /lib folder, copy the files there and right click the lib folder and select "Build Path" -> "Add to Build Path".
-Once this is done, the "Compile widgetset" button provided by the Vaadin Plug-in for Eclipse will work correctly.
-
-
-
diff --git a/all/all-assembly-descriptor.xml b/all/all-assembly-descriptor.xml
index a514c5276f..3f8a3ab53c 100644
--- a/all/all-assembly-descriptor.xml
+++ b/all/all-assembly-descriptor.xml
@@ -14,6 +14,23 @@
 			<unpack>false</unpack>
 			<useTransitiveDependencies>false</useTransitiveDependencies>
 		</dependencySet>
+		<dependencySet>
+			<scope>compile</scope>
+			<outputDirectory>lib</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<excludes>
+				<exclude>${project.groupId}:vaadin-shared</exclude>
+				<exclude>${project.groupId}:vaadin-push</exclude>
+				<exclude>${project.groupId}:vaadin-server</exclude>
+				<exclude>${project.groupId}:vaadin-themes</exclude>
+				<exclude>${project.groupId}:vaadin-client</exclude>
+				<exclude>${project.groupId}:vaadin-client-compiler</exclude>
+				<exclude>${project.groupId}:vaadin-client-compiled</exclude>
+				<exclude>${project.groupId}:vaadin-widgets</exclude>
+			</excludes>
+		</dependencySet>
 	</dependencySets>
 	<fileSets>
 		<fileSet>
diff --git a/all/src/main/resources/WebContent/README.TXT b/all/src/main/resources/WebContent/README.TXT
new file mode 100644
index 0000000000..24d8afb44c
--- /dev/null
+++ b/all/src/main/resources/WebContent/README.TXT
@@ -0,0 +1,13 @@
+This Vaadin zip contains all the jars of the Vaadin Framework. Additionally all dependencies are provided in the lib folder.
+
+To use in a web project:
+1. Copy all vaadin-* files except vaadin-client and vaadin-client-compiler to WEB-INF/lib in your project
+2. Copy lib/*.jar to WEB-INF/lib in your project
+3. Copy vaadin-client and vaadin-client-compiler to a lib folder which is on your classpath but will not be deployed. These files are only needed when compiling a module (widget set) to Javascript.
+
+If you are using Eclipse and a standard WTP (Dynamic Web Project or Vaadin Project), step 3 can be:
+Create a /lib folder, copy the files there and right click the lib folder and select "Build Path" -> "Add to Build Path".
+Once this is done, the "Compile widgetset" button provided by the Vaadin Plug-in for Eclipse will work correctly.
+
+
+