Repository: apex-core Updated Branches: refs/heads/master 8ce340ef3 -> 41aea840d
APEXCORE-655 Support archetypeVersion=RELEASE when generating project. Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/41aea840 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/41aea840 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/41aea840 Branch: refs/heads/master Commit: 41aea840d46f8dfa7ce23eeb8f640c5f1d346e03 Parents: 8ce340e Author: Thomas Weise <[email protected]> Authored: Sun Feb 26 13:29:14 2017 -0800 Committer: Thomas Weise <[email protected]> Committed: Sat Mar 4 11:49:33 2017 -0800 ---------------------------------------------------------------------- apex-app-archetype/pom.xml | 17 +++++++++++++++++ .../META-INF/maven/archetype-metadata.xml | 7 +++++++ .../src/main/resources/archetype-resources/pom.xml | 11 ++++++----- .../resources/projects/basic/archetype.properties | 2 ++ 4 files changed, 32 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/41aea840/apex-app-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/apex-app-archetype/pom.xml b/apex-app-archetype/pom.xml index 945c1d7..892c306 100644 --- a/apex-app-archetype/pom.xml +++ b/apex-app-archetype/pom.xml @@ -50,5 +50,22 @@ </plugin> </plugins> </pluginManagement> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>META-INF/maven/archetype-metadata.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>META-INF/maven/archetype-metadata.xml</exclude> + </excludes> + </resource> + </resources> </build> </project> http://git-wip-us.apache.org/repos/asf/apex-core/blob/41aea840/apex-app-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/apex-app-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/apex-app-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 98951f8..f123fec 100644 --- a/apex-app-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/apex-app-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -26,6 +26,13 @@ <requiredProperty key="archetypeVersion"> <defaultValue>${archetypeVersion}</defaultValue> </requiredProperty> + <requiredProperty key="apexCoreVersion"> + <!-- the actual version even when ${archetypeVersion} is LATEST --> + <defaultValue>${project.version}</defaultValue> + </requiredProperty> + <requiredProperty key="apexMalharVersion"> + <defaultValue>3.6.0</defaultValue> + </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/apex-core/blob/41aea840/apex-app-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml index a3d8faa..22d771a 100644 --- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml +++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml @@ -13,7 +13,8 @@ <properties> <!-- change this if you desire to use a different version of Apex Core --> - <apex.version>${archetypeVersion}</apex.version> + <apex.core.version>${apexCoreVersion}</apex.core.version> + <apex.malhar.version>${apexMalharVersion}</apex.malhar.version> <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath> </properties> @@ -102,7 +103,7 @@ <archive> <manifestEntries> <Class-Path>${apex.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${apex.version}</DT-Engine-Version> + <DT-Engine-Version>${apex.core.version}</DT-Engine-Version> <DT-App-Package-Group-Id>${project.groupId}</DT-App-Package-Group-Id> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> @@ -260,7 +261,7 @@ <dependency> <groupId>org.apache.apex</groupId> <artifactId>malhar-library</artifactId> - <version>3.6.0</version> + <version>${apex.malhar.version}</version> <!-- If you know that your application does not need transitive dependencies pulled in by malhar-library, uncomment the following to reduce the size of your app package. @@ -277,7 +278,7 @@ <dependency> <groupId>org.apache.apex</groupId> <artifactId>apex-common</artifactId> - <version>${apex.version}</version> + <version>${apex.core.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -289,7 +290,7 @@ <dependency> <groupId>org.apache.apex</groupId> <artifactId>apex-engine</artifactId> - <version>${apex.version}</version> + <version>${apex.core.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/apex-core/blob/41aea840/apex-app-archetype/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/apex-app-archetype/src/test/resources/projects/basic/archetype.properties b/apex-app-archetype/src/test/resources/projects/basic/archetype.properties index 7b03fd1..14192ac 100644 --- a/apex-app-archetype/src/test/resources/projects/basic/archetype.properties +++ b/apex-app-archetype/src/test/resources/projects/basic/archetype.properties @@ -23,3 +23,5 @@ version=0.1-SNAPSHOT groupId=archetype.it artifactId=basic archetypeVersion=3.0.0 +apexCoreVersion=3.0.0 +apexMalharVersion=3.0.0
