beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [07/11] incubator-beam git commit: [BEAM-319][BEAM-320] Add distributions module responsible of packaging source and binaries distributions.
Date Tue, 07 Jun 2016 16:59:52 GMT
[BEAM-319][BEAM-320] Add distributions module responsible of packaging source and binaries
distributions.


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/907bd181
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/907bd181
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/907bd181

Branch: refs/heads/release-0.1.0-incubating
Commit: 907bd181b819d7d2237060910bcba442e44d3400
Parents: 71fa9e6
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Fri Jun 3 13:05:58 2016 +0200
Committer: Davor Bonaci <davor@google.com>
Committed: Mon Jun 6 18:08:22 2016 -0700

----------------------------------------------------------------------
 distributions/pom.xml                           | 62 ++++++++++++++++++++
 distributions/src/main/assembly/src.xml         | 55 +++++++++++++++++
 pom.xml                                         | 25 +-------
 sdks/java/build-tools/src/main/assembly/src.xml | 55 -----------------
 4 files changed, 118 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/907bd181/distributions/pom.xml
----------------------------------------------------------------------
diff --git a/distributions/pom.xml b/distributions/pom.xml
new file mode 100644
index 0000000..03bd72a
--- /dev/null
+++ b/distributions/pom.xml
@@ -0,0 +1,62 @@
+<?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>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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/907bd181/distributions/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/distributions/src/main/assembly/src.xml b/distributions/src/main/assembly/src.xml
new file mode 100644
index 0000000..a823267
--- /dev/null
+++ b/distributions/src/main/assembly/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>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/907bd181/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4b209bf..360b5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
       build order. -->
     <module>sdks/java/maven-archetypes</module>
     <module>examples</module>
+    <module>distributions</module>
   </modules>
 
   <profiles>
@@ -200,26 +201,6 @@
             </plugin>
 
             <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/build-tools/src/main/assembly/src.xml</descriptor>
-                    </descriptors>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-
-            <plugin>
               <groupId>org.apache.rat</groupId>
               <artifactId>apache-rat-plugin</artifactId>
               <version>0.11</version>
@@ -257,10 +238,6 @@
             <groupId>org.apache.rat</groupId>
             <artifactId>apache-rat-plugin</artifactId>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-          </plugin>
         </plugins>
       </build>
     </profile>

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/907bd181/sdks/java/build-tools/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/assembly/src.xml b/sdks/java/build-tools/src/main/assembly/src.xml
deleted file mode 100644
index a823267..0000000
--- a/sdks/java/build-tools/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>


Mime
View raw message