You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2022/11/29 14:47:26 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-30216] Improve code quality by standardising tab/spaces in pom files
This is an automated email from the ASF dual-hosted git repository.
mbalassi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 80e5f3f4 [FLINK-30216] Improve code quality by standardising tab/spaces in pom files
80e5f3f4 is described below
commit 80e5f3f4add50355de6964c1466ba558d46bc79d
Author: darenwkt <10...@users.noreply.github.com>
AuthorDate: Tue Nov 29 14:47:20 2022 +0000
[FLINK-30216] Improve code quality by standardising tab/spaces in pom files
---
examples/flink-sql-runner-example/pom.xml | 220 +++++++++++++++---------------
pom.xml | 209 ++++++++++++++++------------
2 files changed, 228 insertions(+), 201 deletions(-)
diff --git a/examples/flink-sql-runner-example/pom.xml b/examples/flink-sql-runner-example/pom.xml
index 60002810..11297f01 100644
--- a/examples/flink-sql-runner-example/pom.xml
+++ b/examples/flink-sql-runner-example/pom.xml
@@ -17,123 +17,123 @@ specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-kubernetes-operator-parent</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-kubernetes-operator-parent</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
- <artifactId>flink-sql-runner-example</artifactId>
- <name>Flink SQL Runner Example</name>
+ <artifactId>flink-sql-runner-example</artifactId>
+ <name>Flink SQL Runner Example</name>
- <!-- Given that this is an example skip maven deployment -->
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- </properties>
+ <!-- Given that this is an example skip maven deployment -->
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
- <dependencies>
- <!-- Apache Flink dependencies -->
- <!-- These dependencies are provided, because they should not be packaged into the JAR file. -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <!-- Apache Flink dependencies -->
+ <!-- These dependencies are provided, because they should not be packaged into the JAR file. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Add connector dependencies here. They must be in the default scope (compile). -->
+ <!-- Add connector dependencies here. They must be in the default scope (compile). -->
- <!-- Example:
+ <!-- Example:
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka</artifactId>
- <version>${flink.version}</version>
- </dependency>
- -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-kafka</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ -->
- <!-- Add logging framework, to produce console output when running in the IDE. -->
- <!-- These dependencies are excluded from the application JAR by default. -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <!-- Add logging framework, to produce console output when running in the IDE. -->
+ <!-- These dependencies are excluded from the application JAR by default. -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <!-- Run shade goal on package phase -->
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
- <exclude>com.google.code.findbugs:jsr305</exclude>
- <exclude>org.slf4j:*</exclude>
- <exclude>org.apache.logging.log4j:*</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
- <!-- Do not copy the signatures in the META-INF folder.
- Otherwise, this might cause SecurityExceptions when using the JAR. -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.flink.examples.SqlRunner</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <!-- Run shade goal on package phase -->
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.flink:flink-shaded-force-shading</exclude>
+ <exclude>com.google.code.findbugs:jsr305</exclude>
+ <exclude>org.slf4j:*</exclude>
+ <exclude>org.apache.logging.log4j:*</exclude>
+ </excludes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <!-- Do not copy the signatures in the META-INF folder.
+ Otherwise, this might cause SecurityExceptions when using the JAR. -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.apache.flink.examples.SqlRunner</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index f4289052..1b656067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,9 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>23</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,11 +37,11 @@ under the License.
<inceptionYear>2014</inceptionYear>
<licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
</licenses>
<scm>
@@ -253,89 +253,89 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version><!--$NO-MVN-MAN-VER$-->
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <licenses>
- <!-- Enforce this license:
- 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.
- -->
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>AL2 </licenseFamilyCategory>
- <licenseFamilyName>Apache License 2.0</licenseFamilyName>
- <notes />
- <patterns>
- <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
- </patterns>
- </license>
- </licenses>
- <licenseFamilies>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>Apache License 2.0</familyName>
- </licenseFamily>
- </licenseFamilies>
- <excludes>
- <!-- Additional files like .gitignore etc.-->
- <exclude>**/.*/**</exclude>
- <exclude>**/*.prefs</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <!-- Administrative files in the main trunk. -->
- <exclude>**/README.md</exclude>
- <exclude>.git/**</exclude>
- <exclude>.github/**</exclude>
- <!-- Build files -->
- <exclude>**/*.iml</exclude>
- <!-- Generated content -->
- <exclude>**/target/**</exclude>
- <exclude>apache-maven-3.2.5/**</exclude>
- <!-- Documentation -->
- <exclude>docs/static/font-awesome/**</exclude>
- <exclude>docs/resources/**</exclude>
- <exclude>docs/public/**</exclude>
- <exclude>docs/themes/book/**</exclude>
- <exclude>docs/assets/github.css</exclude>
- <exclude>docs/static/js/anchor.min.js</exclude>
- <exclude>docs/layouts/shortcodes/generated/**</exclude>
- <!-- PyCharm -->
- <exclude>**/.idea/**</exclude>
- <!-- Generated CRD -->
- <exclude>helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml</exclude>
- <exclude>helm/flink-kubernetes-operator/crds/flinksessionjobs.flink.apache.org-v1.yml</exclude>
- <exclude>rio.yml</exclude>
- <!-- the licenses that are re-bundled -->
- <exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
- <exclude>**/licenses/LICENSE*</exclude>
- <exclude>**/licenses-binary/LICENSE*</exclude>
- <exclude>tools/license/NOTICE-binary_PREAMBLE.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version><!--$NO-MVN-MAN-VER$-->
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <licenses>
+ <!-- Enforce this license:
+ 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.
+ -->
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL2 </licenseFamilyCategory>
+ <licenseFamilyName>Apache License 2.0</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License 2.0</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ <excludes>
+ <!-- Additional files like .gitignore etc.-->
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.prefs</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- Administrative files in the main trunk. -->
+ <exclude>**/README.md</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.github/**</exclude>
+ <!-- Build files -->
+ <exclude>**/*.iml</exclude>
+ <!-- Generated content -->
+ <exclude>**/target/**</exclude>
+ <exclude>apache-maven-3.2.5/**</exclude>
+ <!-- Documentation -->
+ <exclude>docs/static/font-awesome/**</exclude>
+ <exclude>docs/resources/**</exclude>
+ <exclude>docs/public/**</exclude>
+ <exclude>docs/themes/book/**</exclude>
+ <exclude>docs/assets/github.css</exclude>
+ <exclude>docs/static/js/anchor.min.js</exclude>
+ <exclude>docs/layouts/shortcodes/generated/**</exclude>
+ <!-- PyCharm -->
+ <exclude>**/.idea/**</exclude>
+ <!-- Generated CRD -->
+ <exclude>helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml</exclude>
+ <exclude>helm/flink-kubernetes-operator/crds/flinksessionjobs.flink.apache.org-v1.yml</exclude>
+ <exclude>rio.yml</exclude>
+ <!-- the licenses that are re-bundled -->
+ <exclude>**/packaged_licenses/LICENSE.*.txt</exclude>
+ <exclude>**/licenses/LICENSE*</exclude>
+ <exclude>**/licenses-binary/LICENSE*</exclude>
+ <exclude>tools/license/NOTICE-binary_PREAMBLE.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<!-- generate configuration docs -->
<plugin>
@@ -374,6 +374,33 @@ under the License.
</transformers>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0.2</version>
+ <configuration>
+ <indentSize>4</indentSize>
+ <useDefaultFormatFileSet>false</useDefaultFormatFileSet>
+ <formatFileSets>
+ <formatFileSet>
+ <directory>.</directory>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </formatFileSet>
+ </formatFileSets>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check-format</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>