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/06/08 19:30:52 UTC
[1/2] incubator-beam git commit: Use Apache's release to produce the
source release
Repository: incubator-beam
Updated Branches:
refs/heads/master 3f3dffcb6 -> 7fb21f223
Use Apache's release to produce the source release
And use final-name to override the artifact and directory names
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/70e275b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/70e275b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/70e275b7
Branch: refs/heads/master
Commit: 70e275b7683331005a2c398a606a2785ed86aa24
Parents: 3f3dffc
Author: Dan Halperin <dh...@google.com>
Authored: Wed Jun 8 11:35:19 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Jun 8 11:59:14 2016 -0700
----------------------------------------------------------------------
distributions/pom.xml | 62 ----------------------------
distributions/src/main/assembly/src.xml | 55 ------------------------
pom.xml | 7 ++--
3 files changed, 3 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/70e275b7/distributions/pom.xml
----------------------------------------------------------------------
diff --git a/distributions/pom.xml b/distributions/pom.xml
deleted file mode 100644
index cb3bd66..0000000
--- a/distributions/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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.
--->
-<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>
-
- <parent>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-parent</artifactId>
- <version>0.2.0-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>apache-beam</artifactId>
- <packaging>pom</packaging>
- <name>Apache Beam :: Distributions</name>
-
- <profiles>
- <profile>
- <id>release</id>
- <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>src/main/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/70e275b7/distributions/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/distributions/src/main/assembly/src.xml b/distributions/src/main/assembly/src.xml
deleted file mode 100644
index a0d7a87..0000000
--- a/distributions/src/main/assembly/src.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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>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>
- <exclude>**/bin/**</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>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/70e275b7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77a0d1a..e7cc5f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,6 @@
build order. -->
<module>sdks/java/maven-archetypes</module>
<module>examples</module>
- <module>distributions</module>
</modules>
<profiles>
@@ -922,8 +921,8 @@
</configuration>
</plugin>
- <!-- Unconditionally disable invocation of the assembly
- plugin from the Apache parent. -->
+ <!-- Rename the artifact produced by the Apache parent's
+ source release. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -931,7 +930,7 @@
<execution>
<id>source-release-assembly</id>
<configuration>
- <skipAssembly>true</skipAssembly>
+ <finalName>apache-beam-${project.version}</finalName>
</configuration>
</execution>
</executions>
[2/2] incubator-beam git commit: This closes #434
Posted by da...@apache.org.
This closes #434
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7fb21f22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7fb21f22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7fb21f22
Branch: refs/heads/master
Commit: 7fb21f22332e5bccc7f5b3bd83de09dd32ca4cc6
Parents: 3f3dffc 70e275b
Author: Davor Bonaci <da...@google.com>
Authored: Wed Jun 8 12:30:25 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Jun 8 12:30:25 2016 -0700
----------------------------------------------------------------------
distributions/pom.xml | 62 ----------------------------
distributions/src/main/assembly/src.xml | 55 ------------------------
pom.xml | 7 ++--
3 files changed, 3 insertions(+), 121 deletions(-)
----------------------------------------------------------------------