Repository: apex-core Updated Branches: refs/heads/master 4fd51ca1e -> 1b1813f96
APEXCORE-487 - Upgrade apex and malhar dependencies in the archtype Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/68be2f81 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/68be2f81 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/68be2f81 Branch: refs/heads/master Commit: 68be2f81ca41aea885620ebd6f3cd3c8eac22b07 Parents: c03f05d Author: Vlad Rozov <[email protected]> Authored: Mon Jul 11 14:06:27 2016 -0700 Committer: Vlad Rozov <[email protected]> Committed: Mon Jul 11 14:06:27 2016 -0700 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 236 +++++++++--------- engine/pom.xml | 1 + .../stram/client/AppPackageTest.java | 2 +- .../stram/support/StramTestSupport.java | 12 +- .../resources/testAppPackage/mydtapp/pom.xml | 238 +++++++++---------- 6 files changed, 248 insertions(+), 243 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/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 a1beaa4..0709a7b 100644 --- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml +++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml @@ -237,7 +237,7 @@ <dependency> <groupId>org.apache.apex</groupId> <artifactId>malhar-library</artifactId> - <version>3.3.0-incubating</version> + <version>3.4.0</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. http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml index 624fb0d..4645c77 100644 --- a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml +++ b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml @@ -29,127 +29,127 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.9</version> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <encoding>UTF-8</encoding> - <source>1.7</source> - <target>1.7</target> - <debug>true</debug> - <optimize>false</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/deps</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> - </execution> - <execution> - <id>unpack</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>jar</type> - <includes>META-INF/MANIFEST.MF</includes> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.9</version> + <configuration> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> + <configuration> + <encoding>UTF-8</encoding> + <source>1.7</source> + <target>1.7</target> + <debug>true</debug> + <optimize>false</optimize> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/deps</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + <execution> + <id>unpack</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>jar</type> + <includes>META-INF/MANIFEST.MF</includes> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>conf-package-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-apexconf</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/assemble/confPackage.xml</descriptor> - </descriptors> - <archiverConfig> - <defaultDirectoryMode>0755</defaultDirectoryMode> - </archiverConfig> - <archive> - <manifestEntries> - <DT-App-Package-Group-Id>${apex.apppackage.groupid}</DT-App-Package-Group-Id> - <DT-App-Package-Name>${apex.apppackage.name}</DT-App-Package-Name> - <DT-App-Package-Min-Version>${apex.apppackage.minversion}</DT-App-Package-Min-Version> - <DT-App-Package-Max-Version>${apex.apppackage.maxversion}</DT-App-Package-Max-Version> - <DT-Conf-Package-Name>${project.artifactId}</DT-Conf-Package-Name> - <DT-Conf-Package-Display-Name>${project.name}</DT-Conf-Package-Display-Name> - <DT-Conf-Package-Description>${project.description}</DT-Conf-Package-Description> - <Class-Path>${apex.appconf.classpath}</Class-Path> - <Files>${apex.appconf.files}</Files> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>conf-package-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.artifactId}-apexconf</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble/confPackage.xml</descriptor> + </descriptors> + <archiverConfig> + <defaultDirectoryMode>0755</defaultDirectoryMode> + </archiverConfig> + <archive> + <manifestEntries> + <DT-App-Package-Group-Id>${apex.apppackage.groupid}</DT-App-Package-Group-Id> + <DT-App-Package-Name>${apex.apppackage.name}</DT-App-Package-Name> + <DT-App-Package-Min-Version>${apex.apppackage.minversion}</DT-App-Package-Min-Version> + <DT-App-Package-Max-Version>${apex.apppackage.maxversion}</DT-App-Package-Max-Version> + <DT-Conf-Package-Name>${project.artifactId}</DT-Conf-Package-Name> + <DT-Conf-Package-Display-Name>${project.name}</DT-Conf-Package-Display-Name> + <DT-Conf-Package-Description>${project.description}</DT-Conf-Package-Description> + <Class-Path>${apex.appconf.classpath}</Class-Path> + <Files>${apex.appconf.files}</Files> + </manifestEntries> + </archive> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <target> - <move file="${project.build.directory}/${project.artifactId}-apexconf.jar" - tofile="${project.build.directory}/${project.artifactId}.apc" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <phase>package</phase> + <configuration> + <target> + <move file="${project.build.directory}/${project.artifactId}-apexconf.jar" + tofile="${project.build.directory}/${project.artifactId}.apc"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/engine/pom.xml ---------------------------------------------------------------------- diff --git a/engine/pom.xml b/engine/pom.xml index a56909e..42e7a72 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -167,6 +167,7 @@ <systemPropertyVariables> <maven.home>${maven.home}</maven.home> <maven.multiModuleProjectDirectory>${maven.home}</maven.multiModuleProjectDirectory> + <apex.version>${project.version}</apex.version> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java b/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java index 5f16399..9999f01 100644 --- a/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java +++ b/engine/src/test/java/com/datatorrent/stram/client/AppPackageTest.java @@ -87,7 +87,7 @@ public class AppPackageTest Assert.assertEquals("com.example", json.getString("appPackageGroupId")); Assert.assertEquals("mydtapp", json.getString("appPackageName")); Assert.assertEquals("1.0-SNAPSHOT", json.getString("appPackageVersion")); - Assert.assertEquals("3.2.0-incubating", json.getString("dtEngineVersion")); + Assert.assertEquals(System.getProperty("apex.version", "3.4.0"), json.getString("dtEngineVersion")); Assert.assertEquals("lib/*.jar", json.getJSONArray("classPath").getString(0)); JSONObject application = json.getJSONArray("applications").getJSONObject(0); http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java index 7b4bf76..0326b6a 100644 --- a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java +++ b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java @@ -29,6 +29,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -156,8 +157,15 @@ public abstract class StramTestSupport */ public static File createAppPackageFile() { - Assert.assertEquals(0, mavenCli.doMain(new String[] {"clean", "package", "-DskipTests"}, - workingDirectory, System.out, System.err)); + final String version = System.getProperty("apex.version"); + final List<String> params = new LinkedList<>(); + params.add("clean"); + params.add("package"); + params.add("-DskipTests"); + if (version != null && version.length() > 0) { + params.add("-Dapex.version=" + version); + } + Assert.assertEquals(0, mavenCli.doMain(params.toArray(new String[params.size()]), workingDirectory, System.out, System.err)); return new File(workingDirectory, "target/mydtapp-1.0-SNAPSHOT.apa"); } http://git-wip-us.apache.org/repos/asf/apex-core/blob/68be2f81/engine/src/test/resources/testAppPackage/mydtapp/pom.xml ---------------------------------------------------------------------- diff --git a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml index 4ba5870..f8cbb1c 100644 --- a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml +++ b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml @@ -33,132 +33,128 @@ <properties> <!-- change this if you desire to use a different version of Apex Core --> - <apex.version>3.2.0-incubating</apex.version> + <apex.version>3.4.0</apex.version> <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath> </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.9</version> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <encoding>UTF-8</encoding> - <source>1.6</source> - <target>1.6</target> - <debug>true</debug> - <optimize>false</optimize> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/deps</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> - </execution> - <execution> - <id>unpack</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>jar</type> - <includes>META-INF/MANIFEST.MF</includes> - <outputDirectory>target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>app-package-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-apexapp</finalName> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/assemble/appPackage.xml</descriptor> - </descriptors> - <archiverConfig> - <defaultDirectoryMode>0755</defaultDirectoryMode> - </archiverConfig> - <archive> - <manifestEntries> - <Class-Path>${apex.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${apex.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> - <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> - <DT-App-Package-Description>${project.description}</DT-App-Package-Description> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <phase>package</phase> - <configuration> - <target> - <move file="${project.build.directory}/${project.artifactId}-${project.version}-apexapp.jar" - tofile="${project.build.directory}/${project.artifactId}-${project.version}.apa" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.9</version> + <configuration> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <encoding>UTF-8</encoding> + <source>1.6</source> + <target>1.6</target> + <debug>true</debug> + <optimize>false</optimize> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/deps</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + <execution> + <id>unpack</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>jar</type> + <includes>META-INF/MANIFEST.MF</includes> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>app-package-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}-apexapp</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble/appPackage.xml</descriptor> + </descriptors> + <archiverConfig> + <defaultDirectoryMode>0755</defaultDirectoryMode> + </archiverConfig> + <archive> + <manifestEntries> + <Class-Path>${apex.apppackage.classpath}</Class-Path> + <DT-Engine-Version>${apex.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> + <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> + <DT-App-Package-Description>${project.description}</DT-App-Package-Description> + </manifestEntries> + </archive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <phase>package</phase> + <configuration> + <target> + <move file="${project.build.directory}/${project.artifactId}-${project.version}-apexapp.jar" + tofile="${project.build.directory}/${project.artifactId}-${project.version}.apa"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build>
