Merge remote-tracking branch 'remotes/origin/master' into ignite-1067
Conflicts:
modules/rest-http/pom.xml
modules/web/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/a1e7d11b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1e7d11b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1e7d11b
Branch: refs/heads/ignite-901
Commit: a1e7d11bdc36957c0f5dcd42daa36aeb54ba4358
Parents: deb0ab3
Author: Anton <avinogra...@gridgain.com>
Authored: Tue Jul 7 13:59:59 2015 +0300
Committer: Anton <avinogra...@gridgain.com>
Committed: Tue Jul 7 13:59:59 2015 +0300
----------------------------------------------------------------------
.../src/main/resources/META-INF/licenses.txt.vm | 6 +++---
parent/pom.xml | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1e7d11b/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm
----------------------------------------------------------------------
diff --git
a/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm
b/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm
index 5d812e3..32c6c09 100644
--- a/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm
+++ b/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm
@@ -24,15 +24,15 @@
// ------------------------------------------------------------------
#foreach ( $organizationName in $projectsSortedByOrganization.keySet() )
#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) )
-##if($project.licenses.size() == 1 &&
$project.licenses.get(0).name.contains("Apache Software License"))#else
+#if($project.licenses.size() == 1 &&
$project.licenses.get(0).url.contains("www.apache.org/licenses/LICENSE-2.0") &&
!$project.licenses.get(0).url.contains("and"))#else
- $project.name #if ($project.url)($project.url)#end $project.artifact
#foreach ( $license in $project.licenses )
License: $license.name #if ($license.url) ($license.url)#end
+
#end
#if ($project.licenses.size() == 0) No licenses.#end
-
-##end
+#end
#end
#end
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1e7d11b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8724fa4..43e7607 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -585,7 +585,6 @@
<resourceBundle>org.apache.ignite:ignite-apache-license-gen:${project.version}</resourceBundle>
</resourceBundles>
<excludeTransitive>true</excludeTransitive>
-
<excludeGroupIds>org.apache</excludeGroupIds>
</configuration>
</execution>
</executions>
