Commit bbf26589 authored by leberre's avatar leberre

Updated pom to make the releases 2.1.0 SNAPSHOT.


git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@270 ba638df5-4473-46d1-82f8-c3ae2a17a6e1
parent 0ebeeabb
<project name="sat4j" default="default"> <project name="sat4j" default="p2">
<property name="testreport.dir" value="tests"/> <property name="testreport.dir" value="tests"/>
<property name="build" value="bin" /> <property name="build" value="bin" />
<property name="doc" value="api" /> <property name="doc" value="api" />
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
<include name="commons-cli.jar"/> <include name="commons-cli.jar"/>
</zipgroupfileset> </zipgroupfileset>
</jar> </jar>
<antcall target="zip-bundle">
<param name="package" value="maxsat"/>
</antcall>
</target> </target>
<target name="csp" depends="core" description="Build a jar file suitable for the CSP competitions from current source tree"> <target name="csp" depends="core" description="Build a jar file suitable for the CSP competitions from current source tree">
...@@ -98,7 +101,7 @@ ...@@ -98,7 +101,7 @@
</antcall> </antcall>
</target> </target>
<target name="sudoku" depends="core" description="Build the sudoku demo from CVS"> <target name="sudoku" depends="core" description="Build the sudoku demo from current source tree">
<echo>Building Sudoku app ${java.home}</echo> <echo>Building Sudoku app ${java.home}</echo>
<antcall target="build"> <antcall target="build">
<param name="package" value="sudoku"/> <param name="package" value="sudoku"/>
...@@ -196,32 +199,7 @@ ...@@ -196,32 +199,7 @@
</fileset> </fileset>
</copy> </copy>
<replace dir="${build}" token="9.9.9.token" value="${release}.v${BUILD_DATE}"><include name="**/*.version"/><include name="**/*.MF"/></replace> <replace dir="${build}" token="9.9.9.token" value="${release}.v${BUILD_DATE}"><include name="**/*.version"/><include name="**/*.MF"/></replace>
<jar destfile="${dist}/${release}/${jarname}.jar" basedir="${build}" manifest="${build}/META-INF/MANIFEST.MF"> <jar destfile="${dist}/${release}/${jarname}.jar" basedir="${build}" manifest="${build}/META-INF/MANIFEST.MF"/>
<!--
<manifest>
<attribute name="Built-By" value="Daniel Le Berre"/>
<attribute name="Main-Class" value="${mainclass}"/>
<attribute name="SplashScreen-Image" value="sat4j.png"/>
<attribute name="Specification-Title" value="SAT4J"/>
<attribute name="Specification-Version" value="1.5+"/>
<attribute name="Specification-Vendor"
value="Daniel Le Berre"
/>
<attribute name="Implementation-Title" value="SAT4J"/>
<attribute name="Implementation-Version" value="NA "/>
<attribute name="Implementation-Vendor"
value="CRIL-CNRS FRE 2499"
/>
</manifest>
<zipgroupfileset dir="${lib}">
<include name="commons*.jar"/>
<include name="jlf*.jar"/>
<include name="csp*.jar"/>
<include name="js.jar"/>
</zipgroupfileset>
-->
</jar>
<copy todir="${dist}/${release}/lib" failonerror="false"> <copy todir="${dist}/${release}/lib" failonerror="false">
<fileset dir="${lib}"> <fileset dir="${lib}">
<include name="commons*.jar"/> <include name="commons*.jar"/>
...@@ -285,28 +263,39 @@ ...@@ -285,28 +263,39 @@
<param name="module" value="csp"/> <param name="module" value="csp"/>
<param name="lib" value="csp/lib"/> <param name="lib" value="csp/lib"/>
</antcall> </antcall>
</target> </target>
<target name="default" <target name="tests"
depends="sat" description="Build the SAT4J library and the associated Javadoc from CVS" description="Launch JUnit tests and generate a report">
> <echo>Compiling test files</echo>
<antcall target="javadoc"> <javac srcdir="${test}" destdir="${build}" source="1.5" debug="true">
<param name="src" value="core/src"/> <classpath refid="somePath"/>
<param name="lib" value="core/lib"/> </javac>
</antcall> <echo>Running JUNIT tests</echo>
<echo> <junit printsummary="yes" haltonfailure="no" fork="yes">
You just built SAT4J from CVS. <classpath refid="somePath"/>
The code might not be in a very good shape. <formatter type="plain"/>
You should take a look at http://www.sat4j.org/junit/ <jvmarg value="-ea"/>
to check that the functional tests are ok. <jvmarg value="-Xms500M"/>
Use that snapshot at your own risk! :-=) <jvmarg value="-Xmx500M"/>
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ <jvmarg value="-Dtest.prefix=${basedir}/org.sat4j.core/src/test/testfiles/"/>
Please fill bug reports and feature requests at <jvmarg value="-Dtest.pbprefix=${basedir}/org.sat4j.pb/src/test/testfiles/"/>
http://forge.objectweb.org/tracker/?group_id=228
</echo>
</target>
<target name="p2" depends="cleanrelease,core,pseudo" description="Build a full release of SAT4J project"> <batchtest fork="yes" todir="${testreport.dir}">
<echo>Built full release ${release}</echo> <fileset dir="${build}">
<exclude name="**/AllTests.class" />
<exclude name="**/Abstract*Test.class" />
<include name="**/*Test.class" />
</fileset>
</batchtest>
</junit>
</target>
<target name="p2-tests" description="Runs tests for packages that ship with Eclipse">
<antcall target="tests">
<param name="test" value="org.sat4j.core/src/test/java:org.sat4j.pb/src/test/java" />
</antcall>
</target>
<target name="p2" depends="cleanrelease,core,pseudo" description="Build a release of SAT4J Core and SAT4J Pseudo to be used in Eclipse p2">
<echo>Built release ${release} of both SAT4J Core and SAT4J Pseudo</echo>
</target> </target>
<target name="all" depends="cleanrelease,core,pseudo,maxsat,csp,sat,sudoku" description="Build a full release of SAT4J project"> <target name="all" depends="cleanrelease,core,pseudo,maxsat,csp,sat,sudoku" description="Build a full release of SAT4J project">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<name>SAT4J core</name> <name>SAT4J core</name>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.csp.xmlparser</artifactId> <artifactId>org.sat4j.csp.xmlparser</artifactId>
<name>SAT4J csp xml parser</name> <name>SAT4J csp xml parser</name>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.csp</artifactId> <artifactId>org.sat4j.csp</artifactId>
<name>SAT4J csp</name> <name>SAT4J csp</name>
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.csp.xmlparser</artifactId> <artifactId>org.sat4j.csp.xmlparser</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>rhino</groupId> <groupId>rhino</groupId>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.maxsat</artifactId> <artifactId>org.sat4j.maxsat</artifactId>
<name>SAT4J maxsat</name> <name>SAT4J maxsat</name>
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pb</artifactId> <artifactId>org.sat4j.pb</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.multicore</artifactId> <artifactId>org.sat4j.multicore</artifactId>
<name>SAT4J multicore</name> <name>SAT4J multicore</name>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<description> <description>
The pb library contains algorithms for solving pseudo boolean optimization problems. The pb library contains algorithms for solving pseudo boolean optimization problems.
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.sat4j.sat</artifactId> <artifactId>org.sat4j.sat</artifactId>
<name>SAT4J sat</name> <name>SAT4J sat</name>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dependency> <dependency>
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId> <artifactId>org.sat4j.core</artifactId>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<groupId>org.sat4j</groupId> <groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pom</artifactId> <artifactId>org.sat4j.pom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.2</version> <version>2.1.0-SNAPSHOT</version>
<name>SAT4J</name> <name>SAT4J</name>
<url>http://www.sat4j.org</url> <url>http://www.sat4j.org</url>
<description> <description>
...@@ -54,7 +54,8 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -54,7 +54,8 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<!-- compiler params --> <!-- compiler params -->
<javaSource>1.5</javaSource> <javaSource>1.5</javaSource>
<javaTarget>jsr14</javaTarget> <javaTarget>jsr14</javaTarget>
<testSource>1.5</testSource>
<testTarget>1.5</testTarget>
<!-- common distribution locations --> <!-- common distribution locations -->
<distributionRepositoryId>releases</distributionRepositoryId> <distributionRepositoryId>releases</distributionRepositoryId>
<distributionRepositoryUrl> <distributionRepositoryUrl>
...@@ -90,7 +91,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -90,7 +91,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId> <artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
</extension> </extension>
</extensions> </extensions>
...@@ -114,7 +114,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -114,7 +114,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
<configuration> <configuration>
<forkMode>pertest</forkMode> <forkMode>pertest</forkMode>
<argLine>-enableassertions -Xmx512m</argLine> <argLine>-enableassertions -Xmx512m</argLine>
...@@ -136,11 +135,13 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -136,11 +135,13 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin <artifactId>maven-compiler-plugin</artifactId>
</artifactId> <version>2.1-SNAPSHOT</version>
<configuration> <configuration>
<source>${javaSource}</source> <source>${javaSource}</source>
<target>${javaTarget}</target> <target>${javaTarget}</target>
<testSource>${testSource}</testSource>
<testTarget>${testTarget}</testTarget>
</configuration> </configuration>
</plugin> </plugin>
...@@ -148,7 +149,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -148,7 +149,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
<version>2.0</version>
<executions> <executions>
<execution> <execution>
<id>clean</id> <id>clean</id>
...@@ -161,7 +161,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -161,7 +161,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
...@@ -205,13 +204,11 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -205,13 +204,11 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
<version>2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
...@@ -230,13 +227,11 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -230,13 +227,11 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<!-- <!--
<configuration> <configuration>
<stylesheet>${basedir}/../stylesheet.css</stylesheet> <stylesheet>${basedir}/../stylesheet.css</stylesheet>
...@@ -247,8 +242,7 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -247,8 +242,7 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>2.2</version> <configuration>
<configuration>
<targetJdk>1.5</targetJdk> <targetJdk>1.5</targetJdk>
</configuration> </configuration>
</plugin> </plugin>
...@@ -277,7 +271,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -277,7 +271,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<stylesheetfile>${basedir}/../stylesheet.css</stylesheetfile> <stylesheetfile>${basedir}/../stylesheet.css</stylesheetfile>
<groups> <groups>
...@@ -296,7 +289,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i ...@@ -296,7 +289,6 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId> <artifactId>taglist-maven-plugin</artifactId>
<version>2.1</version>
<configuration> <configuration>
<tags> <tags>
<tag>TODO</tag> <tag>TODO</tag>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment