Repository: deltaspike Updated Branches: refs/heads/master 98d4c2ab2 -> 6721ca6ec
fix distribution bundling setup Now we don't need to manually pass any profile during release Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6721ca6e Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6721ca6e Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6721ca6e Branch: refs/heads/master Commit: 6721ca6ec093e007ab4a3f9dbe5997abcadccf1e Parents: 98d4c2a Author: Mark Struberg <[email protected]> Authored: Sun May 28 10:39:49 2017 +0200 Committer: Mark Struberg <[email protected]> Committed: Sun May 28 10:39:49 2017 +0200 ---------------------------------------------------------------------- deltaspike/dist/full/pom.xml | 89 ++++++++++++++++++++++++++++++--------- deltaspike/pom.xml | 14 +----- pom.xml | 1 - 3 files changed, 70 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6721ca6e/deltaspike/dist/full/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml index e626574..0b3d6f0 100644 --- a/deltaspike/dist/full/pom.xml +++ b/deltaspike/dist/full/pom.xml @@ -28,8 +28,12 @@ <artifactId>distribution-full</artifactId> <packaging>pom</packaging> - <name>Apache DeltaSpike Full Distribution</name> + + <properties> + <noAssembly>true</noAssembly> + </properties> + <dependencies> <dependency> <groupId>org.apache.deltaspike.core</groupId> @@ -226,28 +230,73 @@ <scope>runtime</scope> </dependency> </dependencies> + + <build> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assemble</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/distribution/assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>deltaspike-full-${project.version}</finalName> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assemble</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <skipAssembly>${noAssembly}</skipAssembly> + <descriptors> + <descriptor>src/main/distribution/assembly.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + <finalName>deltaspike-full-${project.version}</finalName> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> + <profiles> + <profile> + <!-- for quickly building a local distrbution package --> + <id>distribution</id> + <properties> + <noAssembly>false</noAssembly> + </properties> + </profile> + + <profile> + <id>apache-release</id> + <properties> + <noAssembly>false</noAssembly> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <createChecksum>true</createChecksum> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6721ca6e/deltaspike/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml index 548d179..a8d42be 100644 --- a/deltaspike/pom.xml +++ b/deltaspike/pom.xml @@ -75,6 +75,7 @@ <module>cdictrl</module> <module>modules</module> <module>examples</module> + <module>dist</module> </modules> <build> @@ -215,18 +216,5 @@ </build> </profile> - <profile> - <id>distribution</id> - <modules> - <module>checkstyle-rules</module> - <module>parent</module> - <module>test-utils</module> - <module>core</module> - <module>cdictrl</module> - <module>modules</module> - <module>examples</module> - <module>dist</module> - </modules> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6721ca6e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7d533cd..ef158d8 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,6 @@ <localCheckout>true</localCheckout> <autoVersionSubmodules>true</autoVersionSubmodules> - <releaseProfiles>distribution</releaseProfiles> <preparationGoals>clean install</preparationGoals> </configuration> </plugin>
