[portal-commits] JBoss Portal SVN: r13602 - in modules/portlet/trunk: portlet and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2009-07-24 14:03:18 -0400 (Fri, 24 Jul 2009) New Revision: 13602 Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/portlet/pom.xml Log: - Use most recent version of web module. - Do not bundle shared libs. Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2009-07-24 17:51:51 UTC (rev 13601) +++ modules/portlet/trunk/build/pom.xml 2009-07-24 18:03:18 UTC (rev 13602) @@ -34,7 +34,7 @@ <version.jbossxb>2.0.0.GA</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.3</version.jboss.portal.common> - <version.jboss.portal.web>1.2.3</version.jboss.portal.web> + <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> <version.jboss.unit>1.2.2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> @@ -102,11 +102,11 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration> - <archive> - <manifest> - <addClasspath>false</addClasspath> - </manifest> - </archive> + <archive> + <manifest> + <addClasspath>false</addClasspath> + </manifest> + </archive> </configuration> </plugin> </plugins> @@ -223,9 +223,9 @@ <version>${version.javax.servlet.jsp}</version> </dependency> <dependency> - <groupId>javax.ccpp</groupId> - <artifactId>ccpp</artifactId> - <version>${version.ccpp-api}</version> + <groupId>javax.ccpp</groupId> + <artifactId>ccpp</artifactId> + <version>${version.ccpp-api}</version> </dependency> <dependency> Modified: modules/portlet/trunk/portlet/pom.xml =================================================================== --- modules/portlet/trunk/portlet/pom.xml 2009-07-24 17:51:51 UTC (rev 13601) +++ modules/portlet/trunk/portlet/pom.xml 2009-07-24 18:03:18 UTC (rev 13602) @@ -12,14 +12,14 @@ <name>portlet</name> <dependencies> -<!-- + <!-- + <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-jsr168api</artifactId> + <version>${project.version}</version> + </dependency> + --> <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-jsr168api</artifactId> - <version>${project.version}</version> - </dependency> ---> - <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> </dependency> @@ -38,10 +38,11 @@ <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ccpp</groupId> - <artifactId>ccpp</artifactId> + <groupId>javax.ccpp</groupId> + <artifactId>ccpp</artifactId> </dependency> <!--TEST SCOPE--> @@ -53,7 +54,6 @@ </dependencies> - <profiles> <!--By default Annotation Processing Tool related classes need to be disabled--> <profile> @@ -116,7 +116,7 @@ <scope>system</scope> <systemPath>${java.home}/../lib/tools.jar</systemPath> </dependency> - </dependencies> + </dependencies> </profile> <!--On MacOSX the tools.jar should be already in the classpath--> @@ -150,7 +150,6 @@ </profiles> - <build> <plugins> <plugin>