You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/04/06 23:50:12 UTC
[1/3] incubator-beam git commit: Add a note to .gitignore to make
sure we edit .gitignore and src.xml at the same time
Repository: incubator-beam
Updated Branches:
refs/heads/master 2296a3675 -> f6299519b
Add a note to .gitignore to make sure we edit .gitignore and src.xml at the same time
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/76e5e9e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/76e5e9e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/76e5e9e5
Branch: refs/heads/master
Commit: 76e5e9e5824c376a959f5081c79df87060f25dda
Parents: bb3ceb3
Author: Davor Bonaci <da...@google.com>
Authored: Wed Apr 6 14:26:30 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Apr 6 14:45:39 2016 -0700
----------------------------------------------------------------------
.gitignore | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/76e5e9e5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index da29f12..38def8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# NOTE: if you modify this file, you probably need to modify the file set that
+# is an input to 'maven-assembly-plugin' that generates source distribution.
+# This is typically in files named 'src.xml' throughout this repository.
+
# Ignore files generated by the Maven build process.
target/
@@ -21,3 +25,7 @@ dependency-reduced-pom.xml
# Ignore files that end with '~', since they are most likely auto-save files
# produced by a text editor.
*~
+
+# NOTE: if you modify this file, you probably need to modify the file set that
+# is an input to 'maven-assembly-plugin' that generates source distribution.
+# This is typically in files named 'src.xml' throughout this repository.
[2/3] incubator-beam git commit: [BEAM-114] Add src distribution
Posted by da...@apache.org.
[BEAM-114] Add src distribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/bb3ceb35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/bb3ceb35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/bb3ceb35
Branch: refs/heads/master
Commit: bb3ceb352f0ba7706dfb1a6c04022093fd9c65fb
Parents: 2296a36
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Apr 5 08:30:51 2016 +0200
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Apr 6 14:45:39 2016 -0700
----------------------------------------------------------------------
pom.xml | 41 +++++++++++++++++++++++++++++++++++++
sdks/java/src.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb3ceb35/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a198724..4c6ce7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,35 @@
<dataflow.javadoc_opts>-Xdoclint:-missing</dataflow.javadoc_opts>
</properties>
</profile>
+ <profile>
+ <id>src</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-beam-${project.version}</finalName>
+ <descriptors>
+ <descriptor>sdks/java/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
@@ -344,6 +373,18 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <releaseProfiles>src</releaseProfiles>
+ <preparationGoals>clean install</preparationGoals>
+ <goals>deploy</goals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb3ceb35/sdks/java/src.xml
----------------------------------------------------------------------
diff --git a/sdks/java/src.xml b/sdks/java/src.xml
new file mode 100644
index 0000000..e5f8664
--- /dev/null
+++ b/sdks/java/src.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+ <id>src</id>
+
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <!-- NB: the exclude here should be sync with content of .gitignore -->
+ <!-- Ignore files generated by the Maven build process -->
+ <exclude>**/target/**</exclude>
+ <!-- Ignore IntelliJ files -->
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- Ignore Eclipse files -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.factorypath</exclude>
+ <exclude>**/.checkstyle</exclude>
+ <exclude>**/.settings/**</exclude>
+ <!-- The build process generates the dependency-reduced POM, but it shouldn't be part of the src distro -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- Ignore files that end with '~', since they are most likely auto-save files produced by a text editor -->
+ <exclude>**/*~</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
[3/3] incubator-beam git commit: This closes #121
Posted by da...@apache.org.
This closes #121
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f6299519
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f6299519
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f6299519
Branch: refs/heads/master
Commit: f6299519b45295b4ee327b67fcabca2c121db798
Parents: 2296a36 76e5e9e
Author: Davor Bonaci <da...@google.com>
Authored: Wed Apr 6 14:49:56 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Apr 6 14:49:56 2016 -0700
----------------------------------------------------------------------
.gitignore | 8 ++++++++
pom.xml | 41 +++++++++++++++++++++++++++++++++++++
sdks/java/src.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+)
----------------------------------------------------------------------