Author: hfnukal Date: 2011-09-14 11:03:35 -0400 (Wed, 14 Sep 2011) New Revision: 7421 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1091 mead build import user friendly messages Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-09-14 13:29:27 UTC (rev 7420) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-09-14 15:03:35 UTC (rev 7421) @@ -31,7 +31,29 @@ brew.no.wait - If not declared, build waits until task is done and synchronized brew.not.scratch - Performs scratch build unless specified. This prevents from unwanted execution. </description> - + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <configuration> + <propertyPrefix>version</propertyPrefix> + </configuration> + <executions> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + <properties> <!-- Ant properties --> <ant.build.file>build.xml</ant.build.file> @@ -45,10 +67,11 @@ <!-- GateIn --> <svn.gatein.repo>gatein</svn.gatein.repo> - <gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_Dev03</gatein-portal.svnpath> - <gatein-parent.svnpath>maven/parent/tags/1.0.2-GA</gatein-parent.svnpath> - <gatein-packager.svnpath>maven/packager/tags/1.0.0-CR01</gatein-packager.svnpath> - <gatein-dep.svnpath>maven/dep/tags/1.1.0-Beta06</gatein-dep.svnpath> + <!--<gatein-portal.svnpath>${project.scm.url}</gatein-portal.svnpath>--> + <!--<gatein-portal.svnpath>epp/portal/tags/EPP_5_2_0_DEV03</gatein-portal.svnpath>--> + <gatein-portal.svnpath>epp/portal/branches/EPP_5_2_Branch</gatein-portal.svnpath> + <gatein-parent.svnpath>maven/parent/tags/${org.gatein.parent.version}</gatein-parent.svnpath> + <gatein-dep.svnpath>maven/dep/tags/${org.gatein.dep.version}</gatein-dep.svnpath> <gatein-common.svnpath>components/common/tags/${org.gatein.common.version}</gatein-common.svnpath> <gatein-wci.svnpath>components/wci/tags/${org.gatein.wci.version}</gatein-wci.svnpath> @@ -68,9 +91,9 @@ <!-- # eXo components --> <svn.exo.repo>exo-jcr</svn.exo.repo> - <exo-parent.svnpath>parent/tags/9</exo-parent.svnpath> - <exo-doc.svnpath>docs-style/tags/1</exo-doc.svnpath> - <exo-junit.svnpath>junit.framework/tags/1.2.1-GA</exo-junit.svnpath> + <exo-parent.svnpath>parent/tags/${org.exoplatform.parent.version}</exo-parent.svnpath> + <exo-doc.svnpath>docs-style/tags/${org.exoplatform.doc-style.version}</exo-doc.svnpath> + <exo-junit.svnpath>junit.framework/tags/${org.exoplatform.kernel.junit.version}</exo-junit.svnpath> <exo-kernel.svnpath>kernel/tags/${org.exoplatform.kernel.version}</exo-kernel.svnpath> <exo-core.svnpath>core/tags/${org.exoplatform.core.version}</exo-core.svnpath> @@ -78,7 +101,7 @@ <exo-jcr.svnpath>jcr/tags/${org.exoplatform.jcr.version}</exo-jcr.svnpath> </properties> - + <profiles> <profile> <id>mead-all</id> @@ -102,7 +125,6 @@ <module>gatein-simplecaptcha </module> <module>gatein-shindig </module> <module>gatein-management </module> - <module>gatein-packager </module> <module>jboss-picketlink-idm </module> <module>gatein-portal </module> <module>gatein-sso </module> @@ -126,15 +148,6 @@ </modules> </profile> -<!--gatein-packager--> - <profile> - <id>gatein-packager</id> - <modules> - <module>gatein-packager</module> - </modules> - - </profile> - <!--gatein-dep--> <profile> <id>gatein-dep</id> @@ -288,5 +301,4 @@ </profile> </profiles> - </project> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-09-14 13:29:27 UTC (rev 7420) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-09-14 15:03:35 UTC (rev 7421) @@ -18,6 +18,9 @@ <eap.dir>jboss-eap-5.1</eap.dir> <epp.dir>jboss-epp-5.2</epp.dir> + <sso.version>1.0.2-epp-DEV01</sso.version> + <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version> + <!-- portlet bridge directory - not used, distribution module name is used as directory name --> <portletbridge.directory>portletbridge</portletbridge.directory> <!-- gatein-sso directory name within EPP --> @@ -25,12 +28,8 @@ <!-- EPP Documentation main directory --> <epp.doc.directory>jboss-epp-doc-5.1</epp.doc.directory> - - <sso.version>1.0.2-epp-DEV01</sso.version> - <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version> - + </properties> - <profiles> <profile> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 13:29:27 UTC (rev 7420) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 15:03:35 UTC (rev 7421) @@ -37,14 +37,19 @@ <name>EPP GateIn - Portal - ${project.version}</name> <properties> + <org.exoplatform.parent.version>9</org.exoplatform.parent.version> <org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version> + <org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version> <!-- from exo.kernel --> <org.exoplatform.core.version>2.4.0-GA-CP02</org.exoplatform.core.version> <org.exoplatform.ws.version>2.2.0-GA</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.14.0-GA</org.exoplatform.jcr.version> + <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>2.0.2-Beta02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> + <org.gatein.parent.version>${parent.version}</org.gatein.parent.version> <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> + <org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version> <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> <org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>