diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/pom.xml | 8 | ||||
| -rw-r--r-- | shared/src/main/java-templates/com/vaadin/shared/Version.java | 4 |
2 files changed, 4 insertions, 8 deletions
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]); |