Trygve Laugstøl wrote:
Paul Cager wrote:I've created a maven2/debian directory in the project's svn. Of course we are far from being able to compile it, let alone upload a package. But at least it should gives us something to aim for.Number of build errors is currently hovering around 50. Watch this space...Numbers of errors with the correct plexus-container-default (1.0-alpha-9-stable-1) is now 14 and they are all related to Doxia or plexus component factories.Doxia should be fairly simple to package and possibly the component factories too. The factories might also just be dropped for now, Maven 2 will build most stuff without them.
So I couldn't resist and started packaging Doxia. Doxia is missing two components: plexus-i18n and plexus-velocity which should be fairly trivial to package with maven-ant-helper.
I've attached the doxia build (can you commit that for me Paul?) and a maven-ant-helper diff.
-- Trygve
doxia.tar.gz
Description: GNU Zip compressed data
Index: maven-ant-helper/maven-build.xml
===================================================================
--- maven-ant-helper/maven-build.xml (revision 3548)
+++ maven-ant-helper/maven-build.xml (working copy)
@@ -3,14 +3,11 @@
<project name="pkg-java" default="package" basedir="..">
<target name="init">
- <available property="available.sources" file="src/main/java"/>
<available property="available.resources" file="src/main/resources"/>
<fail unless="artifactId" message="Missing required property:
artifactId"/>
<fail unless="version" message="Missing required property: version"/>
- <echo message="available.sources: ${available.sources}"/>
- <echo message="available.resources: ${available.resources}"/>
<echo message="Compile classpath: ${classpath.full.compile}" />
<echo message="Test classpath: ${classpath.full.test}" />
</target>
@@ -38,12 +35,15 @@
<target name="compile" depends="process-resources">
<mkdir dir="${build.outputDirectory}"/>
+ <mkdir dir="${build.directory}/generated-sources"/>
<javac
destdir="${build.outputDirectory}"
classpath="${classpath.compile}"
+ nowarn="true"
+ source="1.4" target="1.4"
debug="on">
- <srcdir dir="${build.sourceDirectory}"/>
- <srcdir dir="${build.outputDirectory}/generated-sources"/>
+ <src path="${build.sourceDirectory}"/>
+ <src path="${build.directory}/generated-sources"/>
</javac>
</target>
@@ -59,28 +59,26 @@
<javac
destdir="${build.testOutputDirectory}"
classpath="${classpath.full.test}"
+ nowarn="true"
+ source="1.4" target="1.4"
debug="on">
- <srcdir dir="${build.testSourceDirectory}"/>
+ <src path="${build.testSourceDirectory}"/>
</javac>
</target>
<target name="test" depends="test-compile" unless="maven.test.skip">
<mkdir dir="${build.directory}/surefire-tests"/>
- <junit printsummary="yes" haltonfailure="no" forkmode="once">
+ <junit printsummary="yes" haltonfailure="no">
<classpath>
<pathelement path="${classpath.full.test}"/>
</classpath>
<formatter type="plain"/>
-<!--
- <test name="my.test.TestCase" haltonfailure="no" outfile="result">
- <formatter type="xml"/>
- </test>
--->
- <batchtest fork="yes" todir="${build.directory}/surefire-tests">
+ <batchtest>
<fileset dir="${build.testSourceDirectory}">
<include name="**/*Test.java"/>
- <exclude name="**/Abstract*.java"/>
+ <exclude name="**/Abstract*"/>
+ <exclude name="${maven.test.exclude}"/>
</fileset>
</batchtest>
</junit>
Index: maven-ant-helper/maven-defaults.properties
===================================================================
--- maven-ant-helper/maven-defaults.properties (revision 3548)
+++ maven-ant-helper/maven-defaults.properties (working copy)
@@ -2,6 +2,7 @@
# See http://maven.apache.org/ref/current/maven-model/maven.html for nams
build.sourceDirectory=src/main/java
build.testSourceDirectory=src/test/java
+
build.directory=build
build.outputDirectory=build/classes
build.testOutputDirectory=build/test-classes
@@ -10,3 +11,5 @@
classpath.test=
classpath.full.compile=${build.outputDirectory}:${classpath.compile}
classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
+
+maven.test.excludes=
Index: maven-ant-helper/src/main/java/ModelloTask.java
===================================================================
--- maven-ant-helper/src/main/java/ModelloTask.java (revision 3548)
+++ maven-ant-helper/src/main/java/ModelloTask.java (working copy)
@@ -31,9 +31,8 @@
log( "Running the '" + plugin + "' Modello plugin using model file " +
model + " for version " + version );
URL[] urls = new URL[] {
- new URL( "file:/usr/share/java/libplexus-utils.jar" ),
+ new URL( "file:/usr/share/java/plexus-utils.jar" ),
new URL( "file:/usr/share/java/plexus-classworlds.jar" ),
- new URL( "file:/usr/share/java/plexus-component-api.jar" ),
new URL( "file:/usr/share/java/plexus-container-default.jar" ),
new URL( "file:/usr/share/java/modello-core.jar" ),
new URL( "file:/usr/share/java/modello-plugin-xml.jar" ),
_______________________________________________ pkg-java-maintainers mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
