Author: seb Date: Tue Jan 16 20:12:49 2007 New Revision: 1238 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 logback/trunk/src/main/assembly/dist.xml Log: Added automated translation of the jdk15 classes into jdk14 jars, with verification. Modified: logback/trunk/log4j-bridge/pom.xml ============================================================================== --- logback/trunk/log4j-bridge/pom.xml (original) +++ logback/trunk/log4j-bridge/pom.xml Tue Jan 16 20:12:49 2007 @@ -36,5 +36,59 @@ <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> + <goals> + <goal>translate</goal> + </goals> + <configuration> + <includes> + <include> + <directory>${project.build.outputDirectory}</directory> + </include> + </includes> + <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> + <verify>true</verify> + <failonwarning>false</failonwarning> + <verifyClasspath> + <element>${path.to.rt.jar}</element> + </verifyClasspath> + </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> </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 Tue Jan 16 20:12:49 2007 @@ -109,6 +109,55 @@ </configuration> </plugin> + <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> + <goals> + <goal>translate</goal> + </goals> + <configuration> + <includes> + <include> + <directory>${project.build.outputDirectory}</directory> + </include> + </includes> + <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> + <verify>true</verify> + <failonwarning>false</failonwarning> + <verifyClasspath> + <element>${path.to.rt.jar}</element> + </verifyClasspath> + </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 Tue Jan 16 20:12:49 2007 @@ -1,139 +1,176 @@ -<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>logback-classic</artifactId> - <version>0.8.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Logback Classic 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> GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <scope>compile</scope> - </dependency> - - </dependencies> - - <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-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> - <reportFormat>plain</reportFormat> - <trimStackTrace>false</trimStackTrace> - <excludes> - <exclude>**/AllTest.java</exclude> - <exclude>**/PackageTest.java</exclude> - <exclude>**/SerializationPerfsTest.java</exclude> - <exclude>**/LoggerPerfTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - - - <testResources> - <testResource> - <directory>src/test/input</directory> - <targetPath>input</targetPath> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <targetPath>/</targetPath> - </testResource> - </testResources> - </build> +<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>logback-classic</artifactId> + <version>0.8.1-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Logback Classic 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>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + </license> + </licenses> + + <dependencies> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <scope>compile</scope> + </dependency> + + </dependencies> + + <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-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> + <reportFormat>plain</reportFormat> + <trimStackTrace>false</trimStackTrace> + <excludes> + <exclude>**/AllTest.java</exclude> + <exclude>**/PackageTest.java</exclude> + <exclude>**/SerializationPerfsTest.java</exclude> + <exclude>**/LoggerPerfTest.java</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>retrotranslator-maven-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>translate</goal> + </goals> + <configuration> + <includes> + <include> + <directory>${project.build.outputDirectory}</directory> + </include> + </includes> + <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> + <verify>true</verify> + <failonwarning>false</failonwarning> + <verifyClasspath> + <element>${path.to.rt.jar}</element> + </verifyClasspath> + </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> + + + <testResources> + <testResource> + <directory>src/test/input</directory> + <targetPath>input</targetPath> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <targetPath>/</targetPath> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Tue Jan 16 20:12:49 2007 @@ -1,109 +1,144 @@ -<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>logback-core</artifactId> - <version>0.8.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Logback Core 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> GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - - - <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-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <trimStackTrace>false</trimStackTrace> - <excludes> - <exclude>**/AllTest.java</exclude> - <exclude>**/PackageTest.java</exclude> - <exclude>**/SizeBasedRollingTest.java</exclude> +<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>logback-core</artifactId> + <version>0.8.1-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Logback Core 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>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + </license> + </licenses> + + <dependencies> + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + + + <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-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <reportFormat>plain</reportFormat> + <trimStackTrace>false</trimStackTrace> + <excludes> + <exclude>**/AllTest.java</exclude> + <exclude>**/PackageTest.java</exclude> + <exclude>**/SizeBasedRollingTest.java</exclude> <exclude>**/TimeBasedRollingTest.java</exclude> - </excludes> - </configuration> - </plugin> - - <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> - - </plugins> - - <testResources> - <testResource> - <directory>src/test/input</directory> - <targetPath>input</targetPath> - </testResource> - <testResource> - <directory>src/test/witness</directory> - <targetPath>witness</targetPath> - </testResource> - </testResources> - - </build> + </excludes> + </configuration> + </plugin> + + <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> + <goals> + <goal>translate</goal> + </goals> + <configuration> + <includes> + <include> + <directory>${project.build.outputDirectory}</directory> + </include> + </includes> + <destjar>target/${artifactId}-${project.version}-jdk14.jar</destjar> + <verify>true</verify> + <failonwarning>false</failonwarning> + <verifyClasspath> + <element>${path.to.rt.jar}</element> + </verifyClasspath> + </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> + + <testResources> + <testResource> + <directory>src/test/input</directory> + <targetPath>input</targetPath> + </testResource> + <testResource> + <directory>src/test/witness</directory> + <targetPath>witness</targetPath> + </testResource> + </testResources> + + </build> </project> \ No newline at end of file Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Tue Jan 16 20:12:49 2007 @@ -34,11 +34,22 @@ <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> --> </properties> <dependencyManagement> @@ -113,7 +124,7 @@ <groupId>javax.jms</groupId> <artifactId>jms</artifactId> <version>1.1</version> - </dependency> + </dependency> </dependencies> </dependencyManagement> @@ -170,9 +181,7 @@ <configuration> <downloadSources>true</downloadSources> </configuration> - </plugin> - - + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> @@ -183,7 +192,6 @@ </excludes> </configuration> </plugin> - </plugins> </build> @@ -286,22 +294,7 @@ <outputDirectory>target/dist/</outputDirectory> </configuration> </plugin> - - - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase> - https://svn.qos.ch/repos/logback/tags/ - </tagBase> - <preparationGoals> - clean, compile source:jar site, assembly:assembly - </preparationGoals> - <goals> - site:deploy, deploy - </goals> - </configuration> - </plugin> + </plugins> </reporting> Modified: logback/trunk/src/main/assembly/dist.xml ============================================================================== --- logback/trunk/src/main/assembly/dist.xml (original) +++ logback/trunk/src/main/assembly/dist.xml Tue Jan 16 20:12:49 2007 @@ -228,6 +228,38 @@ </includes> </fileSet> + <!-- Module JDK14 JARs --> + <fileSet> + <directory>logback-core/target/</directory> + <outputDirectory>/jdk14/</outputDirectory> + <includes> + <include>logback-core-${project.version}-jdk14.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>logback-classic/target/</directory> + <outputDirectory>/jdk14/</outputDirectory> + <includes> + <include>logback-classic-${project.version}-jdk14.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>logback-access/target/</directory> + <outputDirectory>/jdk14/</outputDirectory> + <includes> + <include>logback-access-${project.version}-jdk14.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>log4j-bridge/target/</directory> + <outputDirectory>/jdk14/</outputDirectory> + <includes> + <include>log4j-bridge-${project.version}-jdk14.jar</include> + </includes> + </fileSet> + + + <!-- Website --> <fileSet> <directory>target/site</directory>