You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2021/03/15 10:04:14 UTC
[ignite-3] branch ignite-14315 created (now c14637b)
This is an automated email from the ASF dual-hosted git repository.
agoncharuk pushed a change to branch ignite-14315
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
at c14637b IGNITE-14315 Use maven-flatten-plugin
This branch includes the following new commits:
new c14637b IGNITE-14315 Use maven-flatten-plugin
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite-3] 01/01: IGNITE-14315 Use maven-flatten-plugin
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
agoncharuk pushed a commit to branch ignite-14315
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit c14637bb9bf855e05cd85d38d037ae6cc27210d9
Author: Peter Ivanov <mr...@gmail.com>
AuthorDate: Thu Mar 11 18:22:01 2021 +0300
IGNITE-14315 Use maven-flatten-plugin
---
.gitignore | 1 +
parent/pom.xml | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++------
pom.xml | 83 ---------------------------------
3 files changed, 132 insertions(+), 97 deletions(-)
diff --git a/.gitignore b/.gitignore
index c3484a1..457eacc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.iml
target
.DS_Store
+.flattened-pom.xml
diff --git a/parent/pom.xml b/parent/pom.xml
index 3af2fbf..925ed4b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,6 +84,7 @@
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
<maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
+ <maven.flatten.plugin.version>1.2.2</maven.flatten.plugin.version>
<maven.pmd.plugin.version>3.14.0</maven.pmd.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
@@ -357,23 +358,18 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven.pmd.plugin.version}</version>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${maven.flatten.plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <rulesets>
- <ruleset>${project.basedir}/check-rules/pmd-rules.xml</ruleset>
- </rulesets>
- </configuration>
- </plugin>
-
<!--
- Plugin that adds integration test sources and resources from integrationTest directory.
+ Plugin that adds integration test sources and resources from integrationTest directory.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -409,7 +405,7 @@
</plugin>
<!--
- Plugin for unit testing.
+ Plugin for unit testing.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -422,7 +418,7 @@
</plugin>
<!--
- Plugin for integration testing.
+ Plugin for integration testing.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -437,6 +433,127 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ Plugin for flattening installed pom
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+
+ <executions>
+ <!-- enable flattening -->
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+
+ <!-- ensure proper cleanup before start -->
+ <execution>
+ <id>flatten.clean.before</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ This plugin is used to check the code for coding guidelines
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <sourceDirectories>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+ </sourceDirectories>
+ <consoleOutput>true</consoleOutput>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failsOnError>true</failsOnError>
+ <failOnViolation>true</failOnViolation>
+ <outputFile>${project.build.directory}/checkstyle.xml</outputFile>
+ <configLocation>${project.basedir}/check-rules/checkstyle-rules.xml</configLocation>
+ <suppressionsLocation>${project.basedir}/check-rules/checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/generated/**/*</excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.puppycrawl.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <!--
+ This plugin is used for checking that all files in project are compliant with target licenses headers.
+ Exclusions are possible, but every exclusion should have it's own motivated comment and/or issue key.
+ -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <addDefaultLicenseMatchers>true</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>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>**/target/**</exclude> <!-- All generated files -->
+ <exclude>**/*.md</exclude> <!-- Markdown files -->
+ <exclude>docs/assets/images/**</exclude> <!-- SVG images are XML files, but they cannot have license header -->
+ <exclude>docs/assets/js/anchor.min.js</exclude> <!-- Distributed under the MIT license. The original license header is badly formatted -->
+ <exclude>**/*.json</exclude> <!-- Files in JSON format -->
+ <exclude>modules/cli/src/**/resources//builtin_modules.conf</exclude> <!-- CLI configuration files -->
+ <exclude>modules/configuration-annotation-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude> <!-- ? -->
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!--
+ Plugin for static code analysis
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <rulesets>
+ <ruleset>${project.basedir}/check-rules/pmd-rules.xml</ruleset>
+ </rulesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index ade1018..86a51b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,87 +42,4 @@
<module>modules/runner</module>
<module>modules/network</module>
</modules>
-
- <build>
- <plugins>
- <!--
- This plugin is used for checking that all files in project are compliant with target licenses headers.
- Exclusions are possible, but every exclusion should have it's own motivated comment and/or issue key.
- -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <addDefaultLicenseMatchers>true</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>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>**/target/**</exclude> <!-- All generated files -->
- <exclude>**/*.md</exclude> <!-- Markdown files -->
- <exclude>docs/assets/images/**</exclude> <!-- SVG images are XML files, but they cannot have license header -->
- <exclude>docs/assets/js/anchor.min.js</exclude> <!-- Distributed under the MIT license. The original license header is badly formatted -->
- <exclude>**/*.json</exclude> <!-- Files in JSON format -->
- <exclude>modules/cli/src/**/resources//builtin_modules.conf</exclude> <!-- CLI configuration files -->
- <exclude>modules/configuration-annotation-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude> <!-- ? -->
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <!--
- This plugin is used to check the code for coding guidelines
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <sourceDirectories>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
- <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
- </sourceDirectories>
- <consoleOutput>true</consoleOutput>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failsOnError>true</failsOnError>
- <failOnViolation>true</failOnViolation>
- <outputFile>${project.build.directory}/checkstyle.xml</outputFile>
- <configLocation>${project.basedir}/check-rules/checkstyle-rules.xml</configLocation>
- <suppressionsLocation>${project.basedir}/check-rules/checkstyle-suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/generated/**/*</excludes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${checkstyle.puppycrawl.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
</project>