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/03 03:27:03 UTC
[02/50] [abbrv] incubator-apex-core git commit: Merge branch
'APEX-142' of github.com:vrozov/incubator-apex-core into vrozov-APEX-142
Merge branch 'APEX-142' of github.com:vrozov/incubator-apex-core into vrozov-APEX-142
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/e6263b5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/e6263b5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/e6263b5c
Branch: refs/heads/master
Commit: e6263b5cf0c79d8506dc2a396cce441dd23f84e1
Parents: 90bda5e 44d1bfc
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Fri Sep 25 16:45:46 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Fri Sep 25 16:58:15 2015 -0700
----------------------------------------------------------------------
bufferserver/pom.xml | 64 +++++++-------------
.../bufferserver/internal/DataList.java | 6 +-
.../bufferserver/client/SubscriberTest.java | 6 +-
.../bufferserver/server/ServerTest.java | 12 ++--
pom.xml | 32 +++++-----
5 files changed, 54 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e6263b5c/bufferserver/pom.xml
----------------------------------------------------------------------
diff --cc bufferserver/pom.xml
index 2341550,c6f9eea..1c5027f
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@@ -33,6 -13,21 +33,28 @@@
<name>Buffer Server</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>2.14.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-checkstyle-plugin</artifactId>
++ <configuration>
++ <maxAllowedViolations>123</maxAllowedViolations>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@@ -52,41 -42,27 +69,4 @@@
<type>jar</type>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <maxAllowedViolations>123</maxAllowedViolations>
- </configuration>
- </plugin>
- </plugins>
- </build>
--
-- <profiles>
-- <profile>
-- <id>netbeans-private-testng</id>
-- <activation>
-- <property>
-- <name>netbeans.testng.action</name>
-- </property>
-- </activation>
-- <build>
-- <plugins>
-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.11</version>
-- <configuration>
-- <suiteXmlFiles>
-- <suiteXmlFile>target/nb-private/testng-suite.xml</suiteXmlFile>
-- </suiteXmlFiles>
-- </configuration>
-- </plugin>
-- </plugins>
-- </build>
-- </profile>
-- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e6263b5c/bufferserver/src/main/java/com/datatorrent/bufferserver/internal/DataList.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e6263b5c/bufferserver/src/test/java/com/datatorrent/bufferserver/client/SubscriberTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e6263b5c/bufferserver/src/test/java/com/datatorrent/bufferserver/server/ServerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/e6263b5c/pom.xml
----------------------------------------------------------------------