Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPJAVA-45

Browse Source 
Java report fails build if no source files present.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@407000 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-05-16 17:32:59 +00:00
parent 0ef34bb9cc
commit 2e6bab9405
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
java/plugin.jelly
View File

@ -35,14 +35,7 @@
<ant:mkdir dir="${maven.build.dest}"/> <ant:mkdir dir="${maven.build.dest}"/>
</goal> </goal>
<!-- ================================================================== --> <goal name="java:init">
<!-- C O M P I L E -->
<!-- ================================================================== -->
<goal name="java:compile"
description="Compile the project"
prereqs="java:prepare-filesystem">
<j:set var="generatedSourcesPresent" value="false"/> <j:set var="generatedSourcesPresent" value="false"/>
<j:if test="${bootstrapping == null}"> <j:if test="${bootstrapping == null}">
<maven:get var="generatedSources" plugin="maven-javacc-plugin" property="maven.gen.src" /> <maven:get var="generatedSources" plugin="maven-javacc-plugin" property="maven.gen.src" />
@ -55,6 +48,15 @@
<maven:addPath id="maven.compile.src.set" refid="maven.generated.src.set"/> <maven:addPath id="maven.compile.src.set" refid="maven.generated.src.set"/>
</j:if> </j:if>
</j:if> </j:if>
</goal>
<!-- ================================================================== -->
<!-- C O M P I L E -->
<!-- ================================================================== -->
<goal name="java:compile"
description="Compile the project"
prereqs="java:prepare-filesystem,java:init">
<j:choose> <j:choose>
<j:when test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}"> <j:when test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}">
@ -212,13 +214,14 @@
<!-- J A V A R E P O R T S --> <!-- J A V A R E P O R T S -->
<!-- ================================================================== --> <!-- ================================================================== -->
<goal name="maven-java-plugin:register"> <goal name="maven-java-plugin:register" prereqs="java:init">
<j:if test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}">
<doc:registerReport <doc:registerReport
name="Compiler output Report" name="Compiler output Report"
pluginName="maven-java-plugin" pluginName="maven-java-plugin"
link="java-compiler-output-report" link="java-compiler-output-report"
description="Formatted report of compiler output" description="Formatted report of compiler output"/>
/> </j:if>
</goal> </goal>
<goal name="maven-java-plugin:deregister"> <goal name="maven-java-plugin:deregister">

2
java/project.xml
View File

@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-java-plugin</id> <id>maven-java-plugin</id>
<name>Maven Java Plugin</name> <name>Maven Java Plugin</name>
<currentVersion>1.6</currentVersion> <currentVersion>1.6.1-SNAPSHOT</currentVersion>
<description/> <description/>
<shortDescription>Compile java code</shortDescription> <shortDescription>Compile java code</shortDescription>
<versions> <versions>

3
java/xdocs/changes.xml
View File

@ -24,6 +24,9 @@
<author email="kschrader@karmalab.org">Kurt Schrader</author> <author email="kschrader@karmalab.org">Kurt Schrader</author>
</properties> </properties>
<body> <body>
<release version="1.6.1" date="in SVN">
<action dev="ltheussl" type="fix" issue="MPJAVA-45">Java report fails build if no source files present.</action>
</release>
<release version="1.6" date="2006-03-26"> <release version="1.6" date="2006-03-26">
<action dev="ltheussl" type="fix" issue="MPJAVA-4">Compile fails using forked compiler when directory contains spaces.</action> <action dev="ltheussl" type="fix" issue="MPJAVA-4">Compile fails using forked compiler when directory contains spaces.</action>
<action dev="ltheussl" type="fix" issue="MPJAVA-42">Also check for <action dev="ltheussl" type="fix" issue="MPJAVA-42">Also check for