Author: taylor
Date: Tue Nov 22 19:22:43 2005
New Revision: 348349
URL: http://svn.apache.org/viewcvs?rev=348349&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-413
Simplify Build, step two
moving example portlet apps to bridges
finishing up multiproject build
Added:
portals/bridges/trunk/applications/project.xml
Modified:
portals/bridges/trunk/perl/project.xml
portals/bridges/trunk/project.properties
Added: portals/bridges/trunk/applications/project.xml
URL:
http://svn.apache.org/viewcvs/portals/bridges/trunk/applications/project.xml?rev=348349&view=auto
==============================================================================
--- portals/bridges/trunk/applications/project.xml (added)
+++ portals/bridges/trunk/applications/project.xml Tue Nov 22 19:22:43 2005
@@ -0,0 +1,8 @@
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <artifactId>BAD</artifactId>
+ <name>This should not be built</name>
+ <groupId>BAD</groupId>
+ <properties/>
+</project>
\ No newline at end of file
Modified: portals/bridges/trunk/perl/project.xml
URL:
http://svn.apache.org/viewcvs/portals/bridges/trunk/perl/project.xml?rev=348349&r1=348348&r2=348349&view=diff
==============================================================================
--- portals/bridges/trunk/perl/project.xml (original)
+++ portals/bridges/trunk/perl/project.xml Tue Nov 22 19:22:43 2005
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
<id>jetspeed2:jetspeed-rewriter</id>
- <version>2.0-M3</version>
+ <version>${jetspeed.rewriter.version}</version>
<type>jar</type>
</dependency>
<dependency>
Modified: portals/bridges/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/portals/bridges/trunk/project.properties?rev=348349&r1=348348&r2=348349&view=diff
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Tue Nov 22 19:22:43 2005
@@ -41,8 +41,9 @@
# ---------------------------------------------------------------------------
# Multiproject settings
-maven.multiproject.includes=*/project.xml
-maven.multiproject.excludes=project.xml
+maven.multiproject.includes=*/project.xml,applications/*/project.xml
+maven.multiproject.excludes=project.xml,applications/project.xml
+
maven.multiproject.site.goals=site,dashboard:report-single
jar.includes=*/project.xml
@@ -72,6 +73,7 @@
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
# bridges versions
+portals.bridges.version=0.4-dev
portals.bridges.common.version=0.4-dev
portals.bridges.frameworks.version=0.4-dev
portals.bridges.jsf.version=0.4-dev
@@ -89,3 +91,9 @@
myfaces.version=1.1.0
spring.version=1.1.5
jython.version=2.2a1
+jetspeed.rewriter.version=2.0-dev
+log4j.version=1.2.8
+# Whether or not to include log4j in war files. Your container may already
have this.
+log4j.include=true
+# Whether or not to include commons-logging in war files. Your container may
already have this.
+commons.logging.include=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
