You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2014/11/14 11:08:12 UTC
git commit: [flex-utilities] [refs/heads/develop] - - Moved the
assembly plugin configuration into a "flex-ci-build" profile - Moved the
assemply descriptors to "src/assemby" to prevent them from being included in
the resulting jars.
Repository: flex-utilities
Updated Branches:
refs/heads/develop f5e979220 -> 547e6d735
- Moved the assembly plugin configuration into a "flex-ci-build" profile
- Moved the assemply descriptors to "src/assemby" to prevent them from being included in the resulting jars.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/547e6d73
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/547e6d73
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/547e6d73
Branch: refs/heads/develop
Commit: 547e6d7359f2f8c2aa522ac7c217e011caeacff8
Parents: f5e9792
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Nov 14 11:08:03 2014 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Nov 14 11:08:03 2014 +0100
----------------------------------------------------------------------
flex-tool-api/pom.xml | 41 +++++++++++++++-----
flex-tool-api/src/assembly/assemble-gz.xml | 18 +++++++++
flex-tool-api/src/assembly/assemble-zip.xml | 18 +++++++++
.../main/resources/assemblies/assemble-gz.xml | 18 ---------
.../main/resources/assemblies/assemble-zip.xml | 18 ---------
5 files changed, 67 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/547e6d73/flex-tool-api/pom.xml
----------------------------------------------------------------------
diff --git a/flex-tool-api/pom.xml b/flex-tool-api/pom.xml
index 07af93a..ca59682 100644
--- a/flex-tool-api/pom.xml
+++ b/flex-tool-api/pom.xml
@@ -63,18 +63,39 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/resources/assemblies/assemble-zip.xml</descriptor>
- <descriptor>src/main/resources/assemblies/assemble-gz.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</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>
+ <descriptors>
+ <descriptor>src/assembly/assemble-zip.xml</descriptor>
+ <descriptor>src/assembly/assemble-gz.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/547e6d73/flex-tool-api/src/assembly/assemble-gz.xml
----------------------------------------------------------------------
diff --git a/flex-tool-api/src/assembly/assemble-gz.xml b/flex-tool-api/src/assembly/assemble-gz.xml
new file mode 100644
index 0000000..21a580c
--- /dev/null
+++ b/flex-tool-api/src/assembly/assemble-gz.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>source-release</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>false</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/547e6d73/flex-tool-api/src/assembly/assemble-zip.xml
----------------------------------------------------------------------
diff --git a/flex-tool-api/src/assembly/assemble-zip.xml b/flex-tool-api/src/assembly/assemble-zip.xml
new file mode 100644
index 0000000..df1c285
--- /dev/null
+++ b/flex-tool-api/src/assembly/assemble-zip.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>source-release</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>false</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/547e6d73/flex-tool-api/src/main/resources/assemblies/assemble-gz.xml
----------------------------------------------------------------------
diff --git a/flex-tool-api/src/main/resources/assemblies/assemble-gz.xml b/flex-tool-api/src/main/resources/assemblies/assemble-gz.xml
deleted file mode 100644
index 21a580c..0000000
--- a/flex-tool-api/src/main/resources/assemblies/assemble-gz.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>source-release</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>false</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/547e6d73/flex-tool-api/src/main/resources/assemblies/assemble-zip.xml
----------------------------------------------------------------------
diff --git a/flex-tool-api/src/main/resources/assemblies/assemble-zip.xml b/flex-tool-api/src/main/resources/assemblies/assemble-zip.xml
deleted file mode 100644
index df1c285..0000000
--- a/flex-tool-api/src/main/resources/assemblies/assemble-zip.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>source-release</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>false</useDefaultExcludes>
- <excludes>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file