You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/11/21 00:10:21 UTC
[1/4] incubator-apex-core git commit: APEX-253 #resolve changed
malhar dependency from com.datatorrent to org.apache.apex
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 ca542e3d8 -> 892355ca1
APEX-253 #resolve changed malhar dependency from com.datatorrent to org.apache.apex
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/0710f926
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0710f926
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0710f926
Branch: refs/heads/devel-3
Commit: 0710f926c7b933a0c124f2b808f3d8d4f0145d78
Parents: ca542e3
Author: David Yan <da...@datatorrent.com>
Authored: Thu Nov 19 11:13:29 2015 -0800
Committer: David Yan <da...@datatorrent.com>
Committed: Thu Nov 19 11:13:29 2015 -0800
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 31 ++------------------
1 file changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0710f926/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 d3d0353..764edc0 100644
--- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
@@ -17,26 +17,6 @@
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
</properties>
- <!-- repository to provide the DataTorrent artifacts -->
- <repositories>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>Datatorrent-Releases</id>
- <name>DataTorrent Release Repository</name>
- <url>https://www.datatorrent.com/maven/content/repositories/releases/</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>DataTorrent-Snapshots</id>
- <name>DataTorrent Early Access Program Snapshot Repository</name>
- <url>https://www.datatorrent.com/maven/content/repositories/snapshots/</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -254,16 +234,9 @@
<dependencies>
<!-- add your dependencies here -->
<dependency>
- <groupId>com.datatorrent</groupId>
+ <groupId>org.apache.apex</groupId>
<artifactId>malhar-library</artifactId>
- <version>3.1.1</version>
- <!-- remove when switching to malhar version that depends on apex-common as shown below -->
- <exclusions>
- <exclusion>
- <groupId>com.datatorrent</groupId>
- <artifactId>dt-common</artifactId>
- </exclusion>
- </exclusions>
+ <version>3.2.0-incubating</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.
[4/4] incubator-apex-core git commit: Merge branch 'japicmp' of
https://github.com/vrozov/incubator-apex-core into devel-3
Posted by th...@apache.org.
Merge branch 'japicmp' of https://github.com/vrozov/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/892355ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/892355ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/892355ca
Branch: refs/heads/devel-3
Commit: 892355ca18084130d8b2044e38b14528ec1bf546
Parents: bf8d3ed 2f51b4f
Author: Thomas Weise <th...@datatorrent.com>
Authored: Fri Nov 20 15:08:39 2015 -0800
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Nov 20 15:08:39 2015 -0800
----------------------------------------------------------------------
api/pom.xml | 18 ------------------
common/pom.xml | 36 +++++++++---------------------------
pom.xml | 24 ++++++++++++++++++++++++
3 files changed, 33 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-apex-core git commit: Upgrade semantic version maven
plugin version from 0.5.3 to 0.6.1
Posted by th...@apache.org.
Upgrade semantic version maven plugin version from 0.5.3 to 0.6.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/2f51b4f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2f51b4f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2f51b4f0
Branch: refs/heads/devel-3
Commit: 2f51b4f087139c496cbc7d457e24f96ef623864d
Parents: ca542e3
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Thu Nov 19 17:39:55 2015 -0800
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Thu Nov 19 17:39:55 2015 -0800
----------------------------------------------------------------------
api/pom.xml | 18 ------------------
common/pom.xml | 36 +++++++++---------------------------
pom.xml | 24 ++++++++++++++++++++++++
3 files changed, 33 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2f51b4f0/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index fba3374..79af4b3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -52,7 +52,6 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.5.3</version>
<configuration>
<oldVersion>
<dependency>
@@ -66,24 +65,7 @@
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
</file>
</newVersion>
- <parameter>
- <onlyModified>true</onlyModified>
- <accessModifier>protected</accessModifier>
- <breakBuildOnModifications>false</breakBuildOnModifications>
- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
- <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
- <includeSynthetic>false</includeSynthetic>
- <ignoreMissingClasses>false</ignoreMissingClasses>
- </parameter>
</configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2f51b4f0/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 25887d8..f1bae56 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -33,11 +33,10 @@
<packaging>jar</packaging>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.5.3</version>
<configuration>
<oldVersion>
<dependency>
@@ -51,33 +50,16 @@
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
</file>
</newVersion>
- <parameter>
- <onlyModified>true</onlyModified>
- <accessModifier>protected</accessModifier>
- <breakBuildOnModifications>false</breakBuildOnModifications>
- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
- <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
- <includeSynthetic>false</includeSynthetic>
- <ignoreMissingClasses>false</ignoreMissingClasses>
- </parameter>
</configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <maxAllowedViolations>149</maxAllowedViolations>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <maxAllowedViolations>149</maxAllowedViolations>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/2f51b4f0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df24424..a875581 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,6 +333,30 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.11</version>
</plugin>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.6.1</version>
+ <configuration>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <accessModifier>protected</accessModifier>
+ <breakBuildOnModifications>false</breakBuildOnModifications>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+ <includeSynthetic>false</includeSynthetic>
+ <ignoreMissingClasses>false</ignoreMissingClasses>
+ </parameter>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<extensions>
[2/4] incubator-apex-core git commit: Renamed datatorrent variables
to apex and removed DataTorrent information from apc archetype
Posted by th...@apache.org.
Renamed datatorrent variables to apex and removed DataTorrent information from apc archetype
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/bf8d3eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/bf8d3eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/bf8d3eda
Branch: refs/heads/devel-3
Commit: bf8d3edaa9a2d5b5d71af4357f9316117b7545dd
Parents: 0710f92
Author: David Yan <da...@datatorrent.com>
Authored: Thu Nov 19 16:30:04 2015 -0800
Committer: David Yan <da...@datatorrent.com>
Committed: Thu Nov 19 16:33:11 2015 -0800
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 6 +--
.../main/resources/archetype-resources/pom.xml | 46 +++++---------------
.../resources/testAppPackage/mydtapp/pom.xml | 12 ++---
3 files changed, 19 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/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 764edc0..74f320c 100644
--- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
@@ -12,9 +12,9 @@
<description>My Apex Application Description</description>
<properties>
- <!-- change this if you desire to use a different version of DataTorrent -->
+ <!-- change this if you desire to use a different version of Apex Core -->
<apex.version>${archetypeVersion}</apex.version>
- <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
+ <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
</properties>
<build>
@@ -78,7 +78,7 @@
</archiverConfig>
<archive>
<manifestEntries>
- <Class-Path>${datatorrent.apppackage.classpath}</Class-Path>
+ <Class-Path>${apex.apppackage.classpath}</Class-Path>
<DT-Engine-Version>${apex.version}</DT-Engine-Version>
<DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name>
<DT-App-Package-Version>${project.version}</DT-App-Package-Version>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/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 ace6f59..42ec2bf 100644
--- a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,40 +18,14 @@
</license>
</licenses>
- <scm>
- <connection>scm:git:git@github.com:DataTorrent/Apex.git</connection>
- <developerConnection>scm:git:git@github.com:DataTorrent/Apex.git</developerConnection>
- <url>git@github.com:DataTorrent/Apex.git</url>
- </scm>
-
<properties>
- <datatorrent.apppackage.name>myapexapp</datatorrent.apppackage.name>
- <datatorrent.apppackage.minversion>1.0.0</datatorrent.apppackage.minversion>
- <datatorrent.apppackage.maxversion>1.9999.9999</datatorrent.apppackage.maxversion>
- <datatorrent.appconf.classpath>classpath/*</datatorrent.appconf.classpath>
- <datatorrent.appconf.files>files/*</datatorrent.appconf.files>
+ <apex.apppackage.name>myapexapp</apex.apppackage.name>
+ <apex.apppackage.minversion>1.0.0</apex.apppackage.minversion>
+ <apex.apppackage.maxversion>1.9999.9999</apex.apppackage.maxversion>
+ <apex.appconf.classpath>classpath/*</apex.appconf.classpath>
+ <apex.appconf.files>files/*</apex.appconf.files>
</properties>
- <!-- repository to provide the DataTorrent artifacts -->
- <repositories>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>Datatorrent-Releases</id>
- <name>DataTorrent Release Repository</name>
- <url>https://www.datatorrent.com/maven/content/repositories/releases/</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>DataTorrent-Snapshots</id>
- <name>DataTorrent Early Access Program Snapshot Repository</name>
- <url>https://www.datatorrent.com/maven/content/repositories/snapshots/</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -132,14 +106,14 @@
</archiverConfig>
<archive>
<manifestEntries>
- <DT-App-Package-Name>${datatorrent.apppackage.name}</DT-App-Package-Name>
- <DT-App-Package-Min-Version>${datatorrent.apppackage.minversion}</DT-App-Package-Min-Version>
- <DT-App-Package-Max-Version>${datatorrent.apppackage.maxversion}</DT-App-Package-Max-Version>
+ <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>${datatorrent.appconf.classpath}</Class-Path>
- <Files>${datatorrent.appconf.files}</Files>
+ <Class-Path>${apex.appconf.classpath}</Class-Path>
+ <Files>${apex.appconf.files}</Files>
</manifestEntries>
</archive>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/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 d1efa48..9d2ea7d 100644
--- a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
+++ b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml
@@ -32,9 +32,9 @@
<description>My Apex Application Description</description>
<properties>
- <!-- change this if you desire to use a different version of DataTorrent -->
- <datatorrent.version>3.2.0-incubating</datatorrent.version>
- <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
+ <!-- change this if you desire to use a different version of Apex Core -->
+ <apex.version>3.2.0-incubating</apex.version>
+ <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
</properties>
<build>
@@ -117,8 +117,8 @@
</archiverConfig>
<archive>
<manifestEntries>
- <Class-Path>${datatorrent.apppackage.classpath}</Class-Path>
- <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version>
+ <Class-Path>${apex.apppackage.classpath}</Class-Path>
+ <DT-Engine-Version>${apex.version}</DT-Engine-Version>
<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>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.apache.apex</groupId>
<artifactId>apex-common</artifactId>
- <version>${datatorrent.version}</version>
+ <version>${apex.version}</version>
<scope>provided</scope>
</dependency>
<dependency>