beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [1/2] incubator-beam git commit: Use Apache's release to produce the source release
Date Wed, 08 Jun 2016 19:35:18 GMT
Repository: incubator-beam
Updated Branches:
  refs/heads/release-0.1.0-incubating 7e5d2f9a7 -> 8bf311932


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/ccc1e812
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ccc1e812
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ccc1e812

Branch: refs/heads/release-0.1.0-incubating
Commit: ccc1e812ecf2d1bb7b45449c34de90295291baf0
Parents: 7e5d2f9
Author: Dan Halperin <dhalperi@google.com>
Authored: Wed Jun 8 11:35:19 2016 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Wed Jun 8 12:33:51 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/ccc1e812/distributions/pom.xml
----------------------------------------------------------------------
diff --git a/distributions/pom.xml b/distributions/pom.xml
deleted file mode 100644
index d3c953e..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.1.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/ccc1e812/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/ccc1e812/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e73d627..0a2cd55 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>


Mime
View raw message