Cleanup & fixing of several release process POM issues. Renamed the "addons" profile to "release" as it is really for maven releases. Ensured the "additions" module (under [src]/dspace/modules/) is ALWAYS enabled, as several other modules under [src]/dspace/modules/ have it as a dependency. Cleaned up some comments.

This commit is contained in:
Tim Donohue
2012-10-24 13:02:46 -05:00
parent 34d9a4f7cf
commit 7cd2aca93b
2 changed files with 19 additions and 20 deletions

View File

@@ -12,28 +12,25 @@
<version>3.0-rc2-SNAPSHOT</version> <version>3.0-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<!-- The 'additions' module must *always* be built, as it is included
as a dependency in most other modules in [src]/dspace/modules -->
<modules>
<module>additions</module>
</modules>
<!-- <!--
List of enabled DSpace Modules to build/install. List of enabled DSpace "addon" / local customization Modules to build/install.
To disable building of modules, you can use the Maven '-P' commandline To disable building of modules, you can use the Maven '-P' commandline
option along with the profile's id. For example, the following tells option along with the profile's id. For example, the following tells
Maven to *disable* building of 'dspace-oai' and 'dspace-lni' modules: Maven to *disable* building of 'dspace-oai' and 'dspace-lni' modules:
'mvn package -P !dspace-oai,!dspace-lni' 'mvn package -P !dspace-oai,!dspace-lni'
Also note that the profile IDs below match the profile IDs of the source Also note that the profile IDs below match the profile IDs of the source
modules in /dspace/pom.xml, so the above command will also disable the modules in [dspace-src]/pom.xml, so the above command will also disable the
compiling of the corresponding source module. compiling of the corresponding source module.
--> -->
<profiles> <profiles>
<profile>
<id>dspace-additions</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>additions</module>
</modules>
</profile>
<profile> <profile>
<id>dspace-xmlui</id> <id>dspace-xmlui</id>
<activation> <activation>
@@ -89,7 +86,7 @@
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>dspace-xoai</id> <id>dspace-oai</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>

16
pom.xml
View File

@@ -108,8 +108,8 @@
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
<configuration> <configuration>
<!-- During release:perform, enable the "addons" profile --> <!-- During release:perform, enable the "release" profile (see below) -->
<releaseProfiles>addons</releaseProfiles> <releaseProfiles>release</releaseProfiles>
<goals>deploy</goals> <goals>deploy</goals>
<!-- Suggest tagging the release in SCM as "dspace-[version]" --> <!-- Suggest tagging the release in SCM as "dspace-[version]" -->
<tagNameFormat>dspace-@{project.version}</tagNameFormat> <tagNameFormat>dspace-@{project.version}</tagNameFormat>
@@ -321,14 +321,16 @@
<!-- <!--
Use 'mvn deploy -Paddons' while doing Continuous Integration The 'release' profile is used by the 'maven-release-plugin' (see above)
and deploying addons to the Maven repository. to actually perform a DSpace software release to Maven central.
--> -->
<profile> <profile>
<id>addons</id> <id>release</id>
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<!-- Activate all modules *except* for the 'dspace' module,
as it does not include any Java source code to release. -->
<modules> <modules>
<module>dspace-api</module> <module>dspace-api</module>
<module>dspace-jspui</module> <module>dspace-jspui</module>
@@ -341,8 +343,8 @@
</profile> </profile>
<!-- <!--
Use 'mvn package -Pdistributions' to create distributions Run this profile (e.g. 'mvn package -Pdistributions') to create
to upload to S.F. zip / tarball distributions to upload to SourceForge or similar.
--> -->
<profile> <profile>
<id>distributions</id> <id>distributions</id>