You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/10/25 03:07:18 UTC
[1/4] beam git commit: Rearrange .gitignore slightly
Repository: beam
Updated Branches:
refs/heads/master d54f03bf6 -> cf6261e09
Rearrange .gitignore slightly
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a180cf57
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a180cf57
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a180cf57
Branch: refs/heads/master
Commit: a180cf577b6ad3a4ee432dcdd2bd84c4c771af22
Parents: d54f03b
Author: Kenneth Knowles <ke...@apache.org>
Authored: Mon Oct 23 12:36:38 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Tue Oct 24 16:32:19 2017 -0700
----------------------------------------------------------------------
.gitignore | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/a180cf57/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f996dfd..8d2a6b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,9 @@
# This is typically in files named 'src.xml' throughout this repository.
# Ignore files generated by the Maven build process.
-target/
bin/
+dependency-reduced-pom.xml
+target/
# Ignore generated archetypes
sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/
@@ -14,6 +15,7 @@ sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources
*.py[cod]
*.egg-info/
.eggs/
+nose-*.egg/
.tox/
build/
dist/
@@ -45,10 +47,6 @@ sdks/python/apache_beam/portability/api/*pb2*.*
# Ignore Visual Studio Code files.
.vscode/
-# The build process generates the dependency-reduced POM, but it shouldn't be
-# committed.
-dependency-reduced-pom.xml
-
# Hotspot VM leaves this log in a non-target directory when java crashes
hs_err_pid*.log
[3/4] beam git commit: Manage RAT plugin more centrally;
only toggle skipping
Posted by ke...@apache.org.
Manage RAT plugin more centrally; only toggle skipping
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/cd6379b0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/cd6379b0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/cd6379b0
Branch: refs/heads/master
Commit: cd6379b02d0f43659eac3941a3f63a1fed607de9
Parents: 6b572ff
Author: Kenneth Knowles <ke...@apache.org>
Authored: Mon Oct 23 13:26:27 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Tue Oct 24 19:54:54 2017 -0700
----------------------------------------------------------------------
pom.xml | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/cd6379b0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eeba1ba..73453ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,7 @@
<kafka.clients.version>0.11.0.1</kafka.clients.version>
<commons.csv.version>1.4</commons.csv.version>
+ <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
<surefire-plugin.version>2.20</surefire-plugin.version>
@@ -184,6 +185,9 @@
<!-- For container builds, override to push containers to any registry -->
<docker-repository-root>${user.name}-docker-apache.bintray.io/beam</docker-repository-root>
+
+ <!-- Default skipping -->
+ <rat.skip>true</rat.skip>
</properties>
<packaging>pom</packaging>
@@ -247,15 +251,11 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -268,8 +268,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <!-- Apache RAT checks all files in the project, only run once. -->
- <inherited>false</inherited>
</plugin>
<plugin>
@@ -1536,7 +1534,17 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
+ <version>${apache-rat-plugin.version}</version>
+ <!-- Apache RAT checks all files in the project, only run once. -->
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
<excludeSubProjects>false</excludeSubProjects>
[4/4] beam git commit: This closes #4027: [BEAM-3092] Fix RAT plugin
configuration
Posted by ke...@apache.org.
This closes #4027: [BEAM-3092] Fix RAT plugin configuration
Manage RAT plugin more centrally; only toggle skipping
Fix RAT exclusions
Rearrange .gitignore slightly
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/cf6261e0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/cf6261e0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/cf6261e0
Branch: refs/heads/master
Commit: cf6261e0917019870269994acc933bb698441c42
Parents: d54f03b cd6379b
Author: Kenneth Knowles <ke...@apache.org>
Authored: Tue Oct 24 20:06:46 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Tue Oct 24 20:06:46 2017 -0700
----------------------------------------------------------------------
.gitignore | 8 ++---
pom.xml | 102 +++++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 81 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[2/4] beam git commit: Fix RAT exclusions
Posted by ke...@apache.org.
Fix RAT exclusions
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6b572ff9
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6b572ff9
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6b572ff9
Branch: refs/heads/master
Commit: 6b572ff9f47c5d5ce853c084424422614611ce76
Parents: a180cf5
Author: Kenneth Knowles <ke...@apache.org>
Authored: Mon Oct 23 13:26:08 2017 -0700
Committer: Kenneth Knowles <ke...@apache.org>
Committed: Tue Oct 24 19:54:53 2017 -0700
----------------------------------------------------------------------
pom.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 59 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/6b572ff9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72e4c94..eeba1ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1542,30 +1542,76 @@
<excludeSubProjects>false</excludeSubProjects>
<consoleOutput>true</consoleOutput>
<useDefaultExcludes>true</useDefaultExcludes>
+
+ <!--
+ Keep excludes in sync with .gitignore, with consistent
+ order and sections for easy cross-checking.
+
+ Patterns are relative to $PWD, not the RAT ${basedir},
+ so each _must_ be prefixed with `**` or `${project.basedir}`.
+ -->
<excludes>
- <!-- Keep exclude sync with .gitignore -->
+ <!-- .gitignore: Ignore files generated by the Maven build process -->
<exclude>**/target/**/*</exclude>
+ <exclude>**/bin/**/*</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
+
+ <!-- .gitignore: Ignore files generated by the Python build process -->
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/*.pyo</exclude>
+ <exclude>**/*.pyd</exclude>
+ <exclude>**/*.egg-info/**/*</exclude>
+ <exclude>**/.eggs/**/*</exclude>
+ <exclude>**/nose-*.egg/**/*</exclude>
+ <exclude>**/.tox/**/*</exclude>
+ <exclude>**/build/**/*</exclude>
+ <exclude>**/dist/**/*</exclude>
+ <exclude>**/distribute-*/**/*</exclude>
+ <exclude>**/env/**/*</exclude>
+ <exclude>sdks/python/**/*.c</exclude>
+ <exclude>sdks/python/**/*.so</exclude>
+ <exclude>sdks/python/LICENSE</exclude>
+ <exclude>sdks/python/NOTICE</exclude>
+ <exclude>sdks/python/README.md</exclude>
+ <exclude>sdks/python/apache_beam/portability/api/*pb2*.*</exclude>
+
+ <!-- .gitignore: Ignore IntelliJ files. -->
+ <exclude>**/idea/**/*</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <!-- .gitignore: Ignore Eclipse files. -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.factorypath</exclude>
+ <exclude>**/.checkstyle</exclude>
+ <exclude>**/.fbExcludeFilterFile</exclude>
+ <exclude>**/.apt_generated/**/*</exclude>
+ <exclude>**/.settings/**/*</exclude>
+
+ <!-- .gitignore: Ignore Visual Studio Code files. -->
+ <exclude>**/.vscode/*/**</exclude>
+
+ <!-- .gitignore: Hotspot VM leaves this log in a non-target directory when java crashes -->
<exclude>**/hs_err_pid*.log</exclude>
+
+ <!-- .gitignore: Ignore files that end with '~', since they
+ are most likely auto-save files produced by a text editor. -->
+ <exclude>**/*~</exclude>
+
+ <!-- .gitignore: Ignore MacOSX files. -->
+ <exclude>**/.DS_Store/**/*</exclude>
+
+ <!-- Ignore files we track but do not distribute -->
<exclude>.github/**/*</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.idea/**/*</exclude>
- <exclude>**/*.egg-info/**/*</exclude>
+
<exclude>**/package-list</exclude>
<exclude>**/user.avsc</exclude>
<exclude>**/test/resources/**/*.txt</exclude>
<exclude>**/test/**/.placeholder</exclude>
- <exclude>.repository/**/*</exclude>
- <exclude>**/nose-*.egg/**/*</exclude>
- <exclude>**/.eggs/**/*</exclude>
- <exclude>**/.tox/**/*</exclude>
<!-- Default eclipse excludes neglect subprojects -->
- <exclude>**/.checkstyle</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.factorypath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
<!-- Proto/grpc generated wrappers -->
<exclude>**/apache_beam/runners/api/*_pb2*.py</exclude>