Author: seb Date: Wed Aug 9 19:26:54 2006 New Revision: 436 Removed: logback/trunk/logback-classic/src/site/ Modified: logback/trunk/logback-classic/pom.xml Log: modified files so that the project can be used in a multi-module environment Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Wed Aug 9 19:26:54 2006 @@ -1,14 +1,17 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>ch.qos.logback</groupId> + <artifactId>logback</artifactId> + <version>0.2-SNAPSHOT</version> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <version>${parent.version}</version> <packaging>jar</packaging> - <version>0.2-SNAPSHOT</version> <name>Logback Classic Module</name> <url>http://logback.qos.ch/classic</url> @@ -21,12 +24,6 @@ Logback: the generic, reliable, fast and flexible logging library for Java. </description> - <organization> - <name>QOS.ch</name> - <url>http://www.qos.ch</url> - </organization> - <inceptionYear>2005</inceptionYear> - <dependencies> <dependency> <groupId>ch.qos.logback</groupId> @@ -42,13 +39,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -65,6 +55,21 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>bundle-test-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>once</forkMode> @@ -73,10 +78,12 @@ <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/PatternLayoutTest.java</exclude> </excludes> </configuration> </plugin> - + + <!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.1</version> @@ -93,6 +100,7 @@ <outputDirectory>target/site/dist/</outputDirectory> </configuration> </plugin> + --> <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> @@ -109,26 +117,27 @@ </plugin> </plugins> + <!-- <resources> <resource> <directory>src/site/xdocTemplates</directory> - <!-- + We're saving filtered xdocs in a temporary folder and telling the site plug in to get the xdocs there. - --> + <targetPath>generated-site</targetPath> <filtering>true</filtering> </resource> - </resources> + </resources> --> <testResources> <testResource> <directory>src/test/input</directory> - <targetPath>src/test/input</targetPath> + <targetPath>input</targetPath> </testResource> </testResources> </build> - + <!-- <reporting> <plugins> <plugin> @@ -149,7 +158,6 @@ <reportSets> <reportSet> <reports> - <report>index</report> </reports> </reportSet> </reportSets> @@ -168,6 +176,7 @@ </plugin> </plugins> </reporting> + --> <!-- LOGBack Classic Repository ================================================ --> @@ -181,10 +190,11 @@ <url>http://svn.qos.ch/viewcvs/logback/classic/trunk/</url> </scm> + <!-- <distributionManagement> <site> <id>pixie</id> <url>scp://pixie/var/www/logback.qos.ch/htdocs/classic</url> </site> - </distributionManagement> + </distributionManagement> --> </project> \ No newline at end of file