ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-2' into gg-release-test-no-mod
Date Thu, 12 Mar 2015 09:30:51 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-2' into gg-release-test-no-mod

Conflicts:
	parent/pom.xml
	pom.xml

Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-release-test-no-mod

Conflicts:
	modules/core/pom.xml
	pom.xml


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

Branch: refs/heads/ignite-release-test-no-mod
Commit: 033826b91c76e2be2a4abfdc38f427014fe719d9
Parents: 1e58da0
Author: avinogradov <avinogradov@gridgain.com>
Authored: Wed Mar 11 18:01:31 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Wed Mar 11 18:01:31 2015 +0300

----------------------------------------------------------------------
 modules/core/pom.xml   |  2 +-
 modules/scalar/pom.xml |  2 +-
 parent/pom.xml         | 41 +++++++++++++++++++++++++++++++++++++----
 pom.xml                |  6 +++---
 4 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/033826b9/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c722708..4bf74b2 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -171,7 +171,7 @@
                     <dependency>
                         <groupId>org.apache.ignite</groupId>
                         <artifactId>ignite-tools</artifactId>
-                        <version>RELEASE</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/033826b9/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 914345a..0e05e9c 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>
-            <version>${ignite.version}</version>
+            <version>1.0.0-RELEASE-TEST-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/033826b9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d82a17c..d7a25c1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -279,7 +279,7 @@
                                 <tagletArtifact>
                                     <groupId>org.apache.ignite</groupId>
                                     <artifactId>ignite-tools</artifactId>
-                                    <version>RELEASE</version>
+                                    <version>${project.version}</version>
                                 </tagletArtifact>
                             </taglet>
                         </taglets>
@@ -597,6 +597,36 @@
                         <groupId>org.apache.rat</groupId>
                         <artifactId>apache-rat-plugin</artifactId>
                         <version>0.11</version>
+                        <configuration>
+                            <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+                            <licenses>
+                                <license implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
+                                    <licenseFamilyCategory>IAL20</licenseFamilyCategory>
+                                    <licenseFamilyName>Ignite Apache License 2.0</licenseFamilyName>
+                                    <fullText>
+                                        Licensed to the Apache Software Foundation (ASF)
under one or more
+                                        contributor license agreements.  See the NOTICE file
distributed with
+                                        this work for additional information regarding copyright
ownership.
+                                        The ASF licenses this file to You under the Apache
License, Version 2.0
+                                        (the "License"); you may not use this file except
in compliance with
+                                        the License.  You may obtain a copy of the License
at
+
+                                        http://www.apache.org/licenses/LICENSE-2.0
+
+                                        Unless required by applicable law or agreed to in
writing, software
+                                        distributed under the License is distributed on an
"AS IS" BASIS,
+                                        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.
+                                    </fullText>
+                                </license>
+                            </licenses>
+                            <licenseFamilies>
+                                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                                    <familyName>Ignite Apache License 2.0</familyName>
+                                </licenseFamily>
+                            </licenseFamilies>
+                        </configuration>
                         <executions>
                             <execution>
                                 <phase>validate</phase>
@@ -626,23 +656,26 @@
                                         <exclude>src/main/java/org/pcollections/**</exclude><!--own
license-->
                                         <exclude>src/main/java/org/jdk8/backport/*.java</exclude><!--own
license-->
                                         <exclude>src/test/java/org/apache/ignite/p2p/p2p.properties</exclude><!--test
depends on file content-->
-                                        <exclude>src/test/config/start-nodes.ini</exclude>
+                                        <exclude>src/test/resources/log/ignite.log.tst</exclude><!--test
resource-->
+                                        <exclude>src/test/config/start-nodes.ini</exclude><!---->
                                         <exclude>src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/ignite.incorrefs</exclude><!--test
resource-->
                                         <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/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot
be changed-->
+                                        <exclude>src/main/java/org/jetbrains/annotations/*.java</exclude><!--copyright-->
                                         <exclude>src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot
be changed-->
                                         <exclude>modules/winservice/IgniteService.sln</exclude>
                                         <exclude>modules/winservice/IgniteService/IgniteService.csproj</exclude>
                                         <!--shmem-->
                                         <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto
generated files-->
                                         <exclude>ipc/shmem/**/Makefile</exclude><!--auto
generated files-->
-                                        <exclude>ipc/shmem/compile</exclude>
+                                        <exclude>ipc/shmem/compile</exclude><!---->
                                         <exclude>ipc/shmem/config.guess</exclude><!--own
license-->
                                         <exclude>ipc/shmem/config.sub</exclude><!--own
license-->
                                         <exclude>ipc/shmem/configure</exclude><!--own
license-->
-                                        <exclude>ipc/shmem/configure.ac</exclude>
+                                        <exclude>ipc/shmem/config.h.in</exclude><!--auto
generated-->
+                                        <exclude>ipc/shmem/configure.ac</exclude><!---->
                                         <exclude>ipc/shmem/ltmain.sh</exclude><!--own
license-->
                                         <exclude>ipc/shmem/install-sh</exclude><!--own
license-->
                                         <exclude>ipc/shmem/depcomp</exclude><!--own
license-->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/033826b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aeae9d7..7769ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,13 +43,13 @@
     </scm>
 
     <modules>
+        <module>modules/tools</module>
         <module>modules/core</module>
         <module>modules/hadoop</module>
         <module>modules/extdata/p2p</module>
         <module>modules/extdata/uri</module>
         <module>modules/clients</module>
         <module>examples</module>
-        <module>modules/tools</module>
         <module>modules/spring</module>
         <module>modules/hibernate</module>
         <module>modules/web</module>
@@ -172,7 +172,7 @@
                             <dependency>
                                 <groupId>org.apache.ignite</groupId>
                                 <artifactId>ignite-tools</artifactId>
-                                <version>RELEASE</version>
+                                <version>${project.version}</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -462,7 +462,7 @@
                             <dependency>
                                 <groupId>org.apache.ignite</groupId>
                                 <artifactId>ignite-tools</artifactId>
-                                <version>RELEASE</version>
+                                <version>${project.version}</version>
                             </dependency>
                         </dependencies>
                         <executions>


Mime
View raw message