From f776982842daa0dcdf04cc7055afaae9d3386280 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Mon, 11 Apr 2016 13:31:41 +0300
Subject: Generate sources with release profile

This patch refactors how unpacking of dependencies is handled.
It now uses a more generic configuration on top level as well as
updates the phase where the extraction happens. This way the source
plugin configuration remains small

Change-Id: I952ec84e05eac255f8b44044baceba37e07737c5
---
 shared/pom.xml                                                | 8 ++------
 shared/src/main/java-templates/com/vaadin/shared/Version.java | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'shared')

diff --git a/shared/pom.xml b/shared/pom.xml
index 1825a6dfcf..21ea7fc9bf 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -85,7 +85,7 @@
 				<executions>
 					<execution>
 						<id>unpack-dependencies</id>
-						<phase>prepare-package</phase>
+						<phase>generate-resources</phase>
 						<goals>
 							<goal>unpack</goal>
 						</goals>
@@ -112,15 +112,11 @@
 									</includes>
 								</artifactItem>
 							</artifactItems>
-							<outputDirectory>${project.build.directory}/classes</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 
-
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -133,7 +129,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/classes</outputDirectory>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/java</directory>
diff --git a/shared/src/main/java-templates/com/vaadin/shared/Version.java b/shared/src/main/java-templates/com/vaadin/shared/Version.java
index 7bcc8c6f65..d401105ed0 100644
--- a/shared/src/main/java-templates/com/vaadin/shared/Version.java
+++ b/shared/src/main/java-templates/com/vaadin/shared/Version.java
@@ -47,10 +47,10 @@ public class Version implements Serializable {
 
     /* Initialize version numbers from string replaced by build-script. */
     static {
-        if ("${vaadin.version}".equals("${" + "vaadin.version" + "}")) {
+        if ("${project.version}".equals("${" + "project.version" + "}")) {
             VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
         } else {
-            VERSION = "${vaadin.version}";
+            VERSION = "${project.version}";
         }
         final String[] digits = VERSION.split("\\.", 4);
         VERSION_MAJOR = Integer.parseInt(digits[0]);
-- 
cgit v1.2.3