ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/13] incubator-ignite git commit: ignite-471: revert 8a6dd007d79e6bd62fb288f1c38310860949ca45
Date Mon, 18 May 2015 09:14:19 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala
index 992ff7f..c0983c0 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala
@@ -24,19 +24,19 @@ import org.apache.ignite.visor.commands.node.VisorNodeCommand._
  * Unit test for 'node' command.
  */
 class VisorNodeCommandSpec extends VisorRuntimeBaseSpec(1) {
-    behavior of "A 'node' visor command"
+    describe("A 'node' visor command") {
+        it("should properly execute with valid node ID") {
+            visor.node("-id8=@n1")
+        }
 
-    it should "properly execute with valid node ID" in {
-        visor.node("-id8=@n1")
-    }
-
-    it should "print the error message for invalid node ID" in {
-        visor.node("-id8=zeee")
-    }
+        it("should print the error message for invalid node ID") {
+            visor.node("-id8=zeee")
+        }
 
-    it should "print error message when not connected" in {
-        closeVisorQuiet()
+        it("should print error message when not connected") {
+            closeVisorQuiet()
 
-        visor.node("") // Arguments are ignored.
+            visor.node("") // Arguments are ignored.
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
index 786d04e..4cf2204 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala
@@ -24,15 +24,15 @@ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor}
  * Unit test for 'open' command.
  */
 class VisorOpenCommandSpec extends VisorRuntimeBaseSpec(3) {
-    behavior of "A 'open' visor command"
-
-    it should "properly connect using default configuration" in {
-        visor.mlist()
-    }
+    describe("A 'open' visor command") {
+        it("should properly connect using default configuration") {
+            visor.mlist()
+        }
 
-    it should "print error message when already connected" in {
-        intercept[IgniteException] {
-            openVisor()
+        it("should print error message when already connected") {
+            intercept[IgniteException] {
+                openVisor()
+            }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala
index dde5f18..06e3a22 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala
@@ -24,15 +24,15 @@ import org.apache.ignite.visor.commands.ping.VisorPingCommand._
  * Unit test for 'ping' command.
  */
 class VisorPingCommandSpec extends VisorRuntimeBaseSpec(2) {
-    behavior of "A 'ping' visor command"
+    describe("A 'ping' visor command") {
+        it("should properly execute") {
+            visor.ping()
+        }
 
-    it should "properly execute" in {
-        visor.ping()
-    }
-
-    it should "print error message when not connected" in {
-        closeVisorQuiet()
+        it("should print error message when not connected") {
+            closeVisorQuiet()
 
-        visor.ping()
+            visor.ping()
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala
index 1a451c4..c6404b5 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala
@@ -26,7 +26,7 @@ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._
 /**
  * Unit test for 'start' command.
  */
-class VisorStartCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAll {
+class VisorStartCommandSpec extends FunSpec with Matchers with BeforeAndAfterAll {
     override def beforeAll() {
         visor.open("-d")
     }
@@ -35,89 +35,89 @@ class VisorStartCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAl
         visor.close()
     }
 
-    behavior of "A 'start' visor command"
+    describe("A 'start' visor command") {
+        it("should should start one new node") {
+            visor.start("-h=192.168.1.103 -r -p=password")
+        }
 
-    it should "should start one new node" in {
-        visor.start("-h=192.168.1.103 -r -p=password")
-    }
+        it("should should start two nodes") {
+            visor.start("-h=uname:passwd@localhost -n=2")
+        }
 
-    it should "should start two nodes" in {
-        visor.start("-h=uname:passwd@localhost -n=2")
-    }
+        it("should print error message with invalid port number") {
+            visor.start("-h=localhost:x -p=passwd")
+        }
 
-    it should "print error message with invalid port number" in {
-        visor.start("-h=localhost:x -p=passwd")
-    }
+        it("should print error message with zero port number") {
+            visor.start("-h=localhost:0 -p=passwd")
+        }
 
-    it should "print error message with zero port number" in {
-        visor.start("-h=localhost:0 -p=passwd")
-    }
+        it("should print error message with negative port number") {
+            visor.start("-h=localhost:-1 -p=passwd")
+        }
 
-    it should "print error message with negative port number" in {
-        visor.start("-h=localhost:-1 -p=passwd")
-    }
+        it("should print error message with invalid nodes count") {
+            visor.start("-h=localhost#x -p=passwd")
+        }
 
-    it should "print error message with invalid nodes count" in {
-        visor.start("-h=localhost#x -p=passwd")
-    }
+        it("should print error message with zero nodes count") {
+            visor.start("-h=localhost#0 -p=passwd")
+        }
 
-    it should "print error message with zero nodes count" in {
-        visor.start("-h=localhost#0 -p=passwd")
-    }
+        it("should print error message with negative nodes count") {
+            visor.start("-h=localhost#-1 -p=passwd")
+        }
 
-    it should "print error message with negative nodes count" in {
-        visor.start("-h=localhost#-1 -p=passwd")
-    }
+        it("should print error message with incorrect host") {
+            visor.start("-h=incorrect -p=passwd")
+        }
 
-    it should "print error message with incorrect host" in {
-        visor.start("-h=incorrect -p=passwd")
-    }
+        it("should print error message with incorrect username") {
+            visor.start("-h=incorrect@localhost -p=passwd")
+        }
 
-    it should "print error message with incorrect username" in {
-        visor.start("-h=incorrect@localhost -p=passwd")
-    }
+        it("should print error message with incorrect password") {
+            visor.start("-h=uname:incorrect@localhost")
+        }
 
-    it should "print error message with incorrect password" in {
-        visor.start("-h=uname:incorrect@localhost")
-    }
+        it("should print error message with nonexistent script path") {
+            visor.start("-h=uname:passwd@localhost -s=incorrect")
+        }
 
-    it should "print error message with nonexistent script path" in {
-        visor.start("-h=uname:passwd@localhost -s=incorrect")
-    }
+        it("should print error message with incorrect script path") {
+            visor.start("-h=uname:passwd@localhost -s=bin/readme.txt")
+        }
 
-    it should "print error message with incorrect script path" in {
-        visor.start("-h=uname:passwd@localhost -s=bin/readme.txt")
-    }
+        it("should print error message with nonexistent config path") {
+            visor.start("-h=uname:passwd@localhost -c=incorrect")
+        }
 
-    it should "print error message with nonexistent config path" in {
-        visor.start("-h=uname:passwd@localhost -c=incorrect")
-    }
+        it("should print error message with incorrect config path") {
+            visor.start("-h=uname:passwd@localhost -c=bin/readme.txt")
+        }
 
-    it should "print error message with incorrect config path" in {
-        visor.start("-h=uname:passwd@localhost -c=bin/readme.txt")
-    }
+        it("should start one node") {
+            visor.start("-h=uname:passwd@localhost")
 
-    it should "start one node" in {
-        visor.start("-h=uname:passwd@localhost")
+            visor.top()
+        }
 
-        visor.top()
-    }
-
-    it should "start one node on host identified by IP" in {
-        visor.start("-h=uname:passwd@127.0.0.1")
+        it("should start one node on host identified by IP") {
+            visor.start("-h=uname:passwd@127.0.0.1")
 
-        visor.top()
-    }
+            visor.top()
+        }
 
-    it should "start two nodes" in {
-        visor.start("-h=uname:passwd@localhost#2")
+        it("should start two nodes") {
+            visor.start("-h=uname:passwd@localhost#2")
 
-        visor.top()
-    }
+            visor.top()
+        }
 
-    it should "restart 4 nodes" in {
-        visor.start("-h=uname:passwd@localhost#4 -r")
+        it("should restart 4 nodes") {
+            visor.start("-h=uname:passwd@localhost#4 -r")
 
-        visor.top()
+            visor.top()
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
index 320a6bb..db07543 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
@@ -34,7 +34,7 @@ import scala.collection._
 /**
  * Unit test for 'tasks' command.
  */
-class VisorTasksCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAll {
+class VisorTasksCommandSpec extends FunSpec with Matchers with BeforeAndAfterAll {
     /**
      * Open visor and execute several tasks before all tests.
      */
@@ -103,78 +103,78 @@ class VisorTasksCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAl
         Ignition.stopAll(false)
     }
 
-    behavior of "A 'tasks' visor command"
-
-    it should "print tasks when called w/o arguments" in {
-        visor.tasks()
-    }
+    describe("A 'tasks' visor command") {
+        it("should print tasks when called w/o arguments") {
+            visor.tasks()
+        }
 
-    it should "print error message with incorrect argument" in {
-        visor.tasks("-xx")
-    }
+        it("should print error message with incorrect argument") {
+            visor.tasks("-xx")
+        }
 
-    it should "print task summary when called for specific task" in {
-        visor.tasks("-n=@t1")
-    }
+        it("should print task summary when called for specific task") {
+            visor.tasks("-n=@t1")
+        }
 
-    it should "print execution when called for specific execution" in {
-        visor.tasks("-e=@e1")
-    }
+        it("should print execution when called for specific execution") {
+            visor.tasks("-e=@e1")
+        }
 
-    it should "print all tasks" in {
-        visor.tasks("-l")
-    }
+        it("should print all tasks") {
+            visor.tasks("-l")
+        }
 
-    it should "print all tasks and executions" in {
-        visor.tasks("-l -a")
-    }
+        it("should print all tasks and executions") {
+            visor.tasks("-l -a")
+        }
 
-    it should "print tasks that started during last 5 seconds" in {
-        visor.tasks("-l -t=5s")
-    }
+        it("should print tasks that started during last 5 seconds") {
+            visor.tasks("-l -t=5s")
+        }
 
-    it should "print error message about invalid time period" in {
-        visor.tasks("-l -t=x2s")
-    }
+        it("should print error message about invalid time period") {
+            visor.tasks("-l -t=x2s")
+        }
 
-    it should "print error message about negative time period" in {
-        visor.tasks("-l -t=-10s")
-    }
+        it("should print error message about negative time period") {
+            visor.tasks("-l -t=-10s")
+        }
 
-    it should "print error message about invalid time period specification" in {
-        visor.tasks("-l -t=10x")
-    }
+        it("should print error message about invalid time period specification") {
+            visor.tasks("-l -t=10x")
+        }
 
-    it should "print task summary for the first task" in {
-        visor.tasks("-n=TestTask1")
-    }
+        it("should print task summary for the first task") {
+            visor.tasks("-n=TestTask1")
+        }
 
-    it should "print task summary and executions for the first task" in {
-        visor.tasks("-n=TestTask1 -a")
-    }
+        it("should print task summary and executions for the first task") {
+            visor.tasks("-n=TestTask1 -a")
+        }
 
-    it should "print list of tasks grouped by nodes" in {
-        visor.tasks("-g")
-    }
+        it("should print list of tasks grouped by nodes") {
+            visor.tasks("-g")
+        }
 
-    it should "print list of tasks that started during last 5 minutes grouped by nodes" in
{
-        visor.tasks("-g -t=5m")
-    }
+        it("should print list of tasks that started during last 5 minutes grouped by nodes")
{
+            visor.tasks("-g -t=5m")
+        }
 
-    it should "print list of tasks grouped by hosts" in {
-        visor.tasks("-h")
-    }
+        it("should print list of tasks grouped by hosts") {
+            visor.tasks("-h")
+        }
 
-    it should "print list of tasks that started during last 5 minutes grouped by hosts" in
{
-        visor.tasks("-h -t=5m")
-    }
+        it("should print list of tasks that started during last 5 minutes grouped by hosts")
{
+            visor.tasks("-h -t=5m")
+        }
 
-    it should "print list of tasks filtered by substring" in {
-        visor.tasks("-s=TestTask")
-    }
+        it("should print list of tasks filtered by substring") {
+            visor.tasks("-s=TestTask")
+        }
 
-    it should "print list of tasks and executions filtered by substring" in {
-        visor.tasks("-s=TestTask -a")
+        it("should print list of tasks and executions filtered by substring") {
+            visor.tasks("-s=TestTask -a")
+        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala
index 3a3b6e5..515cf67 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala
@@ -24,39 +24,39 @@ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._
  * Unit test for topology commands.
  */
 class VisorTopologyCommandSpec extends VisorRuntimeBaseSpec(2) {
-    behavior of "A 'top' visor command"
+    describe("A 'top' visor command") {
+        it("should advise to connect") {
+            closeVisorQuiet()
 
-    it should "advise to connect" in {
-        closeVisorQuiet()
+            visor.top()
+        }
 
-        visor.top()
-    }
-
-    it should "print error message" in {
-        visor.top("-cc=eq1x")
-    }
+        it("should print error message") {
+            visor.top("-cc=eq1x")
+        }
 
-    it should "print full topology" in {
-        visor.top()
-    }
+        it("should print full topology") {
+            visor.top()
+        }
 
-    it should "print nodes with idle time greater than 12000ms" in {
-        visor.top("-it=gt12000")
-    }
+        it("should print nodes with idle time greater than 12000ms") {
+            visor.top("-it=gt12000")
+        }
 
-    it should "print nodes with idle time greater than 12sec" in {
-        visor.top("-it=gt12s")
-    }
+        it("should print nodes with idle time greater than 12sec") {
+            visor.top("-it=gt12s")
+        }
 
-    it should "print full information about all nodes" in {
-        visor.top("-a")
-    }
+        it("should print full information about all nodes") {
+            visor.top("-a")
+        }
 
-    it should "print information about nodes on localhost" in {
-        visor.top("-h=192.168.1.100")
-    }
+        it("should print information about nodes on localhost") {
+            visor.top("-h=192.168.1.100")
+        }
 
-    it should "print full information about nodes on localhost" in {
-        visor.top("-h=localhost")
+        it("should print full information about nodes on localhost") {
+            visor.top("-h=localhost")
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala
index 969fb94..1a4bc3e 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala
@@ -25,22 +25,22 @@ import org.apache.ignite.visor.commands.vvm.VisorVvmCommand._
 /**
  * Unit test for 'vvm' command.
  */
-class VisorVvmCommandSpec extends FlatSpec with Matchers {
-    behavior of "A 'vvm' visor command"
+class VisorVvmCommandSpec extends FunSpec with Matchers {
+    describe("A 'vvm' visor command") {
+        it("should print error message when not connected") {
+            visor.vvm()
+        }
 
-    it should "print error message when not connected" in {
-        visor.vvm()
-    }
-
-    it should "open VisualVM connected to all nodes skipping ones with disabled JMX" in {
-        visor.open("-d")
-        visor.vvm()
-        visor.close()
-    }
+        it("should open VisualVM connected to all nodes skipping ones with disabled JMX")
{
+            visor.open("-d")
+            visor.vvm()
+            visor.close()
+        }
 
-    it should "open VisualVM connected to first node if it has JMX enabled" in {
-        visor.open("-d")
-        visor.vvm("-id8=@n1")
-        visor.close()
+        it("should open VisualVM connected to first node if it has JMX enabled") {
+            visor.open("-d")
+            visor.vvm("-id8=@n1")
+            visor.close()
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 661b310..cd098d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -619,6 +619,7 @@
                                         <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
                                         <!--special excludes-->
                                         <exclude>DEVNOTES.txt</exclude>
+                                        <exclude>DEPENDENCIES</exclude><!--automatically
generated file. presents at source pack-->
                                         <exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD
license-->
                                         <exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD
license-->
                                         <exclude>src/main/java/org/jsr166/*.java</exclude>
@@ -628,6 +629,7 @@
                                         <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.empty</exclude><!--should
be empty-->
                                         <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.brokenxml</exclude><!--test
resource-->
                                         <exclude>src/test/java/org/apache/ignite/internal/processors/hadoop/books/*.txt</exclude><!--books
examples-->
+                                        <exclude>src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books
examples-->
                                         <exclude>examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt</exclude><!--books
examples-->
                                         <exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot
be changed-->
                                         <exclude>src/main/java/org/jetbrains/annotations/*.java</exclude><!--copyright-->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9433882d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5a9e5d..8886c8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <ignite.site>scp://localhost:/home</ignite.site>
-        <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
         <!--fix <attachartifact>...< /> at apache-release profile if changed-->
         <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
     </properties>
@@ -49,13 +47,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <site>
-            <id>ignite-site</id>
-            <url>${ignite.site}/${ignite.site.folder}</url>
-        </site>
-    </distributionManagement>
-
     <modules>
         <module>modules/tools</module>
         <module>modules/core</module>
@@ -122,26 +113,6 @@
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>clean</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>libs</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.7</version>
                         <inherited>false</inherited>
@@ -275,7 +246,7 @@
                                         </replaceregexp>
 
                                         <replaceregexp byline="true">
-                                            <regexp pattern="\. &quot;\$\{SCRIPTS_HOME\}&quot;/include/target-classpath.sh(\s*#.*)?"
/>
+                                            <regexp pattern="\. &quot;\$\{SCRIPTS_HOME\}&quot;/include/build-classpath.sh(\s*#.*)?"
/>
                                             <substitution expression="" />
                                             <fileset dir="${basedir}/target/release-package/bin">
                                                 <include name="**/*.sh" />
@@ -283,7 +254,7 @@
                                         </replaceregexp>
 
                                         <replaceregexp byline="true">
-                                            <regexp pattern="call &quot;%SCRIPTS_HOME%\\include\\target-classpath.bat&quot;(\s*&amp;::.*)?"
/>
+                                            <regexp pattern="call &quot;%SCRIPTS_HOME%\\include\\build-classpath.bat&quot;(\s*&amp;::.*)?"
/>
                                             <substitution expression="" />
                                             <fileset dir="${basedir}/target/release-package/bin">
                                                 <include name="**/*.bat" />
@@ -320,6 +291,8 @@
                                             <substitution expression="${project.version}"
/>
                                         </replaceregexp>
 
+                                        <chmod dir="${basedir}/target/release-package"
perm="755" includes="**/*.sh"/>
+
                                         <zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip"
encoding="UTF-8">
                                             <zipfileset dir="${basedir}/target/release-package"
prefix="${ignite.zip.pattern}" filemode="755">
                                                 <include name="**/*.sh" />
@@ -593,36 +566,12 @@
                                                 <include name="**/*" />
                                             </fileset>
                                         </copy>
-                                        <copy file="${basedir}/KEYS" todir="${basedir}/target/site"
/>
+                                        <copy file="${basedir}/KEYS" todir="${basedir}/target/site"
failonerror="false"/>
                                     </target>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-site-plugin</artifactId>
-                        <version>3.4</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.wagon</groupId>
-                                <artifactId>wagon-ssh</artifactId>
-                                <version>2.8</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>deploy</goal>
-                                </goals>
-                                <phase>deploy</phase>
-                                <configuration>
-                                    <inputDirectory>${basedir}/target/site</inputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -740,4 +689,28 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>libs</directory>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>


Mime
View raw message