ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [42/43] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111
Date Fri, 06 Feb 2015 15:38:42 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111

Conflicts:
	modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml
	modules/core/src/test/resources/load/html/index.html


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2263710f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2263710f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2263710f

Branch: refs/heads/sprint-1
Commit: 2263710f823f66238ab84339a4135f17244b9f14
Parents: f43a4e2
Author: avinogradov <avinogradov@gridgain.com>
Authored: Fri Feb 6 17:50:13 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Fri Feb 6 17:50:13 2015 +0300

----------------------------------------------------------------------
 examples/pom.xml                                   | 11 -----------
 modules/aop/pom.xml                                | 13 -------------
 modules/aws/pom.xml                                | 15 ---------------
 modules/clients/pom.xml                            | 11 -----------
 modules/core/pom.xml                               | 11 -----------
 .../core/src/test/resources/load/html/index.html   | 17 +++++++++--------
 modules/email/pom.xml                              | 15 ---------------
 modules/extdata/p2p/pom.xml                        | 11 -----------
 modules/extdata/uri/pom.xml                        | 11 -----------
 modules/geospatial/pom.xml                         | 15 ---------------
 modules/hadoop/pom.xml                             | 11 -----------
 modules/hibernate/pom.xml                          | 13 -------------
 modules/indexing/pom.xml                           | 15 ---------------
 modules/jcl/pom.xml                                | 15 ---------------
 modules/jdk8-backport/pom.xml                      | 15 ---------------
 modules/jta/pom.xml                                | 15 ---------------
 modules/log4j/pom.xml                              | 15 ---------------
 modules/rest-http/pom.xml                          | 15 ---------------
 modules/scalar/pom.xml                             | 11 -----------
 modules/schedule/pom.xml                           | 15 ---------------
 modules/schema-load/pom.xml                        | 11 -----------
 modules/slf4j/pom.xml                              | 15 ---------------
 modules/spring/pom.xml                             | 12 ------------
 modules/ssh/pom.xml                                | 15 ---------------
 modules/tools/pom.xml                              | 15 ---------------
 modules/urideploy/pom.xml                          | 15 ---------------
 modules/visor-console/pom.xml                      | 11 -----------
 modules/visor-plugins/pom.xml                      | 13 -------------
 modules/web/pom.xml                                | 15 ---------------
 pom.xml                                            | 14 +++++++++++++-
 30 files changed, 22 insertions(+), 384 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 04a0b0e..55e0eae 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -197,17 +197,6 @@
 
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index bbcbd6e..9c27483 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -101,18 +101,5 @@
                 </excludes>
             </testResource>
         </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index 9b5da94..4a2f388 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -74,19 +74,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 3e317bb..0398c50 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -96,17 +96,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index bd50894..417a488 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -159,17 +159,6 @@
 
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/core/src/test/resources/load/html/index.html
----------------------------------------------------------------------
diff --git a/modules/core/src/test/resources/load/html/index.html b/modules/core/src/test/resources/load/html/index.html
index 538d52a..820b629 100644
--- a/modules/core/src/test/resources/load/html/index.html
+++ b/modules/core/src/test/resources/load/html/index.html
@@ -13,7 +13,8 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  -->
+-->
+
 <html>
 <head>
     <meta charset="UTF-8"/>
@@ -366,14 +367,14 @@
 
                     lastEntry = entry;
 
-                    $branchList.append('<option>' + entry + '</option>');   

+                    $branchList.append('<option>' + entry + '</option>');
                 });
 
                 if (!currentBranchSeen)
                     branch = lastEntry;
 
                 $("#gg-branch").val(branch);
-                
+
                 displayCharts();
             }, 'text');
         });
@@ -392,9 +393,9 @@
             });
         }
 
-        /** 
+        /**
           * Displays Ignite load test charts.
-          * 
+          *
           * @param invCache Invalidate cache flag.
           */
         function displayCharts(invCache) {
@@ -530,7 +531,7 @@
          */
         function displayMongoCharts() {
             $.each(
-                ['Acknowledged', 'ReplicaAcknowledged', 'Unacknowledged'], 
+                ['Acknowledged', 'ReplicaAcknowledged', 'Unacknowledged'],
                 function(idx, suiteName) {
                     multiLineChart({
                         name : 'GridMongoInsertBenchmarkMultinode' + suiteName,
@@ -597,7 +598,7 @@
                             return [0, 4, 8];
                         }
                     });
-                    
+
                     multiLineChart({
                         name : 'GridMongoMixedOperationsBenchmarkGridGainMultinode' + suiteName,
                         csvFile : 'GridMongoMixedOperationsBenchmarkMultinode' + suiteName
+ '.csv',
@@ -872,7 +873,7 @@
         /**
          * Counts the difference between min and max as a
          * percentile of max.
-         * 
+         *
          * @param min Min.
          * @param max Max.
          */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/email/pom.xml
----------------------------------------------------------------------
diff --git a/modules/email/pom.xml b/modules/email/pom.xml
index 3db8f3f..50d03b9 100644
--- a/modules/email/pom.xml
+++ b/modules/email/pom.xml
@@ -48,19 +48,4 @@
             <version>1.5.2</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 03c6a62..a2f5564 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -46,17 +46,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 35aaaa0..3b5d128 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -67,17 +67,6 @@
 
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/geospatial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index 3f8b9ec..32494c8 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -56,19 +56,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 6764fec..d965e58 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -129,17 +129,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 12136a6..f9b5a71 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -107,18 +107,5 @@
                 </excludes>
             </testResource>
         </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 75930e8..bd807f9 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -68,19 +68,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 5d4f56c..fecb864 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -56,19 +56,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/jdk8-backport/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jdk8-backport/pom.xml b/modules/jdk8-backport/pom.xml
index 33f65ad..5e20be4 100644
--- a/modules/jdk8-backport/pom.xml
+++ b/modules/jdk8-backport/pom.xml
@@ -33,19 +33,4 @@
     </parent>
 
     <artifactId>jdk8-backport</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index dc12a66..e767b9f 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -70,19 +70,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 09ed713..3c7007b 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -55,19 +55,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 2ab6f0f..5d39818 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -115,19 +115,4 @@
             <version>1.8.3</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 64b0863..aaa0b4d 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -79,17 +79,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index ffae92b..dd7f309 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -56,19 +56,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/schema-load/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-load/pom.xml b/modules/schema-load/pom.xml
index 030a6e2..e1291f1 100644
--- a/modules/schema-load/pom.xml
+++ b/modules/schema-load/pom.xml
@@ -71,17 +71,6 @@
 
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 2942583..20fad24 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -48,19 +48,4 @@
             <version>1.6.4</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 53a3ef4..b102966 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -116,17 +116,5 @@
                 </excludes>
             </testResource>
         </testResources>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 68dc572..0f14a14 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -70,19 +70,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index ca30996..ef013b9 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -54,21 +54,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <!-- http://maven.apache.org/general.html#tools-jar-dependency -->
     <profiles>
         <profile>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index acdb77e..6e4c50d 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -118,19 +118,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 14e6fae..7fde2f6 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -118,17 +118,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 13d0c00..b8987d2 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -74,18 +74,5 @@
                 </excludes>
             </resource>
         </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 4eefff3..8fae0a2 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -84,19 +84,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <headerDefinitions>
-                        <headerDefinition>../../license/header-customisation.xml</headerDefinition>
-                    </headerDefinitions>
-                    <header>../../license/header.txt</header>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2263710f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf02b71..5610460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,7 +266,9 @@
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
                 <version>2.8</version>
+                <inherited>false</inherited>
                 <configuration>
+                    <aggregate>true</aggregate>
                     <mapping>
                         <scala>JAVADOC_STYLE</scala>
                     </mapping>
@@ -294,6 +296,15 @@
                         <exclude>**/*.log</exclude>
                         <exclude>**/*.sln</exclude>
                         <exclude>**/*.h</exclude>
+                        <exclude>**/*.pfx</exclude>
+                        <exclude>**/*.dylib</exclude>
+                        <exclude>**/*.ini</exclude>
+                        <exclude>**/*.gar</exclude>
+                        <exclude>**/*.tst</exclude>
+                        <exclude>**/*.brokenxml</exclude>
+                        <exclude>**/*.empty</exclude>
+                        <exclude>**/*.incorrefs</exclude>
+                        <exclude>**/*.guess</exclude>
                         <!--special excludes-->
                         <exclude>**/com/romix/scala/**</exclude>
                         <exclude>**/GridOffHeapSnapTreeMap.java</exclude>
@@ -304,11 +315,12 @@
                         <exclude>**/org/jetbrains/annotations/**</exclude>
                         <exclude>**/org/pcollections/**</exclude>
                         <exclude>**/org/jdk8/backport/**</exclude>
-                        <exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test
depends on file content-->
+                        <exclude>**/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test
depends on file content-->
                         <exclude>**/ipc/shmem/*.sh</exclude>
                         <exclude>**/keystore/generate.sh</exclude>
                         <exclude>**/pom-installed.xml</exclude>
                         <exclude>**/optimized-classnames*.properties</exclude>
+                        <exclude>**/yardstick/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>


Mime
View raw message