This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mvel.
commit 7accaf6b4e9b1642a02ebf2f6bd84ee12ebc56ca Author: Damien Raude-Morvan <[email protected]> Date: Wed Feb 24 22:38:21 2010 +0000 Add maven support --- debian/TODO | 3 + debian/control | 4 +- debian/libmvel-java.poms | 2 +- debian/patches/pom.diff | 425 +++++++++---------------------------- debian/patches/series | 2 +- debian/patches/use_system_asm.diff | 4 + debian/pom.xml | 197 +++++++++++++++++ 7 files changed, 312 insertions(+), 325 deletions(-) diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..9e66e45 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,3 @@ +- Remove debian/pom.xml and use directly pom.xml + -> find a wat to patch pom.xml and use mh_patchpom cleanly + (for now, patch cannot be unapplied after mh_patchpom) diff --git a/debian/control b/debian/control index 4347a87..f90d109 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt Build-Depends-Indep: libmaven-compiler-plugin-java (>= 2.0.2), libmaven-jar-plugin-java (>= 2.2), - libsurefire-java (>= 2.4.3), junit, libxstream-java, default-jdk-doc, - libmaven-javadoc-plugin-java + libsurefire-java (>= 2.4.3), junit, default-jdk-doc, libmaven-javadoc-plugin-java, + libasm3-java, libxstream-java Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mvel/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mvel/ diff --git a/debian/libmvel-java.poms b/debian/libmvel-java.poms index d4f7111..1a7e280 100644 --- a/debian/libmvel-java.poms +++ b/debian/libmvel-java.poms @@ -1 +1 @@ -pom.xml +debian/pom.xml diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff index 2111df9..8843e7d 100644 --- a/debian/patches/pom.diff +++ b/debian/patches/pom.diff @@ -1,327 +1,110 @@ +Description: Disable some maven plugins + and add dependency on asm 3.x +Forwarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-02-24 --- a/pom.xml +++ b/pom.xml -@@ -1,152 +1,172 @@ -+<?xml version='1.0' encoding='UTF-8'?> - <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";> -- <modelVersion>4.0.0</modelVersion> -- <groupId>org.mvel</groupId> -- <artifactId>mvel2</artifactId> -- <packaging>jar</packaging> -- <version>2.0.16</version> -- <name>mvel</name> -- <url>http://mvel.codehaus.org/</url> -- -- <scm> -- <developerConnection>scm:svn:https://svn.codehaus.org/mvel/tags/mvel2-2.0.16</developerConnection> -- </scm> -- -- <pluginRepositories> -- <pluginRepository> -- <id>apache-snapshots</id> -- <name>Apache Snapshot Repository</name> -- <url>http://repository.apache.org/snapshots/</url> -- <snapshots> -- <enabled>true</enabled> -- </snapshots> -- </pluginRepository> -- -- </pluginRepositories> -- -- <build> -- -- <plugins> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-compiler-plugin</artifactId> +@@ -24,6 +24,8 @@ + </pluginRepositories> + + <build> ++ ++<!-- + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> +@@ -31,13 +33,12 @@ + <version>1.0-beta-2</version> + </extension> + </extensions> +- ++--> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.1</version> -- <configuration> -- <source>1.5</source> -- <target>1.5</target> -- <encoding>UTF-8</encoding> -- </configuration> -- </plugin> -- -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-jar-plugin</artifactId> -- <configuration> -- <archive> -- <manifest> -- <mainClass>org.mvel2.sh.Main</mainClass> -- <packageName>org.mvel2</packageName> -- </manifest> -- </archive> -- </configuration> -- </plugin> -- -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-surefire-plugin</artifactId> -- <configuration> -- <childDelegation>true</childDelegation> -- <systemProperties> -- <property> -- <name>mvel.disable.jit</name> -- <value>true</value> -- </property> -- <property> -- <name>file.encoding</name> -- <value>UTF-8</value> -- </property> -- </systemProperties> -- <includes> -- <include>**/*Test.java</include> -- <include>**/*Tests.java</include> -- <include>**/UsageDemos.java</include> -- </includes> -- <excludes> -- <exclude>**/CompiledUnitTestEx.java</exclude> -- <exclude>**/PerfTest.java</exclude> -- <exclude>**/DroolsTest.java</exclude> -- <exclude>**/FailureTests.java</exclude> -- <exclude>**/PerformanceTest.java</exclude> -- <exclude>**/CompiledPerformanceTests.java</exclude> -- <exclude>**/MVELThreadTest.java</exclude> -- </excludes> -- </configuration> -- </plugin> -- -- <plugin> -- <artifactId>maven-jar-plugin</artifactId> -- <configuration> -- <archive> -- <manifestFile>META-INF/MANIFEST.MF</manifestFile> -- </archive> -- </configuration> -- </plugin> + <configuration> + <source>1.5</source> + <target>1.5</target> +@@ -90,19 +91,18 @@ + </configuration> + </plugin> + ++<!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> +- <version>2.0-beta-9</version> + <configuration> + <tagBase>https://svn.codehaus.org/mvel/tags/</tagBase> +- <!-- See http://jira.codehaus.org/browse/SCM-406 --> + <remoteTagging>false</remoteTagging> +- <!-- Further non-mandatory but useful settings... --> + <preparationGoals>clean install</preparationGoals> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> ++--> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> +@@ -112,11 +112,11 @@ + </archive> + </configuration> + </plugin> - -- </plugins> -- </build> -- -- -- <reporting> -- <plugins> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-surefire-report-plugin</artifactId> -- </plugin> -- </plugins> -- </reporting> -- -- <dependencies> -- <dependency> -- <groupId>junit</groupId> -- <artifactId>junit</artifactId> ++ ++<!-- + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> +- <version>2.0.1</version> + <extensions>true</extensions> + <executions> + <execution> +@@ -134,7 +134,10 @@ + <Bundle-Name>mvel2</Bundle-Name> + </instructions> + </configuration> +- </plugin> ++ </plugin> ++ ++--> ++ + </plugins> + </build> + +@@ -152,14 +155,14 @@ + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> - <version>3.8.1</version> -- <scope>test</scope> -- </dependency> -- -- <dependency> -- <groupId>com.thoughtworks.xstream</groupId> -- <artifactId>xstream</artifactId> ++ <version>3.x</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> - <version>1.3.1</version> -- <scope>test</scope> -- </dependency> -- -- <dependency> -- <groupId>asm</groupId> -- <artifactId>asm</artifactId> -- <version>3.x</version> -- </dependency> -- -- <!--<dependency>--> -- <!--<groupId>org.hibernate</groupId>--> -- <!--<artifactId>ejb3-persistence</artifactId>--> -- <!--<version>1.0.2.GA</version>--> -- <!--<scope>test</scope>--> -- <!--</dependency> --> -- </dependencies> -- -- -- <distributionManagement> -- <!-- use the following if you're not using a snapshot version. --> -- <repository> -- <id>codehaus.org</id> -- <name>Codehaus Maven Repository</name> -- <url>dav:https://dav.codehaus.org/repository/mvel/</url> -- </repository> -- <!-- use the following if you ARE using a snapshot version. --> -- <snapshotRepository> -- <id>codehaus.org</id> -- <name>Codehaus Snapshot Maven Repository</name> -- <url>dav:https://dav.codehaus.org/snapshots.repository/mvel/</url> -- <uniqueVersion>false</uniqueVersion> -- </snapshotRepository> -- </distributionManagement> --</project> -+ <modelVersion>4.0.0</modelVersion> -+ <groupId>org.mvel</groupId> -+ <artifactId>mvel2</artifactId> -+ <version>2.0.16</version> -+ <packaging>jar</packaging> -+ <properties> -+ <debian.originalVersion>2.0.16</debian.originalVersion> -+ <debian.package>libmvel-java</debian.package> -+ <debian.mavenRules><![CDATA[org.mvel mvel2 jar 2.0.16 *]]></debian.mavenRules> -+ </properties> -+ -+ <name>mvel</name> -+ <url>http://mvel.codehaus.org/</url> -+ <scm> -+ <developerConnection>scm:svn:https://svn.codehaus.org/mvel/tags/mvel2-2.0.16</developerConnection> -+ </scm> -+ <pluginRepositories> -+ <pluginRepository> -+ <id>apache-snapshots</id> -+ <name>Apache Snapshot Repository</name> -+ <url>http://repository.apache.org/snapshots/</url> -+ <snapshots> -+ <enabled>true</enabled> -+ </snapshots> -+ </pluginRepository> -+ </pluginRepositories> -+ <build> -+ <extensions> -+ <extension> -+ <groupId>org.apache.maven.wagon</groupId> -+ <artifactId>wagon-webdav</artifactId> -+ <version>debian</version> -+ </extension> -+ </extensions> -+ <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <version>2.0.2</version> -+ <configuration> -+ <source>1.5</source> -+ <target>1.5</target> -+ <encoding>UTF-8</encoding> -+ </configuration> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ <configuration> -+ <archive> -+ <manifest> -+ <mainClass>org.mvel2.sh.Main</mainClass> -+ <packageName>org.mvel2</packageName> -+ </manifest> -+ </archive> -+ </configuration> -+ <version>2.2</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-surefire-plugin</artifactId> -+ <configuration> -+ <childDelegation>true</childDelegation> -+ <systemProperties> -+ <property> -+ <name>mvel.disable.jit</name> -+ <value>true</value> -+ </property> -+ <property> -+ <name>file.encoding</name> -+ <value>UTF-8</value> -+ </property> -+ </systemProperties> -+ <includes> -+ <include>**/*Test.java</include> -+ <include>**/*Tests.java</include> -+ <include>**/UsageDemos.java</include> -+ </includes> -+ <excludes> -+ <exclude>**/CompiledUnitTestEx.java</exclude> -+ <exclude>**/PerfTest.java</exclude> -+ <exclude>**/DroolsTest.java</exclude> -+ <exclude>**/FailureTests.java</exclude> -+ <exclude>**/PerformanceTest.java</exclude> -+ <exclude>**/CompiledPerformanceTests.java</exclude> -+ <exclude>**/MVELThreadTest.java</exclude> -+ </excludes> -+ </configuration> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-release-plugin</artifactId> -+ <version>2.0-beta-9</version> -+ <configuration> -+ <tagBase>https://svn.codehaus.org/mvel/tags/</tagBase> -+ <remoteTagging>false</remoteTagging> -+ <preparationGoals>clean install</preparationGoals> -+ <autoVersionSubmodules>true</autoVersionSubmodules> -+ </configuration> -+ </plugin> -+ <plugin> -+ <artifactId>maven-jar-plugin</artifactId> -+ <configuration> -+ <archive> -+ <manifestFile>META-INF/MANIFEST.MF</manifestFile> -+ </archive> -+ </configuration> -+ <version>2.2</version> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.felix</groupId> -+ <artifactId>maven-bundle-plugin</artifactId> -+ <version>2.0.1</version> -+ <extensions>true</extensions> -+ <executions> -+ <execution> -+ <id>manifest</id> -+ <phase>process-classes</phase> -+ <goals> -+ <goal>manifest</goal> -+ </goals> -+ </execution> -+ </executions> -+ <configuration> -+ <manifestLocation>META-INF</manifestLocation> -+ <instructions> -+ <Bundle-SymbolicName>org.mvel2</Bundle-SymbolicName> -+ <Bundle-Name>mvel2</Bundle-Name> -+ </instructions> -+ </configuration> -+ </plugin> -+ </plugins> -+ </build> -+ <reporting> -+ <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-surefire-report-plugin</artifactId> -+ <version>2.4.3</version> -+ </plugin> -+ </plugins> -+ </reporting> -+ <dependencies> -+ <dependency> -+ <groupId>junit</groupId> -+ <artifactId>junit</artifactId> -+ <version>3.x</version> -+ <scope>test</scope> -+ </dependency> -+ <dependency> -+ <groupId>com.thoughtworks.xstream</groupId> -+ <artifactId>xstream</artifactId> -+ <version>debian</version> -+ <scope>test</scope> -+ </dependency> -+ </dependencies> -+ <distributionManagement> -+ <repository> -+ <id>codehaus.org</id> -+ <name>Codehaus Maven Repository</name> -+ <url>dav:https://dav.codehaus.org/repository/mvel/</url> -+ </repository> -+ <snapshotRepository> -+ <id>codehaus.org</id> -+ <name>Codehaus Snapshot Maven Repository</name> -+ <url>dav:https://dav.codehaus.org/snapshots.repository/mvel/</url> -+ <uniqueVersion>false</uniqueVersion> -+ </snapshotRepository> -+ </distributionManagement> -+</project> -\ No newline at end of file ++ <version>debian</version> + <scope>test</scope> + </dependency> + +@@ -169,6 +172,13 @@ + <!--<version>1.0.2.GA</version>--> + <!--<scope>test</scope>--> + <!--</dependency> --> ++ ++ <dependency> ++ <groupId>asm</groupId> ++ <artifactId>asm</artifactId> ++ <version>3.x</version> ++ </dependency> ++ + </dependencies> + + diff --git a/debian/patches/series b/debian/patches/series index 1502484..eec4d9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -#pom.diff +pom.diff use_system_asm.diff diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff index 8908813..dee13f0 100644 --- a/debian/patches/use_system_asm.diff +++ b/debian/patches/use_system_asm.diff @@ -1,3 +1,7 @@ +Description: Use system ASM 3.x instead of bundled (stripped) one +Forwarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-02-24 --- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java +++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java @@ -24,13 +24,13 @@ diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..8463a28 --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,197 @@ +<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";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.mvel</groupId> + <artifactId>mvel2</artifactId> + <packaging>jar</packaging> + <version>2.0.16</version> + <name>mvel</name> + <url>http://mvel.codehaus.org/</url> + + <scm> + <developerConnection>scm:svn:https://svn.codehaus.org/mvel/tags/mvel2-2.0.16</developerConnection> + </scm> + + <pluginRepositories> + <pluginRepository> + <id>apache-snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + </pluginRepositories> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.mvel2.sh.Main</mainClass> + <packageName>org.mvel2</packageName> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <childDelegation>true</childDelegation> + <systemProperties> + <property> + <name>mvel.disable.jit</name> + <value>true</value> + </property> + <property> + <name>file.encoding</name> + <value>UTF-8</value> + </property> + </systemProperties> + <includes> + <include>**/*Test.java</include> + <include>**/*Tests.java</include> + <include>**/UsageDemos.java</include> + </includes> + <excludes> + <exclude>**/CompiledUnitTestEx.java</exclude> + <exclude>**/PerfTest.java</exclude> + <exclude>**/DroolsTest.java</exclude> + <exclude>**/FailureTests.java</exclude> + <exclude>**/PerformanceTest.java</exclude> + <exclude>**/CompiledPerformanceTests.java</exclude> + <exclude>**/MVELThreadTest.java</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + <configuration> + <tagBase>https://svn.codehaus.org/mvel/tags/</tagBase> + <!-- See http://jira.codehaus.org/browse/SCM-406 --> + <remoteTagging>false</remoteTagging> + <!-- Further non-mandatory but useful settings... --> + <preparationGoals>clean install</preparationGoals> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.1</version> + <extensions>true</extensions> + <executions> + <execution> + <id>manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + <configuration> + <manifestLocation>META-INF</manifestLocation> + <instructions> + <Bundle-SymbolicName>org.mvel2</Bundle-SymbolicName> + <Bundle-Name>mvel2</Bundle-Name> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + <scope>test</scope> + </dependency> + + <!--<dependency>--> + <!--<groupId>org.hibernate</groupId>--> + <!--<artifactId>ejb3-persistence</artifactId>--> + <!--<version>1.0.2.GA</version>--> + <!--<scope>test</scope>--> + <!--</dependency> --> + + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>3.x</version> + </dependency> + + </dependencies> + + + <distributionManagement> + <!-- use the following if you're not using a snapshot version. --> + <repository> + <id>codehaus.org</id> + <name>Codehaus Maven Repository</name> + <url>dav:https://dav.codehaus.org/repository/mvel/</url> + </repository> + <!-- use the following if you ARE using a snapshot version. --> + <snapshotRepository> + <id>codehaus.org</id> + <name>Codehaus Snapshot Maven Repository</name> + <url>dav:https://dav.codehaus.org/snapshots.repository/mvel/</url> + <uniqueVersion>false</uniqueVersion> + </snapshotRepository> + </distributionManagement> +</project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
