Author: seb Date: Wed Jan 17 15:39:24 2007 New Revision: 1241 Modified: logback/trunk/log4j-bridge/pom.xml logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/pom.xml Log: Better use of the Retrotranslator plugin. The JKD1.4 jars are always created. By default, there is no verification. When the "retrotranslator" profile is called, the verification is done. Thus, this profile require the property path.to.rt.jar to be set. Modified: logback/trunk/log4j-bridge/pom.xml ============================================================================== --- logback/trunk/log4j-bridge/pom.xml (original) +++ logback/trunk/log4j-bridge/pom.xml Wed Jan 17 15:39:24 2007 @@ -1,94 +1,91 @@ -<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-parent</artifactId> + <version>0.8.1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>ch.qos.logback</groupId> + <artifactId>log4j-bridge</artifactId> + <version>0.8.1-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Log4j Bridge Module</name> + + <url>http://logback.qos.ch</url> + <description> + <!-- + Never _never_ let Eclipse's auto format function add + a line return in the description. + The generated jar will contain a corrupt MANIFEST file. + --> + Logback: the generic, reliable, fast and flexible logging library for Java. + </description> + <licenses> + <license> + <name>Apache Software Licenses</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <dependencies> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <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> - <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>0.8.1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>ch.qos.logback</groupId> - <artifactId>log4j-bridge</artifactId> - <version>0.8.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Log4j Bridge Module</name> - - <url>http://logback.qos.ch</url> - <description> - <!-- - Never _never_ let Eclipse's auto format function add - a line return in the description. - The generated jar will contain a corrupt MANIFEST file. - --> - Logback: the generic, reliable, fast and flexible logging library for Java. - </description> - <licenses> - <license> - <name>Apache Software Licenses</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <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.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> + <phase>process-classes</phase> <goals> <goal>translate</goal> </goals> <configuration> <includes> <include> - <directory>${project.build.outputDirectory}</directory> + <directory> + ${project.build.outputDirectory} + </directory> </include> </includes> - <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> - <verify>true</verify> - <failonwarning>false</failonwarning> + <destjar> + target/${artifactId}-${project.version}-jdk14.jar + </destjar> + <verify>${retrotranslator.verify}</verify> <verifyClasspath> <element>${path.to.rt.jar}</element> </verifyClasspath> + <failonwarning>false</failonwarning> </configuration> </execution> </executions> - <!-- dependencies> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>compile</scope> - </dependency> - </dependencies --> </plugin> - - </plugins> - </build> + </plugins> + </build> </project> \ No newline at end of file Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Wed Jan 17 15:39:24 2007 @@ -123,41 +123,36 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> + <phase>process-classes</phase> <goals> <goal>translate</goal> </goals> <configuration> <includes> <include> - <directory>${project.build.outputDirectory}</directory> + <directory> + ${project.build.outputDirectory} + </directory> </include> </includes> - <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> - <verify>true</verify> - <failonwarning>false</failonwarning> + <destjar> + target/${artifactId}-${project.version}-jdk14.jar + </destjar> + <verify>${retrotranslator.verify}</verify> <verifyClasspath> <element>${path.to.rt.jar}</element> </verifyClasspath> + <failonwarning>false</failonwarning> </configuration> </execution> </executions> - <!-- dependencies> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>compile</scope> - </dependency> - </dependencies --> </plugin> - </plugins> </build> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Wed Jan 17 15:39:24 2007 @@ -123,41 +123,36 @@ </excludes> </configuration> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> + <phase>process-classes</phase> <goals> <goal>translate</goal> </goals> <configuration> <includes> <include> - <directory>${project.build.outputDirectory}</directory> + <directory> + ${project.build.outputDirectory} + </directory> </include> </includes> - <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> - <verify>true</verify> - <failonwarning>false</failonwarning> + <destjar> + target/${artifactId}-${project.version}-jdk14.jar + </destjar> + <verify>${retrotranslator.verify}</verify> <verifyClasspath> <element>${path.to.rt.jar}</element> </verifyClasspath> + <failonwarning>false</failonwarning> </configuration> </execution> </executions> - <!-- dependencies> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>compile</scope> - </dependency> - </dependencies --> </plugin> - </plugins> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Wed Jan 17 15:39:24 2007 @@ -93,38 +93,34 @@ </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> + <phase>process-classes</phase> <goals> <goal>translate</goal> </goals> <configuration> <includes> <include> - <directory>${project.build.outputDirectory}</directory> + <directory> + ${project.build.outputDirectory} + </directory> </include> </includes> - <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> - <verify>true</verify> - <failonwarning>false</failonwarning> + <destjar> + target/${artifactId}-${project.version}-jdk14.jar + </destjar> + <verify>${retrotranslator.verify}</verify> <verifyClasspath> <element>${path.to.rt.jar}</element> </verifyClasspath> + <failonwarning>false</failonwarning> </configuration> </execution> </executions> - <!-- dependencies> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>compile</scope> - </dependency> - </dependencies --> </plugin> </plugins> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Wed Jan 17 15:39:24 2007 @@ -34,22 +34,12 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>net.sf.retrotranslator</groupId> - <artifactId>retrotranslator-runtime</artifactId> - <version>1.0.8</version> - <scope>compile</scope> - </dependency> </dependencies> <properties> <!-- slf4j.version property is used by setClasspath.cmd --> - <slf4j.version>1.1.0</slf4j.version> - <!-- - This next variable should be declared either here or in - your maven_home/conf/settings.xml file - --> - <!-- <path.to.rt.jar>C:/j2sdk1.4.2_13/jre/lib/rt.jar</path.to.rt.jar> --> + <slf4j.version>1.1.0</slf4j.version> + <retrotranslator.verify>false</retrotranslator.verify> </properties> <dependencyManagement> @@ -135,6 +125,30 @@ <maven.test.skip>true</maven.test.skip> </properties> </profile> + <profile> + <!-- + The use of this profile requires to set + the <path.to.rt.jar> property in the + MAVEN_HOME/conf/settings.xml file. + The variable should point to a JDK1.4 + rt.jar file. + --> + <id>retrotranslator</id> + <properties> + <retrotranslator.verify>true</retrotranslator.verify> + </properties> + <dependencies> + <dependency> + <groupId>net.sf.retrotranslator</groupId> + <artifactId>retrotranslator-runtime</artifactId> + <version>1.0.8</version> + <scope>compile</scope> + </dependency> + </dependencies> + <build> + <defaultGoal>process-classes</defaultGoal> + </build> + </profile> </profiles> <build>