IGNITE-16783 Move ignite-license-gen module to Ignite extensions (apa…

…che#9928)
RapidTransit · Apr 2, 2022 · 19a5886 · 19a5886
1 parent 2cc50e5
commit 19a5886
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 138 deletions.
diff --git a/assembly/dependencies-apache-ignite-lgpl.xml b/assembly/dependencies-apache-ignite-lgpl.xml
@@ -125,7 +125,6 @@
                 <exclude>${project.groupId}:ignite-visor-console_2.10</exclude>
                 <exclude>${project.groupId}:ignite-visor-plugins</exclude>
                 <exclude>${project.groupId}:ignite-codegen</exclude>
-                <exclude>${project.groupId}:ignite-apache-license-gen</exclude>
                 <exclude>${project.groupId}:ignite-appserver-test</exclude>
                 <exclude>${project.groupId}:ignite-websphere-test</exclude>
                 <exclude>${project.groupId}:ignite-cassandra</exclude>

diff --git a/assembly/dependencies-apache-ignite-slim.xml b/assembly/dependencies-apache-ignite-slim.xml
@@ -126,7 +126,6 @@
                 <exclude>${project.groupId}:ignite-visor-plugins</exclude>
                 <exclude>${project.groupId}:ignite-hadoop</exclude>
                 <exclude>${project.groupId}:ignite-codegen</exclude>
-                <exclude>${project.groupId}:ignite-apache-license-gen</exclude>
                 <exclude>${project.groupId}:ignite-hibernate-core</exclude>
                 <exclude>${project.groupId}:ignite-hibernate_4.2</exclude>
                 <exclude>${project.groupId}:ignite-hibernate_5.1</exclude>

diff --git a/assembly/dependencies-apache-ignite.xml b/assembly/dependencies-apache-ignite.xml
@@ -126,7 +126,6 @@
                 <exclude>${project.groupId}:ignite-visor-console_2.10</exclude>
                 <exclude>${project.groupId}:ignite-visor-plugins</exclude>
                 <exclude>${project.groupId}:ignite-codegen</exclude>
-                <exclude>${project.groupId}:ignite-apache-license-gen</exclude>
                 <exclude>${project.groupId}:ignite-hibernate-core</exclude>
                 <exclude>${project.groupId}:ignite-hibernate_4.2</exclude>
                 <exclude>${project.groupId}:ignite-hibernate_5.1</exclude>

diff --git a/assembly/release-yardstick.xml b/assembly/release-yardstick.xml
@@ -68,7 +68,6 @@
             <outputDirectory>benchmarks/libs</outputDirectory>
             <excludes>
                 <exclude>junit-*.jar</exclude>
-                <exclude>ignite-apache-license-gen-*.jar</exclude>
                 <exclude>hamcrest-core-*.jar</exclude>
                 <exclude>tools-*.jar</exclude>
             </excludes>

diff --git a/modules/apache-license-gen/README.txt b/modules/apache-license-gen/README.txt
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
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
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -1200,10 +1200,9 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>${project.groupId}</groupId>
+                    <groupId>org.apache.ignite</groupId>
                     <artifactId>ignite-apache-license-gen</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope><!-- hack to have ignite-apache-license-gen at first place at mvn reactor -->
+                    <version>1.4.0</version>
                 </dependency>
             </dependencies>
 
@@ -1220,8 +1219,7 @@
                                 </goals>
                                 <configuration>
                                     <resourceBundles>
-                                        <resourceBundle>${project.groupId}:ignite-apache-license-gen:${project.version}
-                                        </resourceBundle>
+                                        <resourceBundle>org.apache.ignite:ignite-apache-license-gen:1.4.0</resourceBundle>
                                     </resourceBundles>
                                     <excludeTransitive>true</excludeTransitive>
                                 </configuration>

diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,6 @@
     </scm>
 
     <modules>
-        <module>modules/apache-license-gen</module>
         <module>modules/tools</module>
         <module>modules/core</module>
         <module>modules/compress</module>

diff --git 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>.*<\/revision>/<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