From 19a5886c09f65a9c253c39a2d30d569fc1aa147c Mon Sep 17 00:00:00 2001 From: Maxim Muzafarov Date: Sat, 2 Apr 2022 18:16:33 +0300 Subject: [PATCH] IGNITE-16783 Move ignite-license-gen module to Ignite extensions (#9928) --- assembly/dependencies-apache-ignite-lgpl.xml | 1 - assembly/dependencies-apache-ignite-slim.xml | 1 - assembly/dependencies-apache-ignite.xml | 1 - assembly/release-yardstick.xml | 1 - modules/apache-license-gen/README.txt | 33 ------------- modules/apache-license-gen/pom.xml | 49 ------------------- .../main/resources/META-INF/licenses.txt.vm | 41 ---------------- parent/pom.xml | 8 ++- pom.xml | 1 - scripts/update-versions.sh | 5 -- 10 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 modules/apache-license-gen/README.txt delete mode 100644 modules/apache-license-gen/pom.xml delete mode 100644 modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm diff --git a/assembly/dependencies-apache-ignite-lgpl.xml b/assembly/dependencies-apache-ignite-lgpl.xml index 1554a0dd5469c..1df8f211a4c95 100644 --- a/assembly/dependencies-apache-ignite-lgpl.xml +++ b/assembly/dependencies-apache-ignite-lgpl.xml @@ -125,7 +125,6 @@ ${project.groupId}:ignite-visor-console_2.10 ${project.groupId}:ignite-visor-plugins ${project.groupId}:ignite-codegen - ${project.groupId}:ignite-apache-license-gen ${project.groupId}:ignite-appserver-test ${project.groupId}:ignite-websphere-test ${project.groupId}:ignite-cassandra diff --git a/assembly/dependencies-apache-ignite-slim.xml b/assembly/dependencies-apache-ignite-slim.xml index 094c18df8b3a3..fd28c69e919bf 100644 --- a/assembly/dependencies-apache-ignite-slim.xml +++ b/assembly/dependencies-apache-ignite-slim.xml @@ -126,7 +126,6 @@ ${project.groupId}:ignite-visor-plugins ${project.groupId}:ignite-hadoop ${project.groupId}:ignite-codegen - ${project.groupId}:ignite-apache-license-gen ${project.groupId}:ignite-hibernate-core ${project.groupId}:ignite-hibernate_4.2 ${project.groupId}:ignite-hibernate_5.1 diff --git a/assembly/dependencies-apache-ignite.xml b/assembly/dependencies-apache-ignite.xml index 872e38ff653bd..91e10334dfca7 100644 --- a/assembly/dependencies-apache-ignite.xml +++ b/assembly/dependencies-apache-ignite.xml @@ -126,7 +126,6 @@ ${project.groupId}:ignite-visor-console_2.10 ${project.groupId}:ignite-visor-plugins ${project.groupId}:ignite-codegen - ${project.groupId}:ignite-apache-license-gen ${project.groupId}:ignite-hibernate-core ${project.groupId}:ignite-hibernate_4.2 ${project.groupId}:ignite-hibernate_5.1 diff --git a/assembly/release-yardstick.xml b/assembly/release-yardstick.xml index 0bd6f412cb560..c0e3645ca1b09 100644 --- a/assembly/release-yardstick.xml +++ b/assembly/release-yardstick.xml @@ -68,7 +68,6 @@ benchmarks/libs junit-*.jar - ignite-apache-license-gen-*.jar hamcrest-core-*.jar tools-*.jar diff --git a/modules/apache-license-gen/README.txt b/modules/apache-license-gen/README.txt deleted file mode 100644 index a0c027e1b3cd6..0000000000000 --- a/modules/apache-license-gen/README.txt +++ /dev/null @@ -1,33 +0,0 @@ -Apache Ignite License Generator Module ------------------------------- - -Apache Ignite License Generator module is a custom maven resource plugin. -It generates /license/{module name}-licenses.txt file contains list of module's non transitive dependencies. -Apache Ignite binary distribution contains all non transitive dependencies of it's modules. -Set of modules included to binary distribution may vary as well as their dependencies list, versions and licenses. -Automatic generation of /license/{module name}-licenses.txt file guarantee that binary distribution gives user -actual information about licenses used by Apache Ignite's modules. - -Note that in case dependency provided under Apache License 2.0 only in will not appear inside generated file. - -To use Apache Ignite License Generator Module in your project please add following to pom.xml: - - - org.apache.maven.plugins - maven-remote-resources-plugin - - - ignite-dependencies - - process - - - - org.apache.ignite:ignite-apache-license-gen:${project.version} - - true - - - - - diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml deleted file mode 100644 index 591fb17df6e7a..0000000000000 --- a/modules/apache-license-gen/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - 4.0.0 - - - org.apache.apache.resources - apache-resource-bundles - 4 - - - org.apache.ignite - ignite-apache-license-gen - 2.13.0-SNAPSHOT - http://ignite.apache.org - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - - 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 deleted file mode 100644 index ede79606842b7..0000000000000 --- a/modules/apache-license-gen/src/main/resources/META-INF/licenses.txt.vm +++ /dev/null @@ -1,41 +0,0 @@ -## -## 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. -## -## $Id$ -## -// ------------------------------------------------------------------ -// List of #if ($projectName)$projectName#else${project.name}#end module's dependencies provided as a part of this distribution. -// ------------------------------------------------------------------ - -#foreach ( $organizationName in $projectsSortedByOrganization.keySet() ) -#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) ) -#if($project.licenses.size() > 0) -============================================================================== -For $project.name #if ($project.url)($project.url)#end $project.artifact -============================================================================== -This product bundles $project.name which is available under the following: -#foreach ( $license in $project.licenses ) -$license.name.replaceAll("[ ]{2,}"," ").replaceAll("\n",""). #if ($license.url)For details, see $license.url.replaceAll("[ ]{2,}"," ").replaceAll("\n","").#end - -#end - -#end -#end -#end - - diff --git a/parent/pom.xml b/parent/pom.xml index 9565298b41508..4bdedac273c8e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1200,10 +1200,9 @@ - ${project.groupId} + org.apache.ignite ignite-apache-license-gen - ${project.version} - test + 1.4.0 @@ -1220,8 +1219,7 @@ - ${project.groupId}:ignite-apache-license-gen:${project.version} - + org.apache.ignite:ignite-apache-license-gen:1.4.0 true diff --git a/pom.xml b/pom.xml index dd869516b512d..07ef33fcb3d17 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,6 @@ - modules/apache-license-gen modules/tools modules/core modules/compress diff --git a/scripts/update-versions.sh b/scripts/update-versions.sh index bdb4f79d8ac01..3b0826bbb72c3 100755 --- a/scripts/update-versions.sh +++ b/scripts/update-versions.sh @@ -31,10 +31,5 @@ fi echo Updating Java versions to $1 with Maven... sed -i '' -e "s/.*<\/revision>/$1<\/revision>/" ./parent/pom.xml; -#TODO remove after IGNITE-12064 -cd modules/apache-license-gen -mvn versions:set -DnewVersion=$1 -Pall-java,all-scala,all-other -DgenerateBackupPoms=false -DgroupId=* -DartifactId=* -DoldVersion=* -DprocessDependencies=false -cd ../../ - echo Updating .NET, C++ and other resources versions to $1 with Maven... mvn validate -P update-versions -D new.ignite.version=$1