|
From: <be...@us...> - 2006-08-24 13:48:44
|
Revision: 46 Author: benoitx Date: 2006-08-24 06:48:39 -0700 (Thu, 24 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=46&view=rev Log Message: ----------- tidy up. Modified Paths: -------------- trunk/datecalc-jdk/maven.xml trunk/datecalc-jdk/pom.xml trunk/datecalc-jdk/project.xml Modified: trunk/datecalc-jdk/maven.xml =================================================================== --- trunk/datecalc-jdk/maven.xml 2006-08-24 13:48:14 UTC (rev 45) +++ trunk/datecalc-jdk/maven.xml 2006-08-24 13:48:39 UTC (rev 46) @@ -1,30 +1,27 @@ <?xml version="1.0"?> -<!-- -/* - * ======================================================================== - * - * - * ======================================================================== - */ ---> +<!-- + /* + * ======================================================================== + * ObjectLab Financial Ltd, proud sponsor of The Kit. + * ======================================================================== + */ +--> + +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" + xmlns:artifact="artifact" + xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary"> -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:artifact="artifact" xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary"> - - <goal name="kit:rebuild" prereqs="kit:build" /> + <goal name="kit:rebuild" prereqs="clean,kit:build" /> - <goal name="kit:build" prereqs="jar:jar"> - <echo>ADD Common to full JAR</echo> - <ant:jar - basedir="./target/classes" - jarfile="${maven.build.dir}/${pom.artifactId}-full${pom.currentVersion}.jar" - update="yes" - > - <fileset dir="${basedir}/../datecalc-common/target/classes" - excludes="**/Test.class" - includes="**/*.class" - /> - </ant:jar> - - </goal> + <goal name="kit:build" prereqs="jar:jar"> + <echo>ADD Common to full JAR</echo> + <ant:jar basedir="target/classes" + jarfile="${maven.build.dir}/${pom.artifactId}-full-${pom.currentVersion}.jar" + update="yes"> + <fileset dir="${basedir}/../datecalc-common/target/classes" + excludes="**/Test.class" includes="**/*.class" /> + </ant:jar> + + </goal> </project> Modified: trunk/datecalc-jdk/pom.xml =================================================================== --- trunk/datecalc-jdk/pom.xml 2006-08-24 13:48:14 UTC (rev 45) +++ trunk/datecalc-jdk/pom.xml 2006-08-24 13:48:39 UTC (rev 46) @@ -1,45 +1,51 @@ <?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"> +<!-- + /* + * ======================================================================== + * ObjectLab Financial Ltd, proud sponsor of The Kit. + * ======================================================================== + */ +--> +<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> - <parent> - <groupId>net.objectlab.kit</groupId> - <artifactId>datecalc</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>net.objectlab.kit</groupId> + <artifactId>datecalc</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <artifactId>datecalc-jdk</artifactId> - <packaging>jar</packaging> - <name>Date Calculator for JDK</name> - <description> - Date Calculator methods for JDK - </description> + <artifactId>datecalc-jdk</artifactId> + <packaging>jar</packaging> + <name>Date Calculator for JDK</name> + <description>Date Calculator methods for JDK</description> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> - <dependencies> - <dependency> - <groupId>net.objectlab.kit</groupId> - <artifactId>datecalc-common</artifactId> - <version>${pom.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>net.objectlab.kit</groupId> + <artifactId>datecalc-common</artifactId> + <version>${pom.version}</version> + </dependency> - <!-- TODO test cases should use log4j transparently --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> + <!-- TODO test cases should use log4j transparently --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file Modified: trunk/datecalc-jdk/project.xml =================================================================== --- trunk/datecalc-jdk/project.xml 2006-08-24 13:48:14 UTC (rev 45) +++ trunk/datecalc-jdk/project.xml 2006-08-24 13:48:39 UTC (rev 46) @@ -1,94 +1,66 @@ <?xml version="1.0"?> <!-- - /* - * ======================================================================== - * - * ======================================================================== - */ + /* + * ======================================================================== + * ObjectLab Financial Ltd, proud sponsor of The Kit. + * ======================================================================== + */ --> <project> - <extend>../common-build/project.xml</extend> - <name>DateCalc JDK</name> - <artifactId>datecalc-jdk</artifactId> - <package>net.objectlab.kit</package> - <shortDescription>DateCalc JDK library</shortDescription> - <description>This library provides pure JDK implementation of the Date Calculator.</description> - <repository> - <connection>scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-jdk</connection> - <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-jdk</developerConnection> - </repository> - <dependencies> - <dependency> - <groupId>net.objectlab.kit</groupId> - <artifactId>datecalc-common</artifactId> - <version>${pom.currentVersion}</version> - <type>jar</type> - </dependency> - </dependencies> + <extend>../common-build/project.xml</extend> + <name>DateCalc JDK</name> + <artifactId>datecalc-jdk</artifactId> + <package>net.objectlab.kit</package> + <shortDescription>DateCalc JDK library</shortDescription> + <description> + This library provides pure JDK implementation of the Date + Calculator. + </description> + <repository> + <connection> + scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-jdk + </connection> + <developerConnection> + scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-jdk + </developerConnection> + </repository> + <dependencies> + <dependency> + <groupId>net.objectlab.kit</groupId> + <artifactId>datecalc-common</artifactId> + <version>${pom.currentVersion}</version> + <type>jar</type> + </dependency> + </dependencies> - <reports> - <report>maven-checkstyle-plugin</report> - <report>maven-findbugs-plugin</report> - <report>maven-pmd-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-cobertura-plugin</report> - <report>maven-qalab-plugin</report> - <report>maven-ydoc-plugin</report> - <report>maven-jdepend-plugin</report> - <report>maven-faq-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-tasklist-plugin</report> - </reports> + <reports> + <report>maven-checkstyle-plugin</report> + <report>maven-findbugs-plugin</report> + <report>maven-pmd-plugin</report> + <report>maven-simian-plugin</report> + <report>maven-cobertura-plugin</report> + <report>maven-qalab-plugin</report> + <report>maven-ydoc-plugin</report> + <report>maven-jdepend-plugin</report> + <report>maven-faq-plugin</report> + <report>maven-junit-report-plugin</report> + <report>maven-jxr-plugin</report> + <report>maven-tasklist-plugin</report> + </reports> - <build> - <sourceDirectory>src/main/java</sourceDirectory> - <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> - <!-- TODO: to be removed as it is not generic --> - <nagEmailAddress>bx...@ob...</nagEmailAddress> - <unitTest> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <exclude>**/Abstract*.java</exclude> - </excludes> -<!-- <resources> - <resource> - <directory>src/test/conf</directory> - <includes> - <include>*.properties</include> - <include>**/*.xml</include> - </includes> - </resource> - </resources> - --> - </unitTest> -<!-- <resources> - <resource> - <directory>src/conf</directory> - <includes> - <include>*.properties</include> - <include>**/*.xml</include> - <include>*.template</include> - </includes> - </resource> - <resource> - <directory>src/har</directory> - <includes> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>../common/target</directory> - <includes> - <include>safemargin-common-${pom.currentVersion}.jar</include> - </includes> - </resource> - </resources> - --> - </build> + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Test.java</include> + </includes> + <excludes> + <exclude>**/Abstract*.java</exclude> + </excludes> + </unitTest> + </build> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |