beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [2/3] incubator-beam git commit: Fix release profile
Date Wed, 11 May 2016 22:56:26 GMT
Fix release profile

- Move assembly plugin from 'src' profile to 'release' profile.
- Invoke 'release' profile, when invoking release-plugin's goals.
- Fix path to the assembly configuration.


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

Branch: refs/heads/master
Commit: d15e4fa233231f976504911f6ff2af720ae5b3a4
Parents: 7ebf012
Author: Davor Bonaci <davor@google.com>
Authored: Wed May 11 14:45:45 2016 -0700
Committer: Davor Bonaci <davor@google.com>
Committed: Wed May 11 15:14:25 2016 -0700

----------------------------------------------------------------------
 pom.xml | 53 +++++++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d15e4fa2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 633b8fd..c76fb81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,6 @@
   </modules>
 
   <profiles>
-
     <!-- A global profile defined for all modules for release-level verification. 
       Slow processes such as building source, javadoc, and test jars should be limited 
       to this profile. -->
@@ -200,6 +199,26 @@
                 </execution>
               </executions>
             </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>
           </plugins>
         </pluginManagement>
       </build>
@@ -214,36 +233,6 @@
         <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>
 
   <dependencyManagement>
@@ -907,7 +896,7 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>2.5.3</version>
           <configuration>
-            <releaseProfiles>src</releaseProfiles>
+            <releaseProfiles>release</releaseProfiles>
             <preparationGoals>clean install</preparationGoals>
             <goals>deploy</goals>
             <autoVersionSubmodules>true</autoVersionSubmodules>


Mime
View raw message