flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [2/3] flex-blazeds git commit: Merge remote-tracking branch 'origin/master'
Date Sun, 01 Mar 2015 20:36:58 GMT
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/d40ec058
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/d40ec058
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/d40ec058

Branch: refs/heads/master
Commit: d40ec058b3c4d05f573dc3f55acdd3e66672ad09
Parents: 8b210e4 a618b2a
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sun Mar 1 21:28:34 2015 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sun Mar 1 21:28:34 2015 +0100

----------------------------------------------------------------------
 modules/NOTICE  |  2 +-
 modules/README  | 15 +++++++--------
 modules/pom.xml | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/d40ec058/modules/pom.xml
----------------------------------------------------------------------
diff --cc modules/pom.xml
index 142b143,9903019..7a43061
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@@ -111,4 -91,37 +111,36 @@@
  		</plugins>
  	</build>
  
+ 
+ 	<!-- When building on the apache ci server, we want to get some source-release archives
-->
+ 	<profiles>
+ 		<profile>
+ 			<id>flex-ci-build</id>
+ 
+ 			<build>
+ 				<plugins>
+ 					<plugin>
+ 						<artifactId>maven-assembly-plugin</artifactId>
+ 						<version>2.5.1</version>
+ 						<executions>
+ 							<execution>
+ 								<id>assemble-sources-releases</id>
+ 								<phase>package</phase>
+ 								<goals>
+ 									<goal>single</goal>
+ 								</goals>
+ 							</execution>
+ 						</executions>
+ 						<configuration>
 -							<finalName>apache-flex-blazeds-${project.version}</finalName>
+ 							<descriptors>
+ 								<descriptor>src/assembly/assemble-zip.xml</descriptor>
+ 								<descriptor>src/assembly/assemble-gz.xml</descriptor>
+ 							</descriptors>
+ 						</configuration>
+ 					</plugin>
+ 				</plugins>
+ 			</build>
+ 		</profile>
+ 	</profiles>
+ 
  </project>


Mime
View raw message