[Jsf4portlets-devel] SF.net SVN: jsf4portlets: [26] trunk
Status: Alpha
Brought to you by:
alonsoft
From: <alo...@us...> - 2007-08-23 17:29:24
|
Revision: 26 http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=26&view=rev Author: alonsoft Date: 2007-08-23 10:29:22 -0700 (Thu, 23 Aug 2007) Log Message: ----------- Revision of maven files. Modified Paths: -------------- trunk/jsf4portlets/pom.xml trunk/pom.xml trunk/src/assembly/bin.xml Added Paths: ----------- trunk/src/ trunk/src/assembly/ Removed Paths: ------------- trunk/jsf4portlets/src/assembly/ Modified: trunk/jsf4portlets/pom.xml =================================================================== --- trunk/jsf4portlets/pom.xml 2007-08-23 17:18:01 UTC (rev 25) +++ trunk/jsf4portlets/pom.xml 2007-08-23 17:29:22 UTC (rev 26) @@ -71,26 +71,6 @@ </reporting> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> </build> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-08-23 17:18:01 UTC (rev 25) +++ trunk/pom.xml 2007-08-23 17:29:22 UTC (rev 26) @@ -79,17 +79,21 @@ </modules> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> @@ -123,76 +127,83 @@ </reporting> <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>avalon-framework</artifactId> - <groupId>avalon-framework</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - <exclusion> - <artifactId>logkit</artifactId> - <groupId>logkit</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>avalon-framework</artifactId> + <groupId>avalon-framework</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>logkit</artifactId> + <groupId>logkit</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>net.sf.jsf4portlets</groupId> + <artifactId>jsf4portlets</artifactId> + <version>${pom.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement> </project> Copied: trunk/src/assembly (from rev 25, trunk/jsf4portlets/src/assembly) Modified: trunk/src/assembly/bin.xml =================================================================== --- trunk/jsf4portlets/src/assembly/bin.xml 2007-08-23 17:18:01 UTC (rev 25) +++ trunk/src/assembly/bin.xml 2007-08-23 17:29:22 UTC (rev 26) @@ -29,6 +29,25 @@ <format>tar.bz2</format> <format>zip</format> </formats> + <moduleSets> + <moduleSet> + <includes> + <include>net.sf.jsf4portlets:jsf4portlets</include> + <include>net.sf.jsf4portlets:jsf4portlets-ext</include> + </includes> + <binaries> + <outputDirectory>/lib</outputDirectory> + <unpack>false</unpack> + <includeDependecies>false</includeDependencies> + <dependencySets> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> <fileSets> <fileSet> <includes> @@ -59,10 +78,4 @@ </includes> </fileSet> </fileSets> - <dependencySets> - <dependencySet> - <outputDirectory>/lib</outputDirectory> - <scope>runtime</scope> - </dependencySet> - </dependencySets> </assembly> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |