Author: dbaeli Date: 2010-10-18 19:35:13 -0400 (Mon, 18 Oct 2010) New Revision: 4720 Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml exo/portal/branches/3.1.x/pom.xml Log: EXOGTN-106 declaring missing deps and maven repos for the build to pass, even if content is not perfect (still kernel 2.2.0-GA binaries downloaded. Clean fix for next release EXOGTN-115 Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-10-18 22:53:52 UTC (rev 4719) +++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-10-18 23:35:13 UTC (rev 4720) @@ -33,22 +33,6 @@ <properties> <gatein.working.dir>${basedir}/target</gatein.working.dir><!-- Default value for server installation dir --> - - <commons-digester.version>1.8.1</commons-digester.version> - <commons-dbcp.version>1.2.1</commons-dbcp.version> - <asm.version>1.5.3</asm.version> - <jcr.version>1.0</jcr.version> - <stax.version>1.0</stax.version> - <html-parser.version>1.6</html-parser.version> - <org.jaxb2.version>0.1</org.jaxb2.version> - <commons-httpclient.version>3.1</commons-httpclient.version> - <org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version> - <org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version> - <com.sun.xml.bind.version>2.1.7</com.sun.xml.bind.version> - <javassist.version>3.4.GA</javassist.version> - <antlr.version>2.7.6rc1</antlr.version> - <cglib.version>2.2</cglib.version> - </properties> @@ -129,6 +113,8 @@ <dependency><groupId>javassist</groupId><artifactId>javassist</artifactId><version>${javassist.version}</version><type>jar</type></dependency><!-- 3.4.GA--> <dependency><groupId>antlr</groupId><artifactId>antlr</artifactId><version>${antlr.version}</version><type>jar</type></dependency><!-- 2.7.6rc1--> <dependency><groupId>cglib</groupId><artifactId>cglib</artifactId><version>${cglib.version}</version><type>jar</type></dependency><!-- 2.2--> +<dependency><groupId>org.exoplatform.tool</groupId><artifactId>exo.tool.webunit</artifactId><version>${exo.tool.webunit.version}</version><type>jar</type></dependency><!-- 3.4.GA--> + </dependencies> <build> @@ -231,7 +217,7 @@ <argument>-Dexo.working.dir=${gatein.working.dir}</argument> <!--argument>-Dexo.src.dir=NONE</argument--> <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xms128m</argument> @@ -332,7 +318,7 @@ <argument>-Dexo.working.dir=${gatein.working.dir}/</argument> <!--argument>-Dexo.src.dir=NONE</argument--> <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xms128m</argument> @@ -432,7 +418,7 @@ <argument>-Dexo.working.dir=${gatein.working.dir}</argument> <!--argument>-Dexo.src.dir=NONE</argument--> <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xms128m</argument> @@ -531,7 +517,7 @@ <argument>-Dexo.working.dir=${gatein.working.dir}/</argument> <!--argument>-Dexo.src.dir=NONE</argument--> <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xms128m</argument> @@ -632,7 +618,7 @@ <argument>-Dexo.working.dir=${gatein.working.dir}</argument> <!--argument>-Dexo.src.dir=NONE</argument--> <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install --> - <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> + <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2... <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> <argument>-Xms128m</argument> Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2010-10-18 22:53:52 UTC (rev 4719) +++ exo/portal/branches/3.1.x/pom.xml 2010-10-18 23:35:13 UTC (rev 4720) @@ -58,6 +58,22 @@ <version.chromattic>1.0.3</version.chromattic> <version.reflect>1.0.0</version.reflect> <jcip.version>1.0</jcip.version> + + <!-- EXOGTN-106 : forced at packaging level --> + <antlr.version>2.7.6rc1</antlr.version> + <asm.version>1.5.3</asm.version> + <cglib.version>2.2</cglib.version> + <com.sun.xml.bind.version>2.1.7</com.sun.xml.bind.version> + <commons-digester.version>1.8.1</commons-digester.version> + <commons-dbcp.version>1.2.1</commons-dbcp.version> + <commons-httpclient.version>3.1</commons-httpclient.version> + <exo.tool.webunit.version>1.0.0</exo.tool.webunit.version> + <html-parser.version>1.6</html-parser.version> + <javassist.version>3.4.GA</javassist.version> + <jcr.version>1.0</jcr.version> + <org.jaxb2.version>0.1</org.jaxb2.version> + <stax.version>1.0</stax.version> + <!-- ************** --> <!-- Build settings --> <!-- ************** -->