You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/22 22:00:35 UTC
[21/25] storm git commit: STORM-243:add module
storm-buildtools/storm-maven-plugins to generate version info
STORM-243:add module storm-buildtools/storm-maven-plugins to generate version info
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2cef782f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2cef782f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2cef782f
Branch: refs/heads/master
Commit: 2cef782f0d523ebb6db92f1f4e0c6a4625f69c06
Parents: 72d621c
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 12:44:21 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 12:44:21 2015 +0800
----------------------------------------------------------------------
pom.xml.rej | 24 -------------
.../src/test/java/org/apache/storm/AppTest.java | 38 --------------------
2 files changed, 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2cef782f/pom.xml.rej
----------------------------------------------------------------------
diff --git a/pom.xml.rej b/pom.xml.rej
deleted file mode 100644
index e5ba6ec..0000000
--- a/pom.xml.rej
+++ /dev/null
@@ -1,24 +0,0 @@
---- pom.xml
-+++ pom.xml
-@@ -305,6 +305,21 @@
- <include>NOTICE</include>
- </includes>
- </resource>
-+ <resource>
-+ <directory>${basedir}/src/main/resources</directory>
-+ <excludes>
-+ <exclude>common-version-info.properties</exclude>
-+ </excludes>
-+ <filtering>false</filtering>
-+ </resource>
-+ <resource>
-+ <directory>${basedir}/src/main/resources</directory>
-+ <includes>
-+ <include>common-version-info.properties</include>
-+ </includes>
-+ <filtering>true</filtering>
-+ </resource>
-+
-
- </resources>
- <testResources>
http://git-wip-us.apache.org/repos/asf/storm/blob/2cef782f/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java b/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
deleted file mode 100644
index 56ecd53..0000000
--- a/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.storm;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}