[jira] Updated: (MNG-598) new type handlers cannot be added outside of maven-core
[ http://jira.codehaus.org/browse/MNG-598?page=all ] Brett Porter updated MNG-598: - Priority: Blocker (was: Major) > new type handlers cannot be added outside of maven-core > --- > > Key: MNG-598 > URL: http://jira.codehaus.org/browse/MNG-598 > Project: Maven 2 > Type: Bug > Reporter: Brett Porter > Priority: Blocker > Fix For: 2.0-beta-1 > > > adding type handlers in your own plugin will not put them into the map that > the lifecycle executor is using. the maps need to be merged. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-125) guarded mojo execution
[ http://jira.codehaus.org/browse/MNG-125?page=all ] Brett Porter updated MNG-125: - Fix Version: (was: 2.0-beta-1) 2.1-beta-1 Environment: > guarded mojo execution > -- > > Key: MNG-125 > URL: http://jira.codehaus.org/browse/MNG-125 > Project: Maven 2 > Type: Improvement > Components: design > Reporter: Brett Porter > Fix For: 2.1-beta-1 > > > Mark Wilkinson has prototyped some dependency handling to ensure that only > the changed files get recompiled. This needs to be finished and integrated > into the compiler plugin, then implemented in general to guard mojos from > executing if their inputs/outputs are up to date. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-193) symmetry for ognl parameters in plugin response
[ http://jira.codehaus.org/browse/MNG-193?page=all ] Brett Porter updated MNG-193: - Description: allow the mojo to pass back results in the response, and for the other mojos to lookup those results using ognl. This will also assist with guarded mojo execution was: allow the mojo to pass back results in the response, and for the other mojos to lookup those results using ognl. This will also assist with guarded mojo execution Fix Version: (was: 2.0-beta-1) 2.1-beta-1 Environment: > symmetry for ognl parameters in plugin response > --- > > Key: MNG-193 > URL: http://jira.codehaus.org/browse/MNG-193 > Project: Maven 2 > Type: Improvement > Reporter: Brett Porter > Fix For: 2.1-beta-1 > > > allow the mojo to pass back results in the response, and for the other mojos > to lookup those results using ognl. > This will also assist with guarded mojo execution -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219847 - in /maven/components/trunk/maven-core-it: ./ it0034/ it0034/src/ it0034/src/main/ it0034/src/main/webapp/ it0034/src/main/webapp/WEB-INF/ it1008/
Author: brett Date: Tue Jul 19 23:53:47 2005 New Revision: 219847 URL: http://svn.apache.org/viewcvs?rev=219847&view=rev Log: PR: MNG-505 add integration tests for version ranges Added: maven/components/trunk/maven-core-it/it0034/ (with props) maven/components/trunk/maven-core-it/it0034/goals.txt (with props) maven/components/trunk/maven-core-it/it0034/pom.xml (with props) maven/components/trunk/maven-core-it/it0034/src/ maven/components/trunk/maven-core-it/it0034/src/main/ maven/components/trunk/maven-core-it/it0034/src/main/webapp/ maven/components/trunk/maven-core-it/it0034/src/main/webapp/WEB-INF/ maven/components/trunk/maven-core-it/it0034/src/main/webapp/WEB-INF/web.xml (with props) maven/components/trunk/maven-core-it/it0034/src/main/webapp/index.html (with props) maven/components/trunk/maven-core-it/it1008/ (with props) maven/components/trunk/maven-core-it/it1008/goals.txt (with props) maven/components/trunk/maven-core-it/it1008/pom.xml (with props) Modified: maven/components/trunk/maven-core-it/README.txt maven/components/trunk/maven-core-it/integration-tests.txt Modified: maven/components/trunk/maven-core-it/README.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=219847&r1=219846&r2=219847&view=diff == --- maven/components/trunk/maven-core-it/README.txt (original) +++ maven/components/trunk/maven-core-it/README.txt Tue Jul 19 23:53:47 2005 @@ -101,6 +101,8 @@ it0033: Test an EAR generation +it0034: Test version range junit [3.7,) resolves to 3.8.1 + --- - generated sources @@ -147,5 +149,8 @@ IllegalStateException, since the model is incorrect. --- it1007: Should fail due to requiring a future version of Maven. +--- +it1008: Should fail due to requiring a version range for junit that doesn't exist +in the repository. Currently succeeds (MNG-614) --- Modified: maven/components/trunk/maven-core-it/integration-tests.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=219847&r1=219846&r2=219847&view=diff == --- maven/components/trunk/maven-core-it/integration-tests.txt (original) +++ maven/components/trunk/maven-core-it/integration-tests.txt Tue Jul 19 23:53:47 2005 @@ -1,3 +1,4 @@ +it0034 it0033 it0032 it0031 Propchange: maven/components/trunk/maven-core-it/it0034/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 19 23:53:47 2005 @@ -0,0 +1,2 @@ +target +log.txt Added: maven/components/trunk/maven-core-it/it0034/goals.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/goals.txt?rev=219847&view=auto == --- maven/components/trunk/maven-core-it/it0034/goals.txt (added) +++ maven/components/trunk/maven-core-it/it0034/goals.txt Tue Jul 19 23:53:47 2005 @@ -0,0 +1 @@ +package Propchange: maven/components/trunk/maven-core-it/it0034/goals.txt -- svn:eol-style = native Propchange: maven/components/trunk/maven-core-it/it0034/goals.txt -- svn:keywords = "Author Date Id Revision" Added: maven/components/trunk/maven-core-it/it0034/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/pom.xml?rev=219847&view=auto == --- maven/components/trunk/maven-core-it/it0034/pom.xml (added) +++ maven/components/trunk/maven-core-it/it0034/pom.xml Tue Jul 19 23:53:47 2005 @@ -0,0 +1,16 @@ + + 4.0.0 + org.apache.maven + maven-core-it0034 + war + 1.0-SNAPSHOT + Maven Quick Start Archetype + http://maven.apache.org + + + junit + junit + [3.7,) + + + Propchange: maven/components/trunk/maven-core-it/it0034/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/maven-core-it/it0034/pom.xml -- svn:keywords = "Author Date Id Revision" Added: maven/components/trunk/maven-core-it/it0034/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/src/main/webapp/WEB-INF/web.
[jira] Created: (MNG-614) RELEASE selected for range even if it is below the lower bound
RELEASE selected for range even if it is below the lower bound -- Key: MNG-614 URL: http://jira.codehaus.org/browse/MNG-614 Project: Maven 2 Type: Bug Components: maven-artifact Reporter: Brett Porter Fix For: 2.0-beta-2 this is due to RELEASE not being resolved until after the dependency version is resolved, but it should be compared to the original range after resolution to ensure it was not below the lower bound. This may be resolved by resolving MNG-613 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MNG-613) improve release selection for ranges
improve release selection for ranges Key: MNG-613 URL: http://jira.codehaus.org/browse/MNG-613 Project: Maven 2 Type: Improvement Components: maven-artifact Reporter: Brett Porter Fix For: 2.0-beta-1 currently, ranges such as (,1.0) do not work, as it is incapable of locating the newest version < 1.0. Also, ranges such as [1.0,) result in RELEASE, which may not be present for all artifacts. We should replace or augment RELEASE with a full listing of versions for an artifact in the repository. This would be repository metadata of the same fashion as the plugin prefix -> id mapping. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MNG-612) implement conflict resolution techniques
implement conflict resolution techniques Key: MNG-612 URL: http://jira.codehaus.org/browse/MNG-612 Project: Maven 2 Type: New Feature Components: maven-artifact Reporter: Brett Porter Fix For: 2.0-beta-1 currently, the collector only: - selects nearest "suggested" version in a valid range - latest version from the valid ranges if none suggested - fails if ranges are over-constrained This needs to be configurable: - select newest, even if there is a nearer suggestion - select oldest, even if there is a nearer suggestion - fail if all suggestions don't equate or a range results instead of a single version - ignore over constrained ranges and fallback to some other algorithm - select snapshots even if they weren't explicitly specified -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MNG-505) implement version range support in the artifact collector
[ http://jira.codehaus.org/browse/MNG-505?page=all ] Brett Porter closed MNG-505: Resolution: Fixed > implement version range support in the artifact collector > - > > Key: MNG-505 > URL: http://jira.codehaus.org/browse/MNG-505 > Project: Maven 2 > Type: New Feature > Components: maven-artifact > Reporter: Brett Porter > Assignee: Brett Porter > Fix For: 2.0-beta-1 > > > http://docs.codehaus.org/display/MAVEN/Dependency+Mediation+and+Conflict+Resolution -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219846 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Author: brett
Date: Tue Jul 19 23:32:28 2005
New Revision: 219846
URL: http://svn.apache.org/viewcvs?rev=219846&view=rev
Log:
PR: MNG-505
clarify
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219846&r1=219845&r2=219846&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 23:32:28 2005
@@ -403,6 +403,8 @@
{
Restriction restriction = (Restriction) restrictions.get(
restrictions.size() - 1 );
// TODO: how can we find the latest release before something
to facilitate ) at the end?
+// Also, how can we find the latest release when there no
RELEASE metadata? We need to be maintaining
+// a version list in the repository
version = restriction.getUpperBound();
if ( version == null )
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: giving Arnaud access to Maven 1.x core
+1 Emmanuel Brett Porter wrote: Hi, Arnaud knows what he is doing and is able to help out - can we give him access to the M1 core? Thanks, Brett - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219844 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/ main/java/org/apache/maven/artifact/resolver/ main/java/org/apache/maven/artifact/versioning/ test/java/org/apache/maven/artifact/resolver/
Author: brett
Date: Tue Jul 19 22:53:57 2005
New Revision: 219844
URL: http://svn.apache.org/viewcvs?rev=219844&view=rev
Log:
PR: MNG-505
enable version ranges in resolution (only default conflict resolution - nearest
suggested version, fail if over-constrained)
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
(with props)
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=219844&r1=219843&r2=219844&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
Tue Jul 19 22:53:57 2005
@@ -20,6 +20,7 @@
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.versioning.VersionRange;
import java.io.File;
import java.util.List;
@@ -107,4 +108,10 @@
void setDependencyTrail( List dependencyTrail );
void setScope( String scope );
+
+VersionRange getVersionRange();
+
+void setVersionRange( VersionRange newRange );
+
+void selectVersion( String version );
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=219844&r1=219843&r2=219844&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Tue Jul 19 22:53:57 2005
@@ -78,9 +78,7 @@
this.artifactId = artifactId;
-this.versionRange = versionRange;
-
-this.version = versionRange == null ? null :
versionRange.getRecommendedVersion().toString();
+setVersionRange( versionRange );
this.artifactHandler = artifactHandler;
@@ -113,7 +111,7 @@
"The type cannot be empty."
);
}
-if ( getVersion() == null )
+if ( version == null && versionRange == null )
{
throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type,
"The version cannot be
empty." );
@@ -229,7 +227,10 @@
result = 37 * result + groupId.hashCode();
result = 37 * result + artifactId.hashCode();
result = 37 * result + type.hashCode();
-result = 37 * result + version.hashCode();
+if ( version != null )
+{
+result = 37 * result + version.hashCode();
+}
result = 37 * result + ( classifier != null ? classifier.hashCode() :
0 );
return result;
}
@@ -380,4 +381,29 @@
{
this.scope = scope;
}
+
+public VersionRange getVersionRange()
+{
+return versionRange;
+}
+
+public final void setVersionRange( VersionRange versionRange )
+{
+this.versionRange = versionRange;
+
+if ( versionRange != null && versionRange.getRecommendedVersion() !=
null )
+{
+this.version = versionRange.getRecommendedVersion().toString();
+}
+else
+{
+this.version = null;
+}
+}
+
+public void selectVersion( String version )
+{
+this.version = version;
+}
+
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=219844&r1=219843&r2=219844&view=diff
===
[jira] Closed: (MNG-411) improve maven-project-reports inline with m1
[ http://jira.codehaus.org/browse/MNG-411?page=all ] Vincent Siveton closed MNG-411: --- Resolution: Fixed Added M1 report (ie mailing list, project team, dependencies, source repository, issue tracking) and new report: Project License and Continuous Integration reports. > improve maven-project-reports inline with m1 > > > Key: MNG-411 > URL: http://jira.codehaus.org/browse/MNG-411 > Project: Maven 2 > Type: Improvement > Components: maven-reports > Reporter: Brett Porter > Assignee: Vincent Siveton > Fix For: 2.0-beta-1 > Attachments: maven-project-info-reports-plugin-mailingListReport.diff, > maven-project-info-reports-plugin-mailingListReport_with_post.diff, > maven-reporting-api-mailingListReport.diff, > pom_mailinglist_with_multi_other_archives.xml, > pom_mailinglist_with_no_other_archive.xml, > pom_mailinglist_with_one_other_archive.xml, screenshot-1.jpg, > screenshot-1.jpg, screenshot-1.jpg, screenshot-1.jpg, screenshot-1.jpg > > > we need to do the following: > - improve the layout of the mailing list reports (too wide), and add multiple > archives > - list all transitive dependencies (look at artifacts instead of > dependencies) in a separate table on the dependency list > - add other reports, such as source control, etc. from m1 xdoc plugin. > Vincent Siveton has volunteered to take a look at this. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219838 - /maven/components/trunk/m2-bootstrap-all.sh
Author: brett Date: Tue Jul 19 20:33:24 2005 New Revision: 219838 URL: http://svn.apache.org/viewcvs?rev=219838&view=rev Log: working again Modified: maven/components/trunk/m2-bootstrap-all.sh Modified: maven/components/trunk/m2-bootstrap-all.sh URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=219838&r1=219837&r2=219838&view=diff == --- maven/components/trunk/m2-bootstrap-all.sh (original) +++ maven/components/trunk/m2-bootstrap-all.sh Tue Jul 19 20:33:24 2005 @@ -69,7 +69,7 @@ cd maven-reports # update the release info to ensure these versions get used in the integration tests - #m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e $ARGS clean:clean install + m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e $ARGS clean:clean install ret=$?; if [ $ret != 0 ]; then exit $ret; fi ) ret=$?; if [ $ret != 0 ]; then exit $ret; fi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MEV-40) URL tag invalids
[ http://jira.codehaus.org/browse/MEV-40?page=comments#action_43078 ]
Brett Porter commented on MEV-40:
-
we need to edit them by hand at the ASF repo. Maven 1.1 correctly resolves them
before deployment.
> URL tag invalids
>
>
> Key: MEV-40
> URL: http://jira.codehaus.org/browse/MEV-40
> Project: Maven Evangelism
> Type: Bug
> Components: Invalid POM
> Reporter: Vincent Siveton
>
>
> I noticed that the following POMs have invalid url definitions:
> commons-el\commons-el\1.0\commons-el-1.0.pom :
> http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
> http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
> file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/
> scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> commons-io\commons-io\1.0\commons-io-1.0.pom :
> http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> scm:cvs:pserver:[EMAIL
> PROTECTED]:/home/cvspublic:jakarta-commons/${pom.artifactId.substring(8)}
> http://cvs.apache.org/viewcvs/jakarta-commons/${pom.artifactId.substring(8)}/
> file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/
> scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> commons-lang\commons-lang\1.0\commons-lang-1.0.pom :
> http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> commons-lang\commons-lang\2.1\commons-lang-2.1.pom :
> scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
> http://svn.apache.org/viewcvs/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk
> file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/
> scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
> org\codehaus\modello\modello\1.0-alpha-3\modello-1.0-alpha-3.pom :
> http://cvs.modello.codehaus.org/modello/${pom.artifactId}
> So, dependencies reports generate wrong URL.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MNG-588) How to handle identical file names in the site structure for the static site generation?
[ http://jira.codehaus.org/browse/MNG-588?page=comments#action_43077 ] Brett Porter commented on MNG-588: -- I think we can throw an exception. Eventually, I'd prefer it could be smart enough to pick the processor from the file and just have one tree. > How to handle identical file names in the site structure for the static site > generation? > > > Key: MNG-588 > URL: http://jira.codehaus.org/browse/MNG-588 > Project: Maven 2 > Type: Bug > Versions: 2.0-beta-1 > Reporter: Vincent Siveton > Fix For: 2.0-beta-1 > > > Supposed that we have the following site structure: > +- src/ >+- site/ > +- apt/ > | +- index.apt > | > +- xdoc/ > | +- index.xml > | > +- site.xml > Actually, the site:site goal generates the index.html from > site/xdoc/index.xml. > It could also generate it from site/apt/index.apt. > Throwing an exception instead of warnings? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219837 - /maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
Author: vsiveton Date: Tue Jul 19 20:08:58 2005 New Revision: 219837 URL: http://svn.apache.org/viewcvs?rev=219837&view=rev Log: Remove unused import Modified: maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Modified: maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=219837&r1=219836&r2=219837&view=diff == --- maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original) +++ maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Tue Jul 19 20:08:58 2005 @@ -31,7 +31,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.Properties; import java.util.ResourceBundle; /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219835 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
Author: vsiveton Date: Tue Jul 19 19:57:54 2005 New Revision: 219835 URL: http://svn.apache.org/viewcvs?rev=219835&view=rev Log: Correct typo and code format Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=219835&r1=219834&r2=219835&view=diff == --- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm (original) +++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm Tue Jul 19 19:57:54 2005 @@ -39,17 +39,17 @@ #end #end -#macro ( displayTree $display $item) - #if ( $item.getChildren() && $item.getChildCount() > 0 ) +#macro ( displayTree $display $item ) + #if ( $item && $item.getChildren() && $item.getChildCount() > 0 ) #foreach( $subitem in $item.getChildren() ) #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute( "href" ), $relativePath ) ) - #set ( $subitemHref = $$subitemHref.replaceAll( "\\", "/" ) ) + #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) ) #if ( $currentFileName == $subitemHref ) #set ( $display = true ) #end - #displayTree($display $subitem) + #displayTree( $display $subitem ) #end #end #end @@ -60,7 +60,7 @@ #set ( $currentFileName = $currentFileName.replaceAll( "\\", "/" ) ) #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) ) - #if ( $item.getChildCount() > 0 ) + #if ( $item && $item.getChildCount() > 0 ) #if ( ( $item.getAttribute( "collapse" ) ) && ( $item.getAttribute( "collapse" ).equalsIgnoreCase( "false" ) ) ) #set ( $collapse = "expanded" ) #else @@ -79,10 +79,10 @@ $item.getAttribute( "name" ) #end - #if ( $item.getChildren() && $item.getChildCount() > 0 ) + #if ( $item && $item.getChildren() && $item.getChildCount() > 0 ) #set ( $display = false ) #set ( $itemTmp = $item ) -#displayTree($display $itemTmp) +#displayTree( $display $itemTmp ) #if ( $collapse == "expanded" || $display ) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219834 - /maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Author: brett
Date: Tue Jul 19 19:30:52 2005
New Revision: 219834
URL: http://svn.apache.org/viewcvs?rev=219834&view=rev
Log:
PR: MNG-505
prepare for version ranges in the artifact collector
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=219834&r1=219833&r2=219834&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Tue Jul 19 19:30:52 2005
@@ -24,6 +24,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.PlexusTestCase;
import java.util.Arrays;
@@ -313,9 +315,9 @@
private class ArtifactSpec
{
-Artifact artifact;
+private Artifact artifact;
-Set dependencies = new HashSet();
+private Set dependencies = new HashSet();
public ArtifactSpec addDependency( String id, String version )
{
@@ -338,18 +340,27 @@
private class Source
implements ArtifactMetadataSource
{
-Map artifacts = new HashMap();
+private Map artifacts = new HashMap();
-public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository
localRepository, List remoteRepositories )
+public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository
localRepository,
+ List remoteRepositories )
throws ArtifactMetadataRetrievalException
{
ArtifactSpec a = (ArtifactSpec) artifacts.get( artifact.getId() );
-return new ResolutionGroup( createArtifacts( artifactFactory,
a.dependencies, artifact.getScope(),
-artifact.getDependencyFilter() ),
Collections.EMPTY_LIST );
+try
+{
+return new ResolutionGroup( createArtifacts( artifactFactory,
a.dependencies, artifact.getScope(),
+
artifact.getDependencyFilter() ), Collections.EMPTY_LIST );
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new ArtifactMetadataRetrievalException( e );
+}
}
private Set createArtifacts( ArtifactFactory artifactFactory, Set
dependencies, String inheritedScope,
ArtifactFilter dependencyFilter )
+throws InvalidVersionSpecificationException
{
Set projectArtifacts = new HashSet();
@@ -357,8 +368,10 @@
{
Artifact d = (Artifact) i.next();
-Artifact artifact = artifactFactory.createArtifact(
d.getGroupId(), d.getArtifactId(), d.getVersion(),
-
d.getScope(), d.getType(), inheritedScope );
+VersionRange versionRange =
VersionRange.createFromVersionSpec( d.getVersion() );
+Artifact artifact = artifactFactory.createDependencyArtifact(
d.getGroupId(), d.getArtifactId(),
+
versionRange, d.getType(), d.getScope(),
+
inheritedScope );
if ( artifact != null && ( dependencyFilter == null ||
dependencyFilter.include( artifact ) ) )
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219833 - in /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact: DefaultArtifact.java resolver/DefaultArtifactCollector.java
Author: brett
Date: Tue Jul 19 19:27:18 2005
New Revision: 219833
URL: http://svn.apache.org/viewcvs?rev=219833&view=rev
Log:
PR: MNG-505
prepare for version ranges in the artifact collector
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=219833&r1=219832&r2=219833&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Tue Jul 19 19:27:18 2005
@@ -41,11 +41,6 @@
private final String artifactId;
/**
- * The resolved version for the artifact after conflict resolution and all
transformations.
- */
-private String version;
-
-/**
* The resolved version for the artifact after conflict resolution, that
has not been transformed.
*
* @todo should be final
@@ -72,6 +67,10 @@
private List dependencyTrail;
+private String version;
+
+private VersionRange versionRange;
+
public DefaultArtifact( String groupId, String artifactId, VersionRange
versionRange, String scope, String type,
String classifier, ArtifactHandler artifactHandler
)
{
@@ -79,8 +78,9 @@
this.artifactId = artifactId;
-// TODO: this would be where we might have a min/max instead
-this.version = versionRange != null ?
versionRange.getRecommendedVersion().toString() : null;
+this.versionRange = versionRange;
+
+this.version = versionRange == null ? null :
versionRange.getRecommendedVersion().toString();
this.artifactHandler = artifactHandler;
@@ -97,23 +97,26 @@
{
if ( empty( groupId ) )
{
-throw new InvalidArtifactRTException( groupId, artifactId,
version, type, "The groupId cannot be empty." );
+throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type,
+ "The groupId cannot be
empty." );
}
if ( artifactId == null )
{
-throw new InvalidArtifactRTException( groupId, artifactId,
version, type,
+throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type,
"The artifactId cannot be
empty." );
}
if ( type == null )
{
-throw new InvalidArtifactRTException( groupId, artifactId,
version, type, "The type cannot be empty." );
+throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type,
+ "The type cannot be empty."
);
}
-if ( version == null )
+if ( getVersion() == null )
{
-throw new InvalidArtifactRTException( groupId, artifactId,
version, type, "The version cannot be empty." );
+throw new InvalidArtifactRTException( groupId, artifactId,
getVersion(), type,
+ "The version cannot be
empty." );
}
}
@@ -155,6 +158,7 @@
public void setVersion( String version )
{
this.version = version;
+this.versionRange = null;
}
public String getType()
@@ -264,6 +268,9 @@
{
return false;
}
+
+// We don't consider the version range in the comparison, just the
resolved version
+
return true;
}
@@ -319,6 +326,7 @@
}
if ( result == 0 )
{
+// We don't consider the version range in the
comparison, just the resolved version
result = version.compareTo( a.getVersion() );
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=219833&r1=219832&r2=219833&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.j
svn commit: r219832 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Author: brett
Date: Tue Jul 19 19:18:19 2005
New Revision: 219832
URL: http://svn.apache.org/viewcvs?rev=219832&view=rev
Log:
correct behaviour
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=219832&r1=219831&r2=219832&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue Jul 19 19:18:19 2005
@@ -79,22 +79,23 @@
}
else if ( isSnapshot( artifact ) )
{
+SnapshotArtifactMetadata metadata;
+
try
{
-SnapshotArtifactMetadata metadata;
-
metadata = (SnapshotArtifactMetadata)
retrieveFromRemoteRepository( artifact, remoteRepository, null );
-
-metadata.update();
-
-artifact.setVersion( metadata.constructVersion() );
-
-artifact.addMetadata( metadata );
}
catch ( ResourceDoesNotExistException e )
{
// ignore. We'll be creating this metadata if it doesn't
exist...
+metadata = (SnapshotArtifactMetadata) createMetadata( artifact
);
}
+
+metadata.update();
+
+artifact.setVersion( metadata.constructVersion() );
+
+artifact.addMetadata( metadata );
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219831 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Author: brett
Date: Tue Jul 19 19:08:53 2005
New Revision: 219831
URL: http://svn.apache.org/viewcvs?rev=219831&view=rev
Log:
avoid potential NPE
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=219831&r1=219830&r2=219831&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue Jul 19 19:08:53 2005
@@ -79,22 +79,22 @@
}
else if ( isSnapshot( artifact ) )
{
-SnapshotArtifactMetadata metadata = null;
-
try
{
+SnapshotArtifactMetadata metadata;
+
metadata = (SnapshotArtifactMetadata)
retrieveFromRemoteRepository( artifact, remoteRepository, null );
+
+metadata.update();
+
+artifact.setVersion( metadata.constructVersion() );
+
+artifact.addMetadata( metadata );
}
catch ( ResourceDoesNotExistException e )
{
// ignore. We'll be creating this metadata if it doesn't
exist...
}
-
-metadata.update();
-
-artifact.setVersion( metadata.constructVersion() );
-
-artifact.addMetadata( metadata );
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219830 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
Author: brett Date: Tue Jul 19 19:00:13 2005 New Revision: 219830 URL: http://svn.apache.org/viewcvs?rev=219830&view=rev Log: add copyright Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=219830&r1=219829&r2=219830&view=diff == --- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original) +++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Tue Jul 19 19:00:13 2005 @@ -1,5 +1,21 @@ package org.apache.maven.artifact.transform; +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.AbstractVersionArtifactMetadata; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219827 - /maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
Author: brett
Date: Tue Jul 19 18:27:41 2005
New Revision: 219827
URL: http://svn.apache.org/viewcvs?rev=219827&view=rev
Log:
set eol style
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
(contents, props changed)
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=219827&r1=219826&r2=219827&view=diff
==
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
Tue Jul 19 18:27:41 2005
@@ -1,588 +1,588 @@
-package org.apache.maven.plugin.release;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.scm.ScmBean;
-import org.apache.maven.plugin.transformer.PomTransformer;
-import org.apache.maven.plugin.transformer.VersionTransformer;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFile;
-import org.codehaus.plexus.components.inputhandler.InputHandler;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Prepare for a release in SCM
- *
- * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
- * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
- * @version $Id: DoxiaMojo.java 169372 2005-05-09 22:47:34Z evenisse $
- * @goal prepare
- * @requiresDependencyResolution test
- * @todo check how this works with version ranges
- */
-public class PrepareReleaseMojo
-extends AbstractReleaseMojo
-{
-/**
- * @parameter expression="${basedir}"
- * @required
- * @readonly
- */
-private String basedir;
-
-/**
- * @parameter expression="${settings.interactiveMode}"
- * @readonly
- */
-private boolean interactive = true;
-
-private static final String SNAPSHOT = "-SNAPSHOT";
-
-private String projectVersion;
-
-private Model model;
-
-private String userTag;
-
-private String currentTag;
-
-private String currentScmConnection;
-
-private String currentScmDeveloperConnection;
-
-protected void executeTask()
-throws MojoExecutionException
-{
-model = project.getModel();
-
-checkForLocalModifications();
-
-checkForPresenceOfSnapshots();
-
-transformPomToReleaseVersionPom();
-
-checkInReleaseVersionPom();
-
-tagRelease();
-
-transformPomToSnapshotVersionPom();
-
-checkInSnapshotVersionPom();
-}
-
-private boolean isSnapshot( String version )
-{
-return version.endsWith( SNAPSHOT );
-}
-
-private void checkForLocalModifications()
-throws MojoExecutionException
-{
-getLog().info( "Verifying there are no local modifications ..." );
-
-List changedFiles;
-
-try
-{
-ScmBean scm = getScm();
-
-scm.setWorkingDirectory( basedir );
-
-changedFiles = scm.getStatus();
-}
-catch ( ScmException e )
-{
-throw new MojoExecutionException( "An error is occurred in the
status process.", e );
-}
-
-for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
-{
-ScmFile f = (ScmFile) i.next();
-if ( f.getPath().equals( "pom.xml.backup" ) || f.getPath().equals(
RELEASE_PROPS ) )
-{
-i.
svn commit: r219826 - in /maven/components/trunk: maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/ maven-project/src/main/java/org/apache/maven/project/artifact/ maven-reports/maven-project-info-reports-plugin/src/main/...
Author: brett
Date: Tue Jul 19 18:24:35 2005
New Revision: 219826
URL: http://svn.apache.org/viewcvs?rev=219826&view=rev
Log:
apply some inspections
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=219826&r1=219825&r2=219826&view=diff
==
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
Tue Jul 19 18:24:35 2005
@@ -42,12 +42,12 @@
/**
* Prepare for a release in SCM
*
- * @goal prepare
- * @requiresDependencyResolution test
- *
* @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
- * @author mailto:[EMAIL PROTECTED]>Jason van Zyl
+ * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
* @version $Id: DoxiaMojo.java 169372 2005-05-09 22:47:34Z evenisse $
+ * @goal prepare
+ * @requiresDependencyResolution test
+ * @todo check how this works with version ranges
*/
public class PrepareReleaseMojo
extends AbstractReleaseMojo
@@ -58,7 +58,7 @@
* @readonly
*/
private String basedir;
-
+
/**
* @parameter expression="${settings.interactiveMode}"
* @readonly
@@ -127,8 +127,7 @@
for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
{
ScmFile f = (ScmFile) i.next();
-if ( f.getPath().equals( "pom.xml.backup" ) ||
- f.getPath().equals( RELEASE_PROPS ) )
+if ( f.getPath().equals( "pom.xml.backup" ) || f.getPath().equals(
RELEASE_PROPS ) )
{
i.remove();
}
@@ -147,7 +146,8 @@
message.append( "\n" );
}
-throw new MojoExecutionException( "Cannot prepare the release
because you have local modifications : \n" + message.toString() );
+throw new MojoExecutionException(
+"Cannot prepare the release because you have local
modifications : \n" + message.toString() );
}
}
@@ -230,8 +230,8 @@
message.append( "\n" );
}
-throw new MojoExecutionException( "Can't release project due to
non released dependencies :\n"
-+ message.toString() );
+throw new MojoExecutionException(
+"Can't release project due to non released dependencies :\n" +
message.toString() );
}
}
@@ -278,8 +278,8 @@
model.getScm().setConnection( rewriteScmConnection(
model.getScm().getConnection(), getTagLabel() ) );
-model.getScm().setDeveloperConnection( rewriteScmConnection(
model.getScm().getDeveloperConnection(),
-
getTagLabel() ) );
+model.getScm().setDeveloperConnection(
+rewriteScmConnection( model.getScm().getDeveloperConnection(),
getTagLabel() ) );
}
try
@@ -323,10 +323,10 @@
for ( Iterator j = model.getDependencies().iterator();
j.hasNext(); )
{
Dependency dependency = (Dependency) j.next();
-if ( artifact.getGroupId().equals( dependency.getGroupId()
)
-&& artifact.getArtifactId().equals(
dependency.getArtifactId() )
-&& artifact.getBaseVersion().equals(
dependency.getVersion() )
-&& artifact.getType().equals( dependency.getType() ) )
+if ( artifact.getGroupId().equals( dependency.getGroupId()
) &&
+artifact.getArtifactId().equals(
dependency.getArtifactId() ) &&
+artifact.getBaseVersion().equals(
dependency.getVersion() ) &&
+artifact.getType().equals( dependency.getType() ) )
{
dependency.setVersion( artifact.getVersion() );
}
@@ -343,8 +343,8 @@
for ( Iterator j = model.getBuild().getPlugins().iterator();
j.hasNext(); )
{
Plugin plugin = (Plugin) j.next
Re: generated-files policy in maven2
John Fallows wrote: If the PLUGIN-NAME is the plugin artifactId, doesn't this lead to collisions when plugins only differ by groupId? It's actually whatever the plugin wants to call itself, and you can override it with your own setting if you prefer to share a single directory or want to call it something else. I think it is worth separating them by default since it doesn't impose any extra burden on your build process (all the plugins, including IDE project generation, are aware of a list of source roots) and makes it easy to differentiate. That said, I'd personally avoid more than one code generation plugin in a single project if possible. It's also possible some plugins are targetting different phases, so you wouldn't want to generate them into the same tree as the ones that would be used in main. There could be more scenarios than just main and test, so it is best to separate by plugin. Cheers, Brett - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: generated-files policy in maven2
Brett,
On 7/19/05, Brett Porter <[EMAIL PROTECTED]> wrote:
> Loïc Lefèvre wrote:
>
> >For example, every plugin generating Java source files named XXX will
> >generate the files (by default) into target/generated/XXX/ and also
> >update the source path for futur compilation and might also update
> >.iml files (speaking of IntelliJ IDEA too).
> >
> >
> That's exactly what already happens (try it :). I think the path is
> target/generated-sources/PLUGIN-NAME/
If the PLUGIN-NAME is the plugin artifactId, doesn't this lead to
collisions when plugins only differ by groupId?
I'm curious, why don't we have a single standard output location for
generated sources across all plugins, just like we do for checked in
sources under ${pom.basedir}/src?
For example
src/
main/
java/
resources/
test/
java/
resources/
target/
generated-src/
main/
java/
resources/
test/
java/
resources/
etc.
One obvious answer is to avoid collisions, but I'm not sure that
matters if all the various generated sources need to end up in the
same JAR anyway.
Your thoughts?
Kind Regards,
John Fallows.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219824 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/ resources/org/apache/maven/project/
Author: brett
Date: Tue Jul 19 18:03:25 2005
New Revision: 219824
URL: http://svn.apache.org/viewcvs?rev=219824&view=rev
Log:
apply some inspections
Added:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
(contents, props changed)
- copied, changed from r219817,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
Removed:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java?rev=219824&r1=219823&r2=219824&view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
Tue Jul 19 18:03:25 2005
@@ -103,9 +103,8 @@
protected MavenProject getProjectWithDependencies( File pom )
throws Exception
{
-return projectBuilder.buildWithDependencies( pom, getLocalRepository(),
- new
ProjectClasspathArtifactResolver.Source( artifactFactory,
artifactRepositoryFactory, getContainer() ),
- Collections.EMPTY_LIST );
+return projectBuilder.buildWithDependencies( pom,
getLocalRepository(), new TestArtifactResolver.Source(
+artifactFactory, artifactRepositoryFactory, getContainer() ),
Collections.EMPTY_LIST );
}
protected MavenProject getProject( File pom )
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=219824&r1=219823&r2=219824&view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
Tue Jul 19 18:03:25 2005
@@ -36,12 +36,12 @@
File f = getFileForClasspathResource( dir +
"project-with-scoped-dependencies.xml" );
// XXX: Because this test fails, we resort to crude reflection hacks,
see PLX-108 for the solution
-//assertEquals( ProjectClasspathArtifactResolver.class,
getContainer().lookup( ArtifactResolver.ROLE ).getClass() );
+//assertEquals( TestArtifactResolver.class, getContainer().lookup(
ArtifactResolver.ROLE ).getClass() );
MavenProjectBuilder builder = (MavenProjectBuilder)
getContainer().lookup( MavenProjectBuilder.ROLE );
Field declaredField = builder.getClass().getDeclaredField(
"artifactResolver" );
boolean acc = declaredField.isAccessible();
declaredField.setAccessible( true );
-declaredField.set( builder, getContainer().lookup(
ProjectClasspathArtifactResolver.class.getName() ) );
+declaredField.set( builder, getContainer().lookup(
TestArtifactResolver.class.getName() ) );
declaredField.setAccessible( acc );
// XXX: end hack
Copied:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
(from r219817,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java&r1=219817&r2=219824&rev=219824&view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
Tue Jul 19 18:03:25 2005
@@ -48,7 +48,7 @@
import java.util.List;
import java.util.Set;
-p
svn commit: r219823 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: brett
Date: Tue Jul 19 17:52:26 2005
New Revision: 219823
URL: http://svn.apache.org/viewcvs?rev=219823&view=rev
Log:
make versions with 4 or more parts be treated as string comparisons
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=219823&r1=219822&r2=219823&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
Tue Jul 19 17:52:26 2005
@@ -99,7 +99,7 @@
private int compareIntegers( Integer i1, Integer i2 )
{
-if ( i1 == i2 )
+if ( i1 == null ? i2 == null : i1.equals( i2 ) )
{
return 0;
}
@@ -196,6 +196,14 @@
if ( tok.hasMoreTokens() )
{
incrementalVersion = Integer.valueOf( tok.nextToken() );
+}
+if ( tok.hasMoreTokens() )
+{
+// qualifier is the whole version, including "-"
+qualifier = version;
+majorVersion = null;
+minorVersion = null;
+incrementalVersion = null;
}
}
catch ( NumberFormatException e )
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=219823&r1=219822&r2=219823&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Tue Jul 19 17:52:26 2005
@@ -98,6 +98,13 @@
assertEquals( "check incremental version", 0,
version.getIncrementalVersion() );
assertEquals( "check build number", 0, version.getBuildNumber() );
assertEquals( "check qualifier", "1.0RC2", version.getQualifier() );
+
+version = new DefaultArtifactVersion( "1.7.3.0" );
+assertEquals( "check major version", 0, version.getMajorVersion() );
+assertEquals( "check minor version", 0, version.getMinorVersion() );
+assertEquals( "check incremental version", 0,
version.getIncrementalVersion() );
+assertEquals( "check build number", 0, version.getBuildNumber() );
+assertEquals( "check qualifier", "1.7.3.0", version.getQualifier() );
}
public void testVersionComparing()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219822 - /maven/components/trunk/m2-bootstrap-all.sh
Author: brett Date: Tue Jul 19 17:18:11 2005 New Revision: 219822 URL: http://svn.apache.org/viewcvs?rev=219822&view=rev Log: commented out until project reports changes match up with api changes Modified: maven/components/trunk/m2-bootstrap-all.sh Modified: maven/components/trunk/m2-bootstrap-all.sh URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=219822&r1=219821&r2=219822&view=diff == --- maven/components/trunk/m2-bootstrap-all.sh (original) +++ maven/components/trunk/m2-bootstrap-all.sh Tue Jul 19 17:18:11 2005 @@ -69,7 +69,7 @@ cd maven-reports # update the release info to ensure these versions get used in the integration tests - m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e $ARGS clean:clean install + #m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e $ARGS clean:clean install ret=$?; if [ $ret != 0 ]; then exit $ret; fi ) ret=$?; if [ $ret != 0 ]; then exit $ret; fi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219821 - in /maven/components/trunk/maven-reporting/maven-reporting-api: pom.xml src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: brett Date: Tue Jul 19 17:11:36 2005 New Revision: 219821 URL: http://svn.apache.org/viewcvs?rev=219821&view=rev Log: set eol style Modified: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml (props changed) maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java (props changed) Propchange: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java -- svn:eol-style = native - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: maven-reporting-api SVN permissions
applied with changes. Things to watch out for: - stick to the standard code formatting and conventions - don't introduce unnecessary changes (all those final's on parameter names) - another convention thing - I think I fixed a bug in there as there was some unreachable code around the "inQuote" bit. You might like to check it. Thanks! - Brett Vincent Siveton wrote: Hi, I do not have the right permission to commit to maven-reporting-api. So, could someone commit the attached patch? Thanks a lot, Cheers, Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219820 - in /maven/components/trunk/maven-reporting/maven-reporting-api: pom.xml src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Author: brett
Date: Tue Jul 19 17:08:27 2005
New Revision: 219820
URL: http://svn.apache.org/viewcvs?rev=219820&view=rev
Log:
Submitted by: Vincent Siveton
Reviewed by: Brett Porter
reporting fixes
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml?rev=219820&r1=219819&r2=219820&view=diff
==
--- maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
(original)
+++ maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml Tue Jul
19 17:08:27 2005
@@ -1,42 +1,67 @@
-
- 4.0.0
-
-maven-reporting
-org.apache.maven.reporting
-2.0-beta-1-SNAPSHOT
-
- maven-reporting-api
-
-
- Vincent Siveton
- [EMAIL PROTECTED]
-
-
-
-
- org.apache.maven
- maven-project
- 2.0-beta-1-SNAPSHOT
-
-
- doxia
- doxia-core
- 1.0-alpha-4-SNAPSHOT
-
-
- org.apache.maven
- maven-plugin-api
- 2.0-beta-1-SNAPSHOT
-
-
- commons-validator
- commons-validator
- 1.1.4
-
-
- oro
- oro
- 2.0.7
-
-
-
+
+
+
+
+
+ 4.0.0
+
+maven-reporting
+org.apache.maven.reporting
+2.0-beta-1-SNAPSHOT
+
+ maven-reporting-api
+
+
+ vsiveton
+ Vincent Siveton
+ [EMAIL PROTECTED]
+
+Java Developer
+
+ -5
+
+
+
+
+ org.apache.maven
+ maven-project
+ 2.0-beta-1-SNAPSHOT
+
+
+ doxia
+ doxia-core
+ 1.0-alpha-4-SNAPSHOT
+
+
+ org.apache.maven
+ maven-plugin-api
+ 2.0-beta-1-SNAPSHOT
+
+
+ commons-validator
+ commons-validator
+ 1.1.4
+
+
+ oro
+ oro
+ 2.0.7
+
+
+
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=219820&r1=219819&r2=219820&view=diff
==
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Tue Jul 19 17:08:27 2005
@@ -1,315 +1,592 @@
-package org.apache.maven.reporting;
-
-/*
- * Copyright 2004-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.validator.EmailValidator;
-import org.apache.commons.validator.UrlValidator;
-import org.codehaus.doxia.sink.Sink;
-
-/**
- * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
- * @author Emmanuel Venisse
- * @author mailto:[EMAIL PROTECTED]">Vincent Siveton
- * @version $Id: AbstractMavenReportRenderer.java 163373 2005-02-22 03:37:00Z
brett $
- * @todo Later it may be appropriate to create something like a
VelocityMavenReportRenderer that could take a velocity template and pipe that
through Doxia rather than coding them up like this.
- */
-public abstract class AbstractMavenReportRenderer
-implements MavenReportRenderer
-{
-protected Sink sink;
-
-private int section = 0;
-
-public AbstractMavenReportRenderer( Sink sink )
-{
-this.sink = sink;
-}
-
-public void render()
-{
-sink.head();
-
-sink.title();
-
-sink.text( getTitle() );
-
-sink.title_();
-
-sink.head_();
-
-sink.body();
-
-renderBody();
-
-sink.body_();
-
-sink.flush();
-
-sink.close();
-}
-
-protected void startTable()
-{
-sink.table();
-}
-
-protected void endTable()
-{
-sink.table_();
-}
-
-protected void startSection( String name )
-{
-
RE: giving Arnaud access to Maven 1.x core
Thanks a lot everybody. Arnaud > -Message d'origine- > De : John Casey [mailto:[EMAIL PROTECTED] > Envoyé : mercredi 20 juillet 2005 01:33 > À : Maven Developers List > Objet : Re: giving Arnaud access to Maven 1.x core > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > +1 > > Brett Porter wrote: > | Hi, > | > | Arnaud knows what he is doing and is able to help out - can we give > | him access to the M1 core? > | > | Thanks, > | Brett > | > | > - > | To unsubscribe, e-mail: [EMAIL PROTECTED] For > | additional commands, e-mail: [EMAIL PROTECTED] > | > | > | > -BEGIN PGP SIGNATURE- > Version: GnuPG v1.2.6 (GNU/Linux) > > iD8DBQFC3Y2mK3h2CZwO/4URAr3mAJ4yfDvyxLB9XEdJ6OKavLR/kSle1ACeLI2Y > G1dywEYpr0TpJhtaoGHyLMg= > =eYh0 > -END PGP SIGNATURE- > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] For > additional commands, e-mail: [EMAIL PROTECTED] > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219819 - in /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata: DefaultRepositoryMetadataManager.java InvalidRepositoryMetadataException.java
Author: brett
Date: Tue Jul 19 17:00:08 2005
New Revision: 219819
URL: http://svn.apache.org/viewcvs?rev=219819&view=rev
Log:
add copyrights
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=219819&r1=219818&r2=219819&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Tue Jul 19 17:00:08 2005
@@ -1,5 +1,21 @@
package org.apache.maven.artifact.repository.metadata;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
@@ -31,7 +47,7 @@
{
resolve( metadata, null, local );
}
-
+
public void resolve( RepositoryMetadata metadata, ArtifactRepository
remote, ArtifactRepository local )
throws RepositoryMetadataManagementException
{
@@ -54,7 +70,8 @@
if ( !metadataFile.exists() )
{
throw new RepositoryMetadataManagementException(
metadata,
-
"Remote repository metadata not found.", e );
+
"Remote repository metadata not found.",
+ e
);
}
else
{
@@ -81,27 +98,28 @@
{
if ( !verifyFileNotEmpty( metadataFile ) )
{
-throw new InvalidRepositoryMetadataException( metadata,
"Metadata located in file: " + metadataFile + " appears to be corrupt (file is
empty). DOWNLOAD FAILED." );
+throw new InvalidRepositoryMetadataException( metadata,
"Metadata located in file: " +
+metadataFile + " appears to be corrupt (file is
empty). DOWNLOAD FAILED." );
}
-
+
cachedMetadata.put( metadata.getRepositoryPath(), metadataFile
);
}
}
-
+
metadata.setFile( metadataFile );
}
private boolean verifyFileNotEmpty( File metadataFile )
{
InputStream verifyInputStream = null;
-
+
try
{
verifyInputStream = new FileInputStream( metadataFile );
-
+
return verifyInputStream.available() > 0;
}
-catch( IOException e )
+catch ( IOException e )
{
return false;
}
@@ -156,12 +174,13 @@
throws RepositoryMetadataManagementException
{
File metadataFile = constructLocalRepositoryFile( metadata, local );
-
+
if ( metadataFile.exists() )
{
if ( !metadataFile.delete() )
{
-throw new RepositoryMetadataManagementException( metadata,
"Failed to purge local copy from: " + metadataFile );
+throw new RepositoryMetadataManagementException( metadata,
+ "Failed to
purge local copy from: " + metadataFile );
}
}
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/m
svn commit: r219817 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
Author: jdcasey
Date: Tue Jul 19 16:53:21 2005
New Revision: 219817
URL: http://svn.apache.org/viewcvs?rev=219817&view=rev
Log:
Forgot this one
Added:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
(with props)
Added:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java?rev=219817&view=auto
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
(added)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
Tue Jul 19 16:53:21 2005
@@ -0,0 +1,17 @@
+package org.apache.maven.artifact.repository.metadata;
+
+public class InvalidRepositoryMetadataException
+extends RepositoryMetadataManagementException
+{
+
+public InvalidRepositoryMetadataException( RepositoryMetadata metadata,
String message, Throwable cause )
+{
+super( metadata, message, cause );
+}
+
+public InvalidRepositoryMetadataException( RepositoryMetadata metadata,
String message )
+{
+super( metadata, message );
+}
+
+}
Propchange:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/InvalidRepositoryMetadataException.java
--
svn:keywords = "Author Date Id Revision"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219815 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/ test/java/org/apache/maven/artifact/versioning/
Author: brett
Date: Tue Jul 19 16:45:44 2005
New Revision: 219815
URL: http://svn.apache.org/viewcvs?rev=219815&view=rev
Log:
PR: MNG-505
empty restrictions means that nothing is valid, otherwise there will be one
restriction EVERYTHING
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java?rev=219815&r1=219814&r2=219815&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
Tue Jul 19 16:45:44 2005
@@ -32,6 +32,8 @@
private final boolean upperBoundInclusive;
+static final Restriction EVERYTHING = new Restriction( null, false, null,
false );
+
public Restriction( ArtifactVersion lowerBound, boolean
lowerBoundInclusive, ArtifactVersion upperBound,
boolean upperBoundInclusive )
{
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219815&r1=219814&r2=219815&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 16:45:44 2005
@@ -110,6 +110,7 @@
else
{
version = new DefaultArtifactVersion( process );
+restrictions.add( Restriction.EVERYTHING );
}
}
@@ -182,13 +183,9 @@
List r1 = this.restrictions;
List r2 = restriction.restrictions;
List restrictions;
-if ( r1.isEmpty() )
+if ( r1.isEmpty() || r2.isEmpty() )
{
-restrictions = r2;
-}
-else if ( r2.isEmpty() )
-{
-restrictions = r1;
+restrictions = Collections.EMPTY_LIST;
}
else
{
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=219815&r1=219814&r2=219815&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Tue Jul 19 16:45:44 2005
@@ -55,9 +55,14 @@
assertNull( CHECK_VERSION_RECOMMENDATION,
range.getRecommendedVersion() );
range = VersionRange.createFromVersionSpec( "1.0" );
-restrictions = range.getRestrictions();
-assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0",
range.getRecommendedVersion().toString() );
+restrictions = range.getRestrictions();
+assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+restriction = (Restriction) restrictions.get( 0 );
+assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
+assertFalse( CHECK_LOWER_BOUND_INCLUSIVE,
restriction.isLowerBoundInclusive() );
+assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
+assertFalse( CHECK_UPPER_BOUND_INCLUSIVE,
restriction.isUpperBoundInclusive() );
range = VersionRange.createFromVersionSpec( "[1.0]" );
restrictions = range.getRestrictions();
@@ -141,20 +146,32 @@
VersionRange range2 = VersionRange.createFromVersionSpec( "1.1" );
VersionRange mergedRange = range1.restrict( range2 );
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1",
mergedRange.getRecommendedVersion().toString() );
-assertEquals( CHECK_NUM_RESTRICTIONS, 0,
mergedRange.getRestrictions().size() );
+List restrictions = mergedRange.getRestrictions();
+assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictio
svn commit: r219814 - /maven/maven-1/core/trunk/project.xml
Author: aheritier Date: Tue Jul 19 16:43:12 2005 New Revision: 219814 URL: http://svn.apache.org/viewcvs?rev=219814&view=rev Log: add myself as committer Modified: maven/maven-1/core/trunk/project.xml Modified: maven/maven-1/core/trunk/project.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=219814&r1=219813&r2=219814&view=diff == --- maven/maven-1/core/trunk/project.xml (original) +++ maven/maven-1/core/trunk/project.xml Tue Jul 19 16:43:12 2005 @@ -214,6 +214,17 @@ +10 + Arnaud Heritier + aheritier + [EMAIL PROTECTED] + Octo Technology + +PMC Member +Java Developer + + +1 + + Pete Kazmier kaz [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219812 - /maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
Author: aheritier
Date: Tue Jul 19 16:37:42 2005
New Revision: 219812
URL: http://svn.apache.org/viewcvs?rev=219812&view=rev
Log:
fix MAVEN-1646 : Jelly tag "maven:pom" doesn't use inheritance
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java?rev=219812&r1=219811&r2=219812&view=diff
==
---
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
(original)
+++
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
Tue Jul 19 16:37:42 2005
@@ -27,6 +27,8 @@
/**
* MavenSession Jelly tag that creates a POM instance.
+ * By default, the inheritance in the POM isn't used.
+ * You must use the attribute useInheritance to activate it.
*
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
* @version $Id$
@@ -39,6 +41,9 @@
/** Name of var to give the project object. */
private String var;
+
+/** Define if the pom must use the inheritance. */
+private boolean useInheritance;
/**
* Set MavenSession project descriptor.
@@ -59,6 +64,15 @@
{
this.var = var;
}
+
+/**
+ * Define if the pom must use the inheritance.
+ * Setted to false by default to keep a backward compatibility.
+ * @param useInheritance true if the pom object must use the inheritance.
+ */
+public void setUseInheritance(boolean useInheritance){
+this.useInheritance = useInheritance;
+}
/**
* Perform functionality provided by the tag
@@ -79,7 +93,7 @@
context.setVariable( var,
MavenUtils.getProject( projectDescriptor,
getMavenContext(),
-false ) );
+useInheritance) );
}
catch ( Exception e )
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: giving Arnaud access to Maven 1.x core
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 +1 Brett Porter wrote: | Hi, | | Arnaud knows what he is doing and is able to help out - can we give him | access to the M1 core? | | Thanks, | Brett | | - | To unsubscribe, e-mail: [EMAIL PROTECTED] | For additional commands, e-mail: [EMAIL PROTECTED] | | | -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.6 (GNU/Linux) iD8DBQFC3Y2mK3h2CZwO/4URAr3mAJ4yfDvyxLB9XEdJ6OKavLR/kSle1ACeLI2Y G1dywEYpr0TpJhtaoGHyLMg= =eYh0 -END PGP SIGNATURE- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219808 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/VersionRange.java test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Author: brett
Date: Tue Jul 19 16:27:41 2005
New Revision: 219808
URL: http://svn.apache.org/viewcvs?rev=219808&view=rev
Log:
PR: MNG-505
test multiple ranges on each side
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219808&r1=219807&r2=219808&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 16:27:41 2005
@@ -219,7 +219,7 @@
private List intersection( List r1, List r2 )
{
-List restrictions = new ArrayList( Math.min( r1.size(), r2.size() ) );
+List restrictions = new ArrayList( r1.size() + r2.size() );
Iterator i1 = r1.iterator();
Iterator i2 = r2.iterator();
Restriction res1 = (Restriction) i1.next();
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=219808&r1=219807&r2=219808&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Tue Jul 19 16:27:41 2005
@@ -411,7 +411,179 @@
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
-// TODO: multiple on one side, multiple on both sides, boundaries
+range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
+range2 = VersionRange.createFromVersionSpec( "[1.1]" );
+mergedRange = range1.restrict( range2 );
+assertNull( CHECK_VERSION_RECOMMENDATION,
mergedRange.getRecommendedVersion() );
+restrictions = mergedRange.getRestrictions();
+assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+restriction = (Restriction) restrictions.get( 0 );
+assertEquals( CHECK_LOWER_BOUND, "1.1",
restriction.getLowerBound().toString() );
+assertTrue( CHECK_LOWER_BOUND_INCLUSIVE,
restriction.isLowerBoundInclusive() );
+assertEquals( CHECK_UPPER_BOUND, "1.1",
restriction.getUpperBound().toString() );
+assertTrue( CHECK_UPPER_BOUND_INCLUSIVE,
restriction.isUpperBoundInclusive() );
+
+range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
+range2 = VersionRange.createFromVersionSpec( "[1.4]" );
+mergedRange = range1.restrict( range2 );
+assertNull( CHECK_VERSION_RECOMMENDATION,
mergedRange.getRecommendedVersion() );
+restrictions = mergedRange.getRestrictions();
+assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+restriction = (Restriction) restrictions.get( 0 );
+assertEquals( CHECK_LOWER_BOUND, "1.4",
restriction.getLowerBound().toString() );
+assertTrue( CHECK_LOWER_BOUND_INCLUSIVE,
restriction.isLowerBoundInclusive() );
+assertEquals( CHECK_UPPER_BOUND, "1.4",
restriction.getUpperBound().toString() );
+assertTrue( CHECK_UPPER_BOUND_INCLUSIVE,
restriction.isUpperBoundInclusive() );
+
+range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
+range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
+mergedRange = range1.restrict( range2 );
+assertNull( CHECK_VERSION_RECOMMENDATION,
mergedRange.getRecommendedVersion() );
+restrictions = mergedRange.getRestrictions();
+assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
+restriction = (Restriction) restrictions.get( 0 );
+assertEquals( CHECK_LOWER_BOUND, "1.1",
restriction.getLowerBound().toString() );
+assertTrue( CHECK_LOWER_BOUND_INCLUSIVE,
restriction.isLowerBoundInclusive() );
+assertEquals( CHECK_UPPER_BOUND, "1.2",
restriction.getUpperBound().toString() );
+assertTrue( CHECK_UPPER_BOUND_INCLUSIVE,
restriction.isUpperBoundInclusive() );
+restriction = (Restriction) restrictions.get( 1 );
+assertEquals( CHECK_LOWER_BOUND, "1.3",
restriction.getLowerBound().toString() );
+assertTrue( CHECK_
svn commit: r219807 - in /maven/components/trunk: maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ maven-core/src/main/java/org/apache/maven/plugin/ maven-mboot2/src/main/java/ maven-plugin-mapping/src/main/java/org/a...
Author: jdcasey
Date: Tue Jul 19 16:27:24 2005
New Revision: 219807
URL: http://svn.apache.org/viewcvs?rev=219807&view=rev
Log:
Fixing bootstrap.
Added:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AbstractPluginMappingMojo.java
(with props)
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManagementException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=219807&r1=219806&r2=219807&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Tue Jul 19 16:27:24 2005
@@ -6,9 +6,12 @@
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -42,22 +45,9 @@
{
try
{
-File tempMetadataFile = File.createTempFile(
"plugins.xml", null );
-
try
{
-wagonManager.getRepositoryMetadata( metadata, remote,
tempMetadataFile );
-
-if ( !metadataFile.exists()
-|| ( metadataFile.lastModified() <=
tempMetadataFile.lastModified() ) )
-{
-if ( !tempMetadataFile.renameTo( metadataFile ) )
-{
-FileUtils.copyFile( tempMetadataFile,
metadataFile );
-
-tempMetadataFile.delete();
-}
-}
+wagonManager.getRepositoryMetadata( metadata, remote,
metadataFile );
}
catch ( ResourceDoesNotExistException e )
{
@@ -81,20 +71,43 @@
throw new RepositoryMetadataManagementException( metadata,
"Failed
to download repository metadata.", e );
}
-catch ( IOException e )
-{
-throw new RepositoryMetadataManagementException(
- metadata,
- "Error
constructing temporary metadata download file.",
- e );
-}
}
else
{
getLogger().info( "Using local copy of " + metadata + " from:
" + metadataFile );
}
-metadata.setFile( metadataFile );
+if ( metadataFile.exists() )
+{
+if ( !verifyFileNotEmpty( metadataFile ) )
+{
+throw new InvalidRepositoryMetadataException( metadata,
"Metadata located in file: " + metadataFile + " appears to be corrupt (file is
empty). DOWNLOAD FAILED." );
+}
+
+cachedMetadata.put( metadata.getRepositoryPath(), metadataFile
);
+}
+}
+
+metadata.setFile( metadataFile );
+}
+
+private boolean verifyFileNotEmpty( File metadataFile )
+{
+InputStream verifyInputStream = null;
+
+try
+{
+verifyInputS
svn commit: r219804 - in /maven/maven-1/core/trunk: project.properties project.xml xdocs/reference/index.xml
Author: aheritier
Date: Tue Jul 19 16:18:28 2005
New Revision: 219804
URL: http://svn.apache.org/viewcvs?rev=219804&view=rev
Log:
enable maven-jellydoc-plugin
Modified:
maven/maven-1/core/trunk/project.properties
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/xdocs/reference/index.xml
Modified: maven/maven-1/core/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.properties?rev=219804&r1=219803&r2=219804&view=diff
==
--- maven/maven-1/core/trunk/project.properties (original)
+++ maven/maven-1/core/trunk/project.properties Tue Jul 19 16:18:28 2005
@@ -60,6 +60,11 @@
maven.javadoc.links = http://jakarta.apache.org/commons/jelly/apidocs/,
http://jakarta.apache.org/commons/betwixt/apidocs/
# ---
+# J E L L Y D O C P R O P E R T I E S
+# ---
+maven.jellydoc.packages = ${pom.package}.jelly.tags.maven.*
+
+# ---
# X D O C P R O P E R T I E S
# ---
# Display the date on the Maven web site
Modified: maven/maven-1/core/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=219804&r1=219803&r2=219804&view=diff
==
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Tue Jul 19 16:18:28 2005
@@ -662,6 +662,7 @@
maven-file-activity-plugin
maven-developer-activity-plugin
maven-javadoc-plugin
+maven-jellydoc-plugin
maven-jxr-plugin
maven-junit-report-plugin
maven-license-plugin
Modified: maven/maven-1/core/trunk/xdocs/reference/index.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/index.xml?rev=219804&r1=219803&r2=219804&view=diff
==
--- maven/maven-1/core/trunk/xdocs/reference/index.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/index.xml Tue Jul 19 16:18:28 2005
@@ -59,7 +59,7 @@
- Maven Jelly Tag
Lirary
+ Maven Jelly Tag Lirary
The Maven Jelly Tag Library can be used from a Jelly based
application to perform the tasks of any of the
svn commit: r219806 - in /maven/maven-1/core/trunk/xdocs: navigation-pdf.xml navigation.xml
Author: aheritier Date: Tue Jul 19 16:24:49 2005 New Revision: 219806 URL: http://svn.apache.org/viewcvs?rev=219806&view=rev Log: enable maven-jellydoc-plugin Modified: maven/maven-1/core/trunk/xdocs/navigation-pdf.xml maven/maven-1/core/trunk/xdocs/navigation.xml Modified: maven/maven-1/core/trunk/xdocs/navigation-pdf.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/navigation-pdf.xml?rev=219806&r1=219805&r2=219806&view=diff == --- maven/maven-1/core/trunk/xdocs/navigation-pdf.xml (original) +++ maven/maven-1/core/trunk/xdocs/navigation-pdf.xml Tue Jul 19 16:24:49 2005 @@ -88,9 +88,7 @@ - + Modified: maven/maven-1/core/trunk/xdocs/navigation.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/navigation.xml?rev=219806&r1=219805&r2=219806&view=diff == --- maven/maven-1/core/trunk/xdocs/navigation.xml (original) +++ maven/maven-1/core/trunk/xdocs/navigation.xml Tue Jul 19 16:24:49 2005 @@ -93,7 +93,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219805 - /maven/maven-1/core/trunk/project.properties
Author: aheritier
Date: Tue Jul 19 16:22:16 2005
New Revision: 219805
URL: http://svn.apache.org/viewcvs?rev=219805&view=rev
Log:
document all jelly tags
Modified:
maven/maven-1/core/trunk/project.properties
Modified: maven/maven-1/core/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.properties?rev=219805&r1=219804&r2=219805&view=diff
==
--- maven/maven-1/core/trunk/project.properties (original)
+++ maven/maven-1/core/trunk/project.properties Tue Jul 19 16:22:16 2005
@@ -62,7 +62,7 @@
# ---
# J E L L Y D O C P R O P E R T I E S
# ---
-maven.jellydoc.packages = ${pom.package}.jelly.tags.maven.*
+maven.jellydoc.packages = ${pom.package}.jelly.tags.*
# ---
# X D O C P R O P E R T I E S
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
[ http://jira.codehaus.org/browse/MAVEN-1646?page=all ] Arnaud HERITIER closed MAVEN-1646: -- Resolution: Fixed solution 2 applied > Jelly tags : maven:pom doesn't use inheritance > -- > > Key: MAVEN-1646 > URL: http://jira.codehaus.org/browse/MAVEN-1646 > Project: maven > Type: Bug > Components: jelly/ant integration > Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 > Environment: tested with maven 1.0.2 and 1.1 beta-1 > Reporter: Arnaud HERITIER > Assignee: Arnaud HERITIER > Fix For: 1.1-beta-2 > Attachments: MAVEN-1646-sol1.patch, MAVEN-1646-sol2.patch > > > as it is implemented, this tag explicitly doesn't use the inheritance : > context.setVariable( var, MavenUtils.getProject( projectDescriptor, > getMavenContext(), false ) ); > I propose 2 solutions : > 1 - activate inheritence (but there was probably a reason why it was done > like this). > 2- add a new property to this tag (useInheritance) with the default value > setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219803 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/VersionRange.java test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Author: brett
Date: Tue Jul 19 16:14:02 2005
New Revision: 219803
URL: http://svn.apache.org/viewcvs?rev=219803&view=rev
Log:
PR: MNG-505
get the intersection of ranges
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219803&r1=219802&r2=219803&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 16:14:02 2005
@@ -181,14 +181,22 @@
List r1 = this.restrictions;
List r2 = restriction.restrictions;
-List restrictions = Collections.EMPTY_LIST;
-if ( !r1.isEmpty() || !r2.isEmpty() )
+List restrictions;
+if ( r1.isEmpty() )
{
-// TODO: amalgamate
-restrictions = new ArrayList( r1.size() + r2.size() );
-restrictions.addAll( r1 );
-restrictions.addAll( r2 );
+restrictions = r2;
+}
+else if ( r2.isEmpty() )
+{
+restrictions = r1;
+}
+else
+{
+restrictions = intersection( r1, r2 );
+}
+if ( version != null && restrictions.size() > 0 )
+{
boolean found = false;
for ( Iterator i = restrictions.iterator(); i.hasNext() && !found;
)
{
@@ -207,6 +215,155 @@
}
return new VersionRange( version, restrictions );
+}
+
+private List intersection( List r1, List r2 )
+{
+List restrictions = new ArrayList( Math.min( r1.size(), r2.size() ) );
+Iterator i1 = r1.iterator();
+Iterator i2 = r2.iterator();
+Restriction res1 = (Restriction) i1.next();
+Restriction res2 = (Restriction) i2.next();
+
+boolean done = false;
+while ( !done )
+{
+if ( res1.getLowerBound() == null || res2.getUpperBound() == null
||
+res1.getLowerBound().compareTo( res2.getUpperBound() ) <= 0 )
+{
+if ( res1.getUpperBound() == null || res2.getLowerBound() ==
null ||
+res1.getUpperBound().compareTo( res2.getLowerBound() ) >=
0 )
+{
+ArtifactVersion lower;
+ArtifactVersion upper;
+boolean lowerInclusive;
+boolean upperInclusive;
+
+// overlaps
+if ( res1.getLowerBound() == null )
+{
+lower = res2.getLowerBound();
+lowerInclusive = res2.isLowerBoundInclusive();
+}
+else if ( res2.getLowerBound() == null )
+{
+lower = res1.getLowerBound();
+lowerInclusive = res1.isLowerBoundInclusive();
+}
+else
+{
+int comparison = res1.getLowerBound().compareTo(
res2.getLowerBound() );
+if ( comparison < 0 )
+{
+lower = res2.getLowerBound();
+lowerInclusive = res2.isLowerBoundInclusive();
+}
+else if ( comparison == 0 )
+{
+lower = res1.getLowerBound();
+lowerInclusive = res1.isLowerBoundInclusive() &&
res2.isLowerBoundInclusive();
+}
+else
+{
+lower = res1.getLowerBound();
+lowerInclusive = res1.isLowerBoundInclusive();
+}
+}
+
+if ( res1.getUpperBound() == null )
+{
+upper = res2.getUpperBound();
+upperInclusive = res2.isUpperBoundInclusive();
+}
+else if ( res2.getUpperBound() == null )
+{
+upper = res1.getUpperBound();
+upperInclusive = res1.isUpperBoundInclusive();
+}
+else
+{
+int comparison = res1.getUpperBound().compareTo(
res2.getUpperBound() );
+
maven-reporting-api SVN permissions
Hi,
I do not have the right permission to commit to maven-reporting-api.
So, could someone commit the attached patch?
Thanks a lot,
Cheers,
Vincent
Index: src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
===
--- src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(révision 216032)
+++ src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(copie de travail)
@@ -16,11 +16,20 @@
* limitations under the License.
*/
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.commons.validator.EmailValidator;
import org.apache.commons.validator.UrlValidator;
import org.codehaus.doxia.sink.Sink;
+import org.codehaus.plexus.util.StringUtils;
/**
+ * An abstract class to manage report generation.
+ *
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
* @author Emmanuel Venisse
* @author mailto:[EMAIL PROTECTED]">Vincent Siveton
@@ -38,19 +47,19 @@
{
this.sink = sink;
}
-
+
public void render()
{
sink.head();
sink.title();
-sink.text( getTitle() );
+text( getTitle() );
sink.title_();
sink.head_();
-
+
sink.body();
renderBody();
@@ -72,7 +81,7 @@
sink.table_();
}
-protected void startSection( String name )
+protected void startSection( final String name )
{
section = section + 1;
@@ -104,7 +113,7 @@
break;
}
-sink.text( name );
+text( name );
switch ( section )
{
@@ -163,150 +172,423 @@
}
}
-protected void tableHeaderCell( String text )
+protected void tableHeaderCell( final String text )
{
sink.tableHeaderCell();
-sink.text( text );
+text( text );
sink.tableHeaderCell_();
}
-protected void tableCell( String text )
+/**
+ * Add a cell in a table.
+ * The text could be a link patterned text defined by {text,
url}
+ *
+ * @see #linkPatternedText(String)
+ *
+ * @param text
+ */
+protected void tableCell( final String text )
{
sink.tableCell();
-if ( text != null )
+linkPatternedText( text );
+
+sink.tableCell_();
+}
+
+protected void tableRow( final String[] content )
+{
+sink.tableRow();
+
+for ( int i = 0; i < content.length; i++ )
{
-sink.text( text );
+tableCell( content[i] );
}
-else
+
+sink.tableRow_();
+}
+
+protected void tableHeader( final String[] content )
+{
+sink.tableRow();
+
+for ( int i = 0; i < content.length; i++ )
{
-sink.nonBreakingSpace();
+tableHeaderCell( content[i] );
}
-sink.tableCell_();
+sink.tableRow_();
}
+protected void tableCaption( final String caption )
+{
+sink.tableCaption();
+text( caption );
+sink.tableCaption_();
+}
+
+protected void paragraph( final String paragraph )
+{
+sink.paragraph();
+
+text( paragraph );
+
+sink.paragraph_();
+}
+
+protected void link( final String href, final String name )
+{
+sink.link( href );
+
+text( name );
+
+sink.link_();
+}
+
/**
- * Create a cell with a potential link.
- *
- * @param text the text
- * @param href the href
+ * Add a new text.
+ * If text is empty of has a null value, add the "-" charater
+ *
+ * @param text a string
*/
-protected void tableCellWithLink( String text, String href )
+protected void text( final String text )
{
-sink.tableCell();
-
-if ( text != null )
+if ( ( text == null || text.length() == 0 ) ) // Take care of spaces
{
-if ( href != null )
-{
-String[] schemes = {"http", "https"};
-UrlValidator urlValidator = new UrlValidator( schemes );
-
-if ( EmailValidator.getInstance().isValid( href ) )
-{
-link( "mailto:"; + href, text );
-}
-else if ( href.toLowerCase().startsWith( "mailto:"; ) )
-{
-link( href, text );
-}
-else if ( urlValidator.isValid( href ) )
-{
-link( href, text );
-}
-else
-{
-sink.text( text );
-}
-}
-else
-{
-sink.text( text );
-}
+sink.text( "-" );
}
else
{
-
[jira] Commented: (MAVEN-1638) Post goals in plugins only seem to run once
[ http://jira.codehaus.org/browse/MAVEN-1638?page=comments#action_43073 ] dion gillard commented on MAVEN-1638: - Yes it works in 1.0.2. Should it? I'll work on a reproducible test case when I have time. > Post goals in plugins only seem to run once > --- > > Key: MAVEN-1638 > URL: http://jira.codehaus.org/browse/MAVEN-1638 > Project: maven > Type: Bug > Components: plugin manager > Versions: 1.1-beta-1 > Environment: Win2k, Maven 1.1-beta 1 installed > Reporter: dion gillard > Fix For: 1.1-beta-2 > > > I have a reactored build which creates many EJB jars via ejb:install-snapshot > The was5 plugin from sourceforge is installed and it has a postGoal defined > on ejb:ejb. > Out of several EJB projects that are built during the reactored build, only > the first EJB project has the postGoal executed, it is skipped for the other > EJB projects -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219792 - /maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml
Author: aheritier Date: Tue Jul 19 15:40:24 2005 New Revision: 219792 URL: http://svn.apache.org/viewcvs?rev=219792&view=rev Log: fix XML Modified: maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml Modified: maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml?rev=219792&r1=219791&r2=219792&view=diff == --- maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml (original) +++ maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml Tue Jul 19 15:40:24 2005 @@ -82,7 +82,7 @@ http://mavenosgiplugin.berlios.de/";>Maven OSGi Plugin -Create OSGi bundles +Create OSGi bundles - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219789 - /maven/maven-1/core/trunk/project.xml
Author: aheritier Date: Tue Jul 19 15:37:55 2005 New Revision: 219789 URL: http://svn.apache.org/viewcvs?rev=219789&view=rev Log: open 1.1 beta2 Modified: maven/maven-1/core/trunk/project.xml Modified: maven/maven-1/core/trunk/project.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=219789&r1=219788&r2=219789&view=diff == --- maven/maven-1/core/trunk/project.xml (original) +++ maven/maven-1/core/trunk/project.xml Tue Jul 19 15:37:55 2005 @@ -1,5 +1,4 @@ -
Re: giving Arnaud access to Maven 1.x core
+1 On 7/19/05, Jason van Zyl <[EMAIL PROTECTED]> wrote: > On Wed, 2005-07-20 at 08:07 +1000, Brett Porter wrote: > > Hi, > > > > Arnaud knows what he is doing and is able to help out - can we give him > > access to the M1 core? > > +1 > > > Thanks, > > Brett > > > > - > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > -- > jvz. > > Jason van Zyl > jason at maven.org > http://maven.apache.org > > you are never dedicated to something you have complete confidence in. > No one is fanatically shouting that the sun is going to rise tomorrow. > They know it is going to rise tomorrow. When people are fanatically > dedicated to political or religious faiths or any other kind of > dogmas or goals, it's always because these dogmas or > goals are in doubt. > > -- Robert Pirzig, Zen and the Art of Motorcycle Maintenance > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: giving Arnaud access to Maven 1.x core
On Wed, 2005-07-20 at 08:07 +1000, Brett Porter wrote: > Hi, > > Arnaud knows what he is doing and is able to help out - can we give him > access to the M1 core? +1 > Thanks, > Brett > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- jvz. Jason van Zyl jason at maven.org http://maven.apache.org you are never dedicated to something you have complete confidence in. No one is fanatically shouting that the sun is going to rise tomorrow. They know it is going to rise tomorrow. When people are fanatically dedicated to political or religious faiths or any other kind of dogmas or goals, it's always because these dogmas or goals are in doubt. -- Robert Pirzig, Zen and the Art of Motorcycle Maintenance - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: giving Arnaud access to Maven 1.x core
On Wed, Jul 20, 2005 at 08:07:08AM +1000, Brett Porter wrote: > Hi, > > Arnaud knows what he is doing and is able to help out - can we give him > access to the M1 core? +1 -- Trygve signature.asc Description: Digital signature
giving Arnaud access to Maven 1.x core
Hi, Arnaud knows what he is doing and is able to help out - can we give him access to the M1 core? Thanks, Brett - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
[ http://jira.codehaus.org/browse/MAVEN-1646?page=all ] Arnaud HERITIER updated MAVEN-1646: --- Attachment: MAVEN-1646-sol2.patch patch for solution 2. > Jelly tags : maven:pom doesn't use inheritance > -- > > Key: MAVEN-1646 > URL: http://jira.codehaus.org/browse/MAVEN-1646 > Project: maven > Type: Bug > Components: jelly/ant integration > Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 > Environment: tested with maven 1.0.2 and 1.1 beta-1 > Reporter: Arnaud HERITIER > Assignee: Arnaud HERITIER > Fix For: 1.1-beta-2 > Attachments: MAVEN-1646-sol1.patch, MAVEN-1646-sol2.patch > > > as it is implemented, this tag explicitly doesn't use the inheritance : > context.setVariable( var, MavenUtils.getProject( projectDescriptor, > getMavenContext(), false ) ); > I propose 2 solutions : > 1 - activate inheritence (but there was probably a reason why it was done > like this). > 2- add a new property to this tag (useInheritance) with the default value > setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
[ http://jira.codehaus.org/browse/MAVEN-1646?page=all ] Arnaud HERITIER updated MAVEN-1646: --- Attachment: MAVEN-1646-sol1.patch patch for solution 1 > Jelly tags : maven:pom doesn't use inheritance > -- > > Key: MAVEN-1646 > URL: http://jira.codehaus.org/browse/MAVEN-1646 > Project: maven > Type: Bug > Components: jelly/ant integration > Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 > Environment: tested with maven 1.0.2 and 1.1 beta-1 > Reporter: Arnaud HERITIER > Assignee: Arnaud HERITIER > Fix For: 1.1-beta-2 > Attachments: MAVEN-1646-sol1.patch > > > as it is implemented, this tag explicitly doesn't use the inheritance : > context.setVariable( var, MavenUtils.getProject( projectDescriptor, > getMavenContext(), false ) ); > I propose 2 solutions : > 1 - activate inheritence (but there was probably a reason why it was done > like this). > 2- add a new property to this tag (useInheritance) with the default value > setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
[ http://jira.codehaus.org/browse/MAVEN-1646?page=comments#action_43067 ] Arnaud HERITIER commented on MAVEN-1646: yes, I agree with you. I submit the patch ... > Jelly tags : maven:pom doesn't use inheritance > -- > > Key: MAVEN-1646 > URL: http://jira.codehaus.org/browse/MAVEN-1646 > Project: maven > Type: Bug > Components: jelly/ant integration > Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 > Environment: tested with maven 1.0.2 and 1.1 beta-1 > Reporter: Arnaud HERITIER > Assignee: Arnaud HERITIER > Fix For: 1.1-beta-2 > Attachments: MAVEN-1646-sol1.patch > > > as it is implemented, this tag explicitly doesn't use the inheritance : > context.setVariable( var, MavenUtils.getProject( projectDescriptor, > getMavenContext(), false ) ); > I propose 2 solutions : > 1 - activate inheritence (but there was probably a reason why it was done > like this). > 2- add a new property to this tag (useInheritance) with the default value > setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVEN-1638) Post goals in plugins only seem to run once
[ http://jira.codehaus.org/browse/MAVEN-1638?page=all ] Brett Porter updated MAVEN-1638: Description: I have a reactored build which creates many EJB jars via ejb:install-snapshot The was5 plugin from sourceforge is installed and it has a postGoal defined on ejb:ejb. Out of several EJB projects that are built during the reactored build, only the first EJB project has the postGoal executed, it is skipped for the other EJB projects was: I have a reactored build which creates many EJB jars via ejb:install-snapshot The was5 plugin from sourceforge is installed and it has a postGoal defined on ejb:ejb. Out of several EJB projects that are built during the reactored build, only the first EJB project has the postGoal executed, it is skipped for the other EJB projects Fix Version: 1.1-beta-2 did it work in 1.0.2? do you have a small reproducible test case? > Post goals in plugins only seem to run once > --- > > Key: MAVEN-1638 > URL: http://jira.codehaus.org/browse/MAVEN-1638 > Project: maven > Type: Bug > Components: plugin manager > Versions: 1.1-beta-1 > Environment: Win2k, Maven 1.1-beta 1 installed > Reporter: dion gillard > Fix For: 1.1-beta-2 > > > I have a reactored build which creates many EJB jars via ejb:install-snapshot > The was5 plugin from sourceforge is installed and it has a postGoal defined > on ejb:ejb. > Out of several EJB projects that are built during the reactored build, only > the first EJB project has the postGoal executed, it is skipped for the other > EJB projects -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MAVEN-1642) Malfromed FAQ example
[ http://jira.codehaus.org/browse/MAVEN-1642?page=all ] Brett Porter closed MAVEN-1642: --- Resolution: Fixed > Malfromed FAQ example > - > > Key: MAVEN-1642 > URL: http://jira.codehaus.org/browse/MAVEN-1642 > Project: maven > Type: Bug > Components: documentation > Reporter: Elliotte Rusty Harold > Priority: Minor > > > In the FAQ > > maven-jdepend-plugin > maven-checkstyle-plugin > maven-changes-plugin > maven-changelog-plugin > maven-developer-activity-plugin > maven-file-activity-plugin > maven-license-plugin > maven-javadoc-plugin > maven-jxr-plugin > maven-junit-report-plugin > maven-linkcheck-plugin > maven-tasklist-plugin > > is missing and end-tag after maven-developer-activity-plugin > This should be > maven-developer-activity-plugin -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVEN-1641) NPE thrown on RMIC call
[ http://jira.codehaus.org/browse/MAVEN-1641?page=all ] Brett Porter updated MAVEN-1641: Description: NullPointerException thrown when calling the RMIC ant task from within Maven. To see run: > maven java:compile >From within the attached test case project. was: NullPointerException thrown when calling the RMIC ant task from within Maven. To see run: > maven java:compile >From within the attached test case project. Fix Version: 1.1-beta-2 > NPE thrown on RMIC call > --- > > Key: MAVEN-1641 > URL: http://jira.codehaus.org/browse/MAVEN-1641 > Project: maven > Type: Bug > Versions: 1.0.2 > Environment: Windows XP SP2, Java SDK 1.4.2_06, Maven 1.0.2 > Reporter: Ricardo Gladwell > Fix For: 1.1-beta-2 > Attachments: stacktrace.txt, testcase.zip > > > NullPointerException thrown when calling the RMIC ant task from within Maven. > To see run: > > maven java:compile > From within the attached test case project. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219783 - /maven/maven-1/core/trunk/xdocs/faq.fml
Author: brett Date: Tue Jul 19 15:01:39 2005 New Revision: 219783 URL: http://svn.apache.org/viewcvs?rev=219783&view=rev Log: PR: MAVEN-1642 fix example Modified: maven/maven-1/core/trunk/xdocs/faq.fml Modified: maven/maven-1/core/trunk/xdocs/faq.fml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/faq.fml?rev=219783&r1=219782&r2=219783&view=diff == --- maven/maven-1/core/trunk/xdocs/faq.fml (original) +++ maven/maven-1/core/trunk/xdocs/faq.fml Tue Jul 19 15:01:39 2005 @@ -292,7 +292,7 @@ maven-checkstyle-plugin maven-changes-plugin maven-changelog-plugin - maven-developer-activity-plugin + maven-developer-activity-plugin maven-file-activity-plugin maven-license-plugin maven-javadoc-plugin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
[ http://jira.codehaus.org/browse/MAVEN-1646?page=all ] Brett Porter updated MAVEN-1646: Assign To: Arnaud HERITIER Fix Version: 1.1-beta-2 I think adding the attribute to keep backwards compatibility is the best option. > Jelly tags : maven:pom doesn't use inheritance > -- > > Key: MAVEN-1646 > URL: http://jira.codehaus.org/browse/MAVEN-1646 > Project: maven > Type: Bug > Components: jelly/ant integration > Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 > Environment: tested with maven 1.0.2 and 1.1 beta-1 > Reporter: Arnaud HERITIER > Assignee: Arnaud HERITIER > Fix For: 1.1-beta-2 > > > as it is implemented, this tag explicitly doesn't use the inheritance : > context.setVariable( var, MavenUtils.getProject( projectDescriptor, > getMavenContext(), false ) ); > I propose 2 solutions : > 1 - activate inheritence (but there was probably a reason why it was done > like this). > 2- add a new property to this tag (useInheritance) with the default value > setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVEN-1646) Jelly tags : maven:pom doesn't use inheritance
Jelly tags : maven:pom doesn't use inheritance -- Key: MAVEN-1646 URL: http://jira.codehaus.org/browse/MAVEN-1646 Project: maven Type: Bug Components: jelly/ant integration Versions: 1.0, 1.0.1, 1.0.2, 1.1-beta-1 Environment: tested with maven 1.0.2 and 1.1 beta-1 Reporter: Arnaud HERITIER as it is implemented, this tag explicitly doesn't use the inheritance : context.setVariable( var, MavenUtils.getProject( projectDescriptor, getMavenContext(), false ) ); I propose 2 solutions : 1 - activate inheritence (but there was probably a reason why it was done like this). 2- add a new property to this tag (useInheritance) with the default value setted to false. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219779 - /maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml
Author: brett Date: Tue Jul 19 14:25:24 2005 New Revision: 219779 URL: http://svn.apache.org/viewcvs?rev=219779&view=rev Log: add osgi plugin Modified: maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml Modified: maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml?rev=219779&r1=219778&r2=219779&view=diff == --- maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml (original) +++ maven/maven-1/core/trunk/xdocs/reference/3rdparty.xml Tue Jul 19 14:25:24 2005 @@ -80,6 +80,10 @@ http://mavenhistorical.sourceforge.net/";>Maven Historical Data Record user specified values from each maven build to a database. + +http://mavenosgiplugin.berlios.de/";>Maven OSGi Plugin +Create OSGi bundles + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219777 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: brett
Date: Tue Jul 19 14:19:26 2005
New Revision: 219777
URL: http://svn.apache.org/viewcvs?rev=219777&view=rev
Log:
PR: MNG-505
if a version doesn't match the format, revert to string comparison
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java?rev=219777&r1=219776&r2=219777&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
Tue Jul 19 14:19:26 2005
@@ -186,14 +186,24 @@
else
{
StringTokenizer tok = new StringTokenizer( part1, "." );
-majorVersion = Integer.valueOf( tok.nextToken() );
-if ( tok.hasMoreTokens() )
+try
{
-minorVersion = Integer.valueOf( tok.nextToken() );
+majorVersion = Integer.valueOf( tok.nextToken() );
+if ( tok.hasMoreTokens() )
+{
+minorVersion = Integer.valueOf( tok.nextToken() );
+}
+if ( tok.hasMoreTokens() )
+{
+incrementalVersion = Integer.valueOf( tok.nextToken() );
+}
}
-if ( tok.hasMoreTokens() )
+catch ( NumberFormatException e )
{
-incrementalVersion = Integer.valueOf( tok.nextToken() );
+// qualifier is the whole version, including "-"
+qualifier = version;
+majorVersion = null;
+minorVersion = null;
}
}
}
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=219777&r1=219776&r2=219777&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Tue Jul 19 14:19:26 2005
@@ -84,6 +84,20 @@
assertEquals( "check incremental version", 0,
version.getIncrementalVersion() );
assertEquals( "check build number", 0, version.getBuildNumber() );
assertEquals( "check qualifier", "RELEASE", version.getQualifier() );
+
+version = new DefaultArtifactVersion( "1.0.1b" );
+assertEquals( "check major version", 0, version.getMajorVersion() );
+assertEquals( "check minor version", 0, version.getMinorVersion() );
+assertEquals( "check incremental version", 0,
version.getIncrementalVersion() );
+assertEquals( "check build number", 0, version.getBuildNumber() );
+assertEquals( "check qualifier", "1.0.1b", version.getQualifier() );
+
+version = new DefaultArtifactVersion( "1.0RC2" );
+assertEquals( "check major version", 0, version.getMajorVersion() );
+assertEquals( "check minor version", 0, version.getMinorVersion() );
+assertEquals( "check incremental version", 0,
version.getIncrementalVersion() );
+assertEquals( "check build number", 0, version.getBuildNumber() );
+assertEquals( "check qualifier", "1.0RC2", version.getQualifier() );
}
public void testVersionComparing()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: generated-files policy in maven2
Cool! :-) Loïc On 7/19/05, Brett Porter <[EMAIL PROTECTED]> wrote: > Loïc Lefèvre wrote: > > >For example, every plugin generating Java source files named XXX will > >generate the files (by default) into target/generated/XXX/ and also > >update the source path for futur compilation and might also update > >.iml files (speaking of IntelliJ IDEA too). > > > > > That's exactly what already happens (try it :). I think the path is > target/generated-sources/PLUGIN-NAME/ > > - Brett > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: generated-files policy in maven2
Loïc Lefèvre wrote: For example, every plugin generating Java source files named XXX will generate the files (by default) into target/generated/XXX/ and also update the source path for futur compilation and might also update .iml files (speaking of IntelliJ IDEA too). That's exactly what already happens (try it :). I think the path is target/generated-sources/PLUGIN-NAME/ - Brett - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [m2] DefaultArtifactVersion fails on non-numeral versions
Ok, sorry about that. What I will do with these is fallback to a string comparison for the *whole* version. - Brett Yann LE DU wrote: Hi, Working with m2-beta-1 build of revision 219633. When I launch the "install" goal, if the version of one of my project dependency contains non-numeral characters, I got the following error. It happens on my project (on swarmcache:swarmcache:1.0RC2), but also when I build Continuum (on jta:jta:1.0.1b) java.lang.NumberFormatException: For input string: "0RC2" at java.lang.NumberFormatException.forInputString(NumberFormatException.java:48) at java.lang.Integer.parseInt(Integer.java:477) at java.lang.Integer.valueOf(Integer.java:574) at org.apache.maven.artifact.versioning.DefaultArtifactVersion.parseVersion(DefaultArtifactVersion.java:192) at org.apache.maven.artifact.versioning.DefaultArtifactVersion.(DefaultArtifactVersion.java:42) at org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec(VersionRange.java:112) ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: generated-files policy in maven2
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
plugins like antlr will bind to the generate-sources lifecycle phase in
the standard build, most likely, and will generate their output source
files to ${pom.build.directory}/generated-sources, which by default is
target/generated-sources.
We didn't feel there was a good reason to separate the generated sources
by their origination (antlr, sablecc, etc.), so they're all dumped into
the same generated-sources directory in target.
With regard to the storage of generated sources in your SCM, my personal
view is to treat your SCM like any other database. That is, don't store
calculated data. Generated sources are definitely calculated data, and
in the "normal" case where nothing is /manually/ done to these generated
sources after they are generated, this should be sufficient. It will
also avoid confusion related to users modifying the generated sources,
and causing them to fall out of sync with the grammar/model file from
which they were generated. Your mileage may vary with this approach, and
if your development process calls for generating the sources then
manually tweaking them, the generate-sources step is not really part of
your build, but a maintenance/development-cycle task, and shouldn't be
included as part of your maven build (except maybe as a checkpoint to
verify the grammars are in sync with sources or something).
Hope that answers your questions...
- -john
Loïc Lefèvre wrote:
| Hi,
| I've got some questions regarding a/the generated-files policy in maven2.
|
| I'll explain what I mean by generated-files policy by speaking of the
| anltr maven 1 plugin I currently use (but it can be applied to the
| Xdoclet maven 1 plugin... too).
|
| Antlr through the maven 1 plugin allows me to generate Java source
| files from a .g file (containing a grammar, a lexer...). The problem
| is where are/should go the generated source files?
|
| Some people told me: "in the src/java directory". Others (and I'm
| agree with them), told me that since they can be regenerated, they can
| be generated in some target/generated/antlr directory for example.
|
| The first category of people would argue that by doing so, the IDE can
| simply see the files and no errors appear in the other Java files
| referencing the generated files.
| Moreover, they think that the generated files must be checked-in in
| the CVS/SVN/Whatever repository since it is sources.
|
| The second category would answer them that the IDE configuration
| should be able to handle it properly by adding the
| target/generated/antlr directory to the source/path (done as well by
| the maven-antlr plugin) and by removing all the other directories
| under target from the source path (I speak here of IntelliJ IDEA).
| The first category would then tell that theoretically, everything
| under target should be excluded from the source path...
|
| Concerning the repository remark, I would say that since the generated
| source files can be regenerated again and again, they must not be put
| in the repository for the following reasons:
| - generally, the files checked-out are read-only and during the
| generation phase, the generated files can not be updated
| - for example, Java files generated by antlr 2.7.2 are not identical
| to the files generated with the 2.7.5 files so by updating the version
| of antlr, the Java source files must be regenerated.
|
| All these words to ask this simple question: does a generated-files
| policy exists for maven 2 (to standardize where the generated files
| will go)?
|
| For example, every plugin generating Java source files named XXX will
| generate the files (by default) into target/generated/XXX/ and also
| update the source path for futur compilation and might also update
| .iml files (speaking of IntelliJ IDEA too).
| Others generating files that must go in the MANIFEST or WEB-INF
| directory (XDoclet...) will generate the files into
| target/generated/MANIFEST or target/generated/WEB-INF.
|
| Thanks for your answers,
| Loïc
|
| -
| To unsubscribe, e-mail: [EMAIL PROTECTED]
| For additional commands, e-mail: [EMAIL PROTECTED]
|
|
|
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFC3WHsK3h2CZwO/4URAvo/AKCIphS6HSRE1NONA/NfhLz9k7ZrQwCePyGk
2FwocXMBlZLjLVOn1CCQpf0=
=ONsi
-END PGP SIGNATURE-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVENUPLOAD-446) SAX based XML utilities
SAX based XML utilities --- Key: MAVENUPLOAD-446 URL: http://jira.codehaus.org/browse/MAVENUPLOAD-446 Project: maven-upload-requests Type: Task Reporter: Thomas Hallgren http://www.tada.se/downloads/tada-sax-0.2.0-bundle.jar http://tada-sax.tigris.org http://tada-sax.tigris.org Tada-sax is a framework for building SAX-parsers. BEA (my current employer) uses it and it is also used by the Buckminster Eclipse Technology project. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
generated-files policy in maven2
Hi, I've got some questions regarding a/the generated-files policy in maven2. I'll explain what I mean by generated-files policy by speaking of the anltr maven 1 plugin I currently use (but it can be applied to the Xdoclet maven 1 plugin... too). Antlr through the maven 1 plugin allows me to generate Java source files from a .g file (containing a grammar, a lexer...). The problem is where are/should go the generated source files? Some people told me: "in the src/java directory". Others (and I'm agree with them), told me that since they can be regenerated, they can be generated in some target/generated/antlr directory for example. The first category of people would argue that by doing so, the IDE can simply see the files and no errors appear in the other Java files referencing the generated files. Moreover, they think that the generated files must be checked-in in the CVS/SVN/Whatever repository since it is sources. The second category would answer them that the IDE configuration should be able to handle it properly by adding the target/generated/antlr directory to the source/path (done as well by the maven-antlr plugin) and by removing all the other directories under target from the source path (I speak here of IntelliJ IDEA). The first category would then tell that theoretically, everything under target should be excluded from the source path... Concerning the repository remark, I would say that since the generated source files can be regenerated again and again, they must not be put in the repository for the following reasons: - generally, the files checked-out are read-only and during the generation phase, the generated files can not be updated - for example, Java files generated by antlr 2.7.2 are not identical to the files generated with the 2.7.5 files so by updating the version of antlr, the Java source files must be regenerated. All these words to ask this simple question: does a generated-files policy exists for maven 2 (to standardize where the generated files will go)? For example, every plugin generating Java source files named XXX will generate the files (by default) into target/generated/XXX/ and also update the source path for futur compilation and might also update .iml files (speaking of IntelliJ IDEA too). Others generating files that must go in the MANIFEST or WEB-INF directory (XDoclet...) will generate the files into target/generated/MANIFEST or target/generated/WEB-INF. Thanks for your answers, Loïc - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVENUPLOAD-445) Repo request for UrlRewriteFilter
[ http://jira.codehaus.org/browse/MAVENUPLOAD-445?page=comments#action_43058 ] Carlos Sanchez commented on MAVENUPLOAD-445: Please read http://maven.apache.org/reference/repository-upload.html > Repo request for UrlRewriteFilter > - > > Key: MAVENUPLOAD-445 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-445 > Project: maven-upload-requests > Type: Task > Reporter: Todd Huss > > > Could you include the UrlRewriteFilter http://tuckey.org/urlrewrite/ in the > ibiblio repo? > Here's a shot at a project file for it: > > 3 > urlrewritefilter-2.4 > urlrewritefilter > 2.4 > > java.net project > https://urlrewrite.dev.java.net > > > > BSD License > http://www.opensource.org/licenses/bsd-license.html > > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-603) sablecc plugin
[ http://jira.codehaus.org/browse/MNG-603?page=all ] Jesse McConnell updated MNG-603: Attachment: maven-sablecc-plugin.v3.tar bleh, missed the removal of the previously required tag ought to be gtg now > sablecc plugin > -- > > Key: MNG-603 > URL: http://jira.codehaus.org/browse/MNG-603 > Project: Maven 2 > Type: Improvement > Components: maven-plugins > Reporter: Jesse McConnell > Fix For: 2.0-beta-1 > Attachments: maven-sablecc-plugin.tar, maven-sablecc-plugin.v2.tar, > maven-sablecc-plugin.v3.tar > > > added a sablecc plugin which can be used like this: > > maven-sablecc-plugin > 1.0-SNAPSHOT > >expressions.grammar, aicc.grammar > > > > generate-sources > > generate > > > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVENUPLOAD-445) Repo request for UrlRewriteFilter
Repo request for UrlRewriteFilter - Key: MAVENUPLOAD-445 URL: http://jira.codehaus.org/browse/MAVENUPLOAD-445 Project: maven-upload-requests Type: Task Reporter: Todd Huss Could you include the UrlRewriteFilter http://tuckey.org/urlrewrite/ in the ibiblio repo? Here's a shot at a project file for it: 3 urlrewritefilter-2.4 urlrewritefilter 2.4 java.net project https://urlrewrite.dev.java.net BSD License http://www.opensource.org/licenses/bsd-license.html -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=comments#action_43056 ] Nick Faiz commented on MAVENUPLOAD-431: --- Thanks - I'll let you know when a reply comes from the nlog4j mailing list. Nick > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MNG-603) sablecc plugin
[ http://jira.codehaus.org/browse/MNG-603?page=all ] Jesse McConnell updated MNG-603: Attachment: maven-sablecc-plugin.v2.tar this is using a modifed computeStaleGrammars() from the AbstractCompilerMojo now all you need to do is put *.grammar files into the (src/main/sablecc by default) and it will pick them up and process them, and not reprocess them unless it has changed. > sablecc plugin > -- > > Key: MNG-603 > URL: http://jira.codehaus.org/browse/MNG-603 > Project: Maven 2 > Type: Improvement > Components: maven-plugins > Reporter: Jesse McConnell > Fix For: 2.0-beta-1 > Attachments: maven-sablecc-plugin.tar, maven-sablecc-plugin.v2.tar > > > added a sablecc plugin which can be used like this: > > maven-sablecc-plugin > 1.0-SNAPSHOT > >expressions.grammar, aicc.grammar > > > > generate-sources > > generate > > > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219716 - in /maven/components/trunk: maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ maven-core/src/main/resources/META-INF/plexus/ maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin...
Author: jdcasey
Date: Tue Jul 19 10:15:41 2005
New Revision: 219716
URL: http://svn.apache.org/viewcvs?rev=219716&view=rev
Log:
Removing leftover lifecycle binding for ValidatePomMojo in the
maven-plugin-plugin (removed that last night).
Removed:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/ValidatePluginPomMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/GenerateUpdatedMappingMojo.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=219716&r1=219715&r2=219716&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Tue Jul 19 10:15:41 2005
@@ -116,7 +116,7 @@
}
-public void install( RepositoryMetadata metadata, ArtifactRepository
local, String remoteRepositoryId )
+public void install( RepositoryMetadata metadata, ArtifactRepository local
)
throws RepositoryMetadataManagementException
{
File metadataFile = constructLocalRepositoryFile( metadata, local );
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java?rev=219716&r1=219715&r2=219716&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
Tue Jul 19 10:15:41 2005
@@ -14,7 +14,7 @@
void deploy( RepositoryMetadata repositoryMetadata, ArtifactRepository
remote )
throws RepositoryMetadataManagementException;
-void install( RepositoryMetadata repositoryMetadata, ArtifactRepository
local, String remoteRepositoryId )
+void install( RepositoryMetadata repositoryMetadata, ArtifactRepository
local )
throws RepositoryMetadataManagementException;
void purgeLocalCopy( RepositoryMetadata repositoryMetadata,
ArtifactRepository local )
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=219716&r1=219715&r2=219716&view=diff
==
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Tue Jul 19 10:15:41 2005
@@ -189,14 +189,13 @@
- plugin:validatePom
plugin:descriptor
resources:resources
compiler:compile
resources:testResources
compiler:testCompile
surefire:test
-
jar:jar,plugin:generateUpdatedMapping,plugin:addPluginArtifactMetadata
+ jar:jar,plugin:addPluginArtifactMetadata
install:install,plugin:installMapping
deploy:deploy,plugin:deployMapping
Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetad
[jira] Commented: (MPSCM-61) Exception while executing SCM command.
[ http://jira.codehaus.org/browse/MPSCM-61?page=comments#action_43052 ] Trygve Laugstol commented on MPSCM-61: -- Note: [snip] Caused by: java.io.IOException: cvs: not found [snip] which means that you don't have cvs in your PATH. > Exception while executing SCM command. > -- > > Key: MPSCM-61 > URL: http://jira.codehaus.org/browse/MPSCM-61 > Project: maven-scm-plugin > Type: Bug > Versions: 1.5 > Environment: Sun Solaris 5.8p4 > Java 1.5.0 > Reporter: Alex Mayorga Adame > Priority: Blocker > > > I'm new to maven, so please excuse if this is my fault, but when something > throws me an exception I consider there's a bug. So here you go. I'm trying > to checkout my project using maven scm:checkout and this is what I got: > build:start: > scm:find-connection: > [echo] Using connection: > scm:cvs:pserver:cvsrep@(obscured):/export1/cvsrep/cibos:Factorial > scm:checkout: > [echo] Checking out > scm:cvs:pserver:cvsrep@(obscured):/export1/cvsrep/cibos:Factorial > BUILD FAILED > File.. /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly > Element... scm:checkout > Line.. 110 > Column 233 > Exception while executing SCM command. > Total time: 27 seconds > Finished at: Tue Jul 19 12:22:16 EDT 2005 > Detailed error: > attaining goal build:start > attaining goal scm:checkout > build:start: > scm:find-connection: > [echo] Using connection: scm:cvs:pserver:[EMAIL > PROTECTED]:/export1/cvsrep/cibos:Factorial > scm:checkout: > [echo] Checking out scm:cvs:pserver:[EMAIL > PROTECTED]:/export1/cvsrep/cibos:Factorial > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-pom-plugin:maven-pom-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-release-plugin:maven-release-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-changes-plugin:maven-changes-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-artifact-plugin:maven-artifact-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-xdoc-plugin:maven-xdoc-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in > maven-scm-plugin:maven-scm-plugin > popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in app:app > BUILD FAILED > File.. /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly > Element... scm:checkout > Line.. 110 > Column 233 > Exception while executing SCM command. > com.werken.werkz.UnattainableGoalException: Unable to obtain goal > [scm:checkout] -- > /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly:110:233: > Exception while executing SCM command. > at com.werken.werkz.Goal.fire(Goal.java:646) > at com.werken.werkz.Goal.attain(Goal.java:575) > at > org.apache.maven.plugin.PluginManager.attainGoals(PluginManager.java:671) > at org.apache.maven.MavenSession.attainGoals(MavenSession.java:263) > at org.apache.maven.cli.App.doMain(App.java:488) > at org.apache.maven.cli.App.main(App.java:1239) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:585) > at com.werken.forehead.Forehead.run(Forehead.java:551) > at com.werken.forehead.Forehead.main(Forehead.java:581) > org.apache.commons.jelly.JellyTagException: > /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly:110:233: > Exception while executing SCM command. > at > org.apache.commons.jelly.impl.DynamicBeanTag.doTag(DynamicBeanTag.java:243) > at > org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:145) > at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:135) > at > org.apache.maven.jelly.tags.werkz.MavenGoalTag.runBodyTag(MavenGoalTag.java:79) > at > org.apache.maven.jelly.tags.werkz.MavenGoalTag$MavenGoalAction.performAction(MavenGoalTag.java:110) > at com.werken.werkz.Goal.fire(Goal.java:639) > at com.werken.werkz.Goal.attain(Goal.java:575) > at > org.apache.maven.plugin.PluginManager.attainGoals(PluginManager.java:671) > at org.apache.maven.MavenSession.attainGoals(MavenSession.java:263) > at org.apache.maven.cli.App.doMain(App.java:488) > at org.apache.maven.cli.App.main(App.java:1239) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:585) >
[jira] Created: (MPSCM-61) Exception while executing SCM command.
Exception while executing SCM command. -- Key: MPSCM-61 URL: http://jira.codehaus.org/browse/MPSCM-61 Project: maven-scm-plugin Type: Bug Versions: 1.5 Environment: Sun Solaris 5.8p4 Java 1.5.0 Reporter: Alex Mayorga Adame Priority: Blocker I'm new to maven, so please excuse if this is my fault, but when something throws me an exception I consider there's a bug. So here you go. I'm trying to checkout my project using maven scm:checkout and this is what I got: build:start: scm:find-connection: [echo] Using connection: scm:cvs:pserver:cvsrep@(obscured):/export1/cvsrep/cibos:Factorial scm:checkout: [echo] Checking out scm:cvs:pserver:cvsrep@(obscured):/export1/cvsrep/cibos:Factorial BUILD FAILED File.. /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly Element... scm:checkout Line.. 110 Column 233 Exception while executing SCM command. Total time: 27 seconds Finished at: Tue Jul 19 12:22:16 EDT 2005 Detailed error: attaining goal build:start attaining goal scm:checkout build:start: scm:find-connection: [echo] Using connection: scm:cvs:pserver:[EMAIL PROTECTED]:/export1/cvsrep/cibos:Factorial scm:checkout: [echo] Checking out scm:cvs:pserver:[EMAIL PROTECTED]:/export1/cvsrep/cibos:Factorial popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-pom-plugin:maven-pom-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-release-plugin:maven-release-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-changes-plugin:maven-changes-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-artifact-plugin:maven-artifact-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-xdoc-plugin:maven-xdoc-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in maven-scm-plugin:maven-scm-plugin popping off [EMAIL PROTECTED] for [EMAIL PROTECTED] in app:app BUILD FAILED File.. /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly Element... scm:checkout Line.. 110 Column 233 Exception while executing SCM command. com.werken.werkz.UnattainableGoalException: Unable to obtain goal [scm:checkout] -- /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly:110:233: Exception while executing SCM command. at com.werken.werkz.Goal.fire(Goal.java:646) at com.werken.werkz.Goal.attain(Goal.java:575) at org.apache.maven.plugin.PluginManager.attainGoals(PluginManager.java:671) at org.apache.maven.MavenSession.attainGoals(MavenSession.java:263) at org.apache.maven.cli.App.doMain(App.java:488) at org.apache.maven.cli.App.main(App.java:1239) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) at com.werken.forehead.Forehead.run(Forehead.java:551) at com.werken.forehead.Forehead.main(Forehead.java:581) org.apache.commons.jelly.JellyTagException: /export1/eae/maven/.maven/cache/maven-scm-plugin-1.5/plugin.jelly:110:233: Exception while executing SCM command. at org.apache.commons.jelly.impl.DynamicBeanTag.doTag(DynamicBeanTag.java:243) at org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:145) at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:135) at org.apache.maven.jelly.tags.werkz.MavenGoalTag.runBodyTag(MavenGoalTag.java:79) at org.apache.maven.jelly.tags.werkz.MavenGoalTag$MavenGoalAction.performAction(MavenGoalTag.java:110) at com.werken.werkz.Goal.fire(Goal.java:639) at com.werken.werkz.Goal.attain(Goal.java:575) at org.apache.maven.plugin.PluginManager.attainGoals(PluginManager.java:671) at org.apache.maven.MavenSession.attainGoals(MavenSession.java:263) at org.apache.maven.cli.App.doMain(App.java:488) at org.apache.maven.cli.App.main(App.java:1239) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) at com.werken.forehead.Forehead.run(Forehead.java:551) at com.werken.forehead.Forehead.main(Forehead.java:581) Caused by: org.apache.maven.scm.ScmException: Exception while executing SCM command. at org.apache.maven.scm.command.AbstractCommand.execute(AbstractCommand.java:58) at org.apache.maven.scm.provider.AbstractScmProvider.execute(AbstractScmProvider.java:131) at org.apache.maven.scm.manager.DefaultScmManager.execute(DefaultScmMana
[jira] Created: (MPCLOVER-45) Allow specifying the "relative" property for clover-setup
Allow specifying the "relative" property for clover-setup - Key: MPCLOVER-45 URL: http://jira.codehaus.org/browse/MPCLOVER-45 Project: maven-clover-plugin Type: Improvement Versions: 1.9.1 Environment: Maven 1.0.2 Reporter: Wim Deblauwe When using Clover in a distributed environment, you have several options of instrumenting your class files as presented here: http://www.cenqua.com/clover/doc/adv/distributed.html For option 2 you need to be able to specify the "relative" property, but currently this is not possible in the plugin. Please add this as it is very little work to do. regards, Wim -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[m2] DefaultArtifactVersion fails on non-numeral versions
Hi, Working with m2-beta-1 build of revision 219633. When I launch the "install" goal, if the version of one of my project dependency contains non-numeral characters, I got the following error. It happens on my project (on swarmcache:swarmcache:1.0RC2), but also when I build Continuum (on jta:jta:1.0.1b) java.lang.NumberFormatException: For input string: "0RC2" at java.lang.NumberFormatException.forInputString(NumberFormatException.java:48) at java.lang.Integer.parseInt(Integer.java:477) at java.lang.Integer.valueOf(Integer.java:574) at org.apache.maven.artifact.versioning.DefaultArtifactVersion.parseVersion(DefaultArtifactVersion.java:192) at org.apache.maven.artifact.versioning.DefaultArtifactVersion.(DefaultArtifactVersion.java:42) at org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec(VersionRange.java:112) ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Adding Javascript with Doxia
sink.rawText( "your code" ); Vincent Siveton wrote: Hi, Is it possible to add Javascript to the Doxia Sink object for an HTML renderer? If yes, how? I was thinking something like: sink.head(); sink.title(); text( getTitle() ); sink.title_(); sink.script( String jsCode ); sink.head_(); Regards, Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Adding Javascript with Doxia
Hi, Is it possible to add Javascript to the Doxia Sink object for an HTML renderer? If yes, how? I was thinking something like: sink.head(); sink.title(); text( getTitle() ); sink.title_(); sink.script( String jsCode ); sink.head_(); Regards, Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MAVENUPLOAD-444) Upload slimdog 0.6-SNAPSHOT
Upload slimdog 0.6-SNAPSHOT --- Key: MAVENUPLOAD-444 URL: http://jira.codehaus.org/browse/MAVENUPLOAD-444 Project: maven-upload-requests Type: Task Reporter: Emmanuel Venisse http://slimdog.jzonic.org/ it's under BSD license. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (CONTINUUM-243) Ability to mass edit projects or define default goal
Ability to mass edit projects or define default goal Key: CONTINUUM-243 URL: http://jira.codehaus.org/browse/CONTINUUM-243 Project: Continuum Type: New Feature Components: continuum-web Versions: 1.0-alpha-3 Reporter: Yann Le Du Priority: Minor At the moment, the default goal for a new project is "clean:clean install". Say we want to make it "clean:clean install site:site site:deploy" for one project --> OK. But say for 10 or more projects... The idea would be to : * either to mass edit project goals * either to define a custom default goal for new projects Hope it is clear enough... -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Created: (MAVENUPLOAD-443) upload wicket-extensions-1.0.1
upload wicket-extensions-1.0.1 -- Key: MAVENUPLOAD-443 URL: http://jira.codehaus.org/browse/MAVENUPLOAD-443 Project: maven-upload-requests Type: Task Reporter: Martijn Dashorst http://wicket.sourceforge.net/downloads/wicket-extensions-1.0.1-bundle.jar http://wicket.sourceforge.net/team-list.html http://wicket.sourceforge.net Wicket is a java, open source, component based web application framework. Please upload. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: continuum-core-ci module missing in rev. 219632
It will be fix in few hours. Emmanuel Yann LE DU wrote: Hi, Build of revision 219632 produces the following error : Could not find the model file '/devel/continuum/trunk/continuum-core-ci/pom.xml'. I noticed the root pom.xml contains a continuum-core-ci module but there is no directory for it... Yann
continuum-core-ci module missing in rev. 219632
Hi, Build of revision 219632 produces the following error : Could not find the model file '/devel/continuum/trunk/continuum-core-ci/pom.xml'. I noticed the root pom.xml contains a continuum-core-ci module but there is no directory for it... Yann
svn commit: r219633 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/ test/java/org/apache/maven/artifact/versioning/
Author: brett
Date: Tue Jul 19 02:30:03 2005
New Revision: 219633
URL: http://svn.apache.org/viewcvs?rev=219633&view=rev
Log:
PR: MNG-505
range and soft requirement intersections
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java?rev=219633&r1=219632&r2=219633&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
Tue Jul 19 02:30:03 2005
@@ -60,4 +60,33 @@
{
return upperBoundInclusive;
}
+
+public boolean containsVersion( ArtifactVersion version )
+{
+if ( lowerBound != null )
+{
+int comparison = lowerBound.compareTo( version );
+if ( comparison == 0 && !lowerBoundInclusive )
+{
+return false;
+}
+if ( comparison > 0 )
+{
+return false;
+}
+}
+if ( upperBound != null )
+{
+int comparison = upperBound.compareTo( version );
+if ( comparison == 0 && !upperBoundInclusive )
+{
+return false;
+}
+if ( comparison < 0 )
+{
+return false;
+}
+}
+return true;
+}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219633&r1=219632&r2=219633&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 02:30:03 2005
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
/**
@@ -178,14 +179,47 @@
{
ArtifactVersion version = max( recommendedVersion,
restriction.getRecommendedVersion() );
-// TODO
+List r1 = this.restrictions;
+List r2 = restriction.restrictions;
+List restrictions = Collections.EMPTY_LIST;
+if ( !r1.isEmpty() || !r2.isEmpty() )
+{
+// TODO: amalgamate
+restrictions = new ArrayList( r1.size() + r2.size() );
+restrictions.addAll( r1 );
+restrictions.addAll( r2 );
+
+boolean found = false;
+for ( Iterator i = restrictions.iterator(); i.hasNext() && !found;
)
+{
+Restriction r = (Restriction) i.next();
+
+if ( r.containsVersion( version ) )
+{
+found = true;
+}
+}
+
+if ( !found )
+{
+version = null;
+}
+}
-return new VersionRange( version, Collections.EMPTY_LIST );
+return new VersionRange( version, restrictions );
}
private ArtifactVersion max( ArtifactVersion v1, ArtifactVersion v2 )
{
-if ( v1.compareTo( v2 ) > 0 )
+if ( v1 == null )
+{
+return v2;
+}
+if ( v2 == null )
+{
+return v1;
+}
+else if ( v1.compareTo( v2 ) > 0 )
{
return v1;
}
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=219633&r1=219632&r2=219633&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Tue Jul 19 02:30:03 2005
@@ -135,14 +135,125 @@
}
public void testIntersections()
+th
svn commit: r219631 - in /maven/components/trunk/maven-artifact/src: main/java/org/apache/maven/artifact/versioning/VersionRange.java test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Author: brett
Date: Tue Jul 19 01:41:28 2005
New Revision: 219631
URL: http://svn.apache.org/viewcvs?rev=219631&view=rev
Log:
PR: MNG-505
test for correct ordering and overlap
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=219631&r1=219630&r2=219631&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Tue Jul 19 01:41:28 2005
@@ -54,6 +54,8 @@
List restrictions = new ArrayList();
String process = spec;
ArtifactVersion version = null;
+ArtifactVersion upperBound = null;
+ArtifactVersion lowerBound = null;
while ( process.startsWith( "[" ) || process.startsWith( "(" ) )
{
@@ -74,7 +76,20 @@
throw new InvalidVersionSpecificationException( "Unbounded
range: " + spec );
}
-restrictions.add( parseRestriction( process.substring( 0, index +
1 ) ) );
+Restriction restriction = parseRestriction( process.substring( 0,
index + 1 ) );
+if ( lowerBound == null )
+{
+lowerBound = restriction.getLowerBound();
+}
+if ( upperBound != null )
+{
+if ( restriction.getLowerBound() == null ||
restriction.getLowerBound().compareTo( upperBound ) < 0 )
+{
+throw new InvalidVersionSpecificationException( "Ranges
overlap: " + spec );
+}
+}
+restrictions.add( restriction );
+upperBound = restriction.getUpperBound();
process = process.substring( index + 1 ).trim();
@@ -141,6 +156,11 @@
if ( upperBound.length() > 0 )
{
upperVersion = new DefaultArtifactVersion( upperBound );
+}
+
+if ( upperVersion != null && lowerVersion != null &&
upperVersion.compareTo( lowerVersion ) < 0 )
+{
+throw new InvalidVersionSpecificationException( "Range defies
version ordering: " + spec );
}
restriction = new Restriction( lowerVersion, lowerBoundInclusive,
upperVersion, upperBoundInclusive );
Modified:
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=219631&r1=219630&r2=219631&view=diff
==
---
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
(original)
+++
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
Tue Jul 19 01:41:28 2005
@@ -124,15 +124,14 @@
checkInvalidRange( "(1.0,1.0]" );
checkInvalidRange( "[1.0,1.0)" );
checkInvalidRange( "(1.0,1.0)" );
+checkInvalidRange( "[1.1,1.0]" );
checkInvalidRange( "[1.0,1.2),1.3" );
-/* TODO: not testing this presently
// overlap
checkInvalidRange( "[1.0,1.2),(1.1,1.3]" );
// overlap
checkInvalidRange( "[1.1,1.3),(1.0,1.2]" );
// ordering
checkInvalidRange( "(1.1,1.2],[1.0,1.1)" );
-*/
}
public void testIntersections()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (CONTINUUM-117) Blame mechanism
[ http://jira.codehaus.org/browse/CONTINUUM-117?page=comments#action_43041 ] Vasyl Stashuk commented on CONTINUUM-117: - For this reason, let Continuum show differences in files between current and previous builds. Also, for the changes display users that did them. > Blame mechanism > --- > > Key: CONTINUUM-117 > URL: http://jira.codehaus.org/browse/CONTINUUM-117 > Project: Continuum > Type: New Feature > Versions: 1.0-alpha-3 > Reporter: Jason van Zyl > Assignee: Jason van Zyl > Fix For: 1.0-beta-1 > > > When a build breaks we need to be able to look at the ID(s) in the last set > of changes that broke a build so that we can track and notify. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r219630 - in /maven/components/trunk: maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/ maven-artifact/src/main/java/org/apache/maven/artifact/ maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ maven-artifact/...
Author: brett
Date: Tue Jul 19 01:23:01 2005
New Revision: 219630
URL: http://svn.apache.org/viewcvs?rev=219630&view=rev
Log:
PR: MNG-505
use comparable versions in ranges
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=219630&r1=219629&r2=219630&view=diff
==
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Tue Jul 19 01:23:01 2005
@@ -23,7 +23,9 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Repository;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.tools.ant.BuildException;
@@ -56,6 +58,9 @@
private boolean verbose;
+/**
+ * @noinspection RefusedBequest
+ */
public void execute()
{
ArtifactRepository localRepo = createLocalArtifactRepository();
@@ -79,7 +84,7 @@
for ( Iterator i = pom.getRepositories().iterator(); i.hasNext(); )
{
-org.apache.maven.model.Repository pomRepository =
(org.apache.maven.model.Repository) i.next();
+Repository pomRepository = (Repository) i.next();
remoteRepositories.add( createAntRemoteRepository(
pomRepository ) );
}
@@ -91,7 +96,15 @@
pom = createDummyPom();
}
-Set artifacts = MavenMetadataSource.createArtifacts( artifactFactory,
dependencies, null, null );
+Set artifacts;
+try
+{
+artifacts = MavenMetadataSource.createArtifacts( artifactFactory,
dependencies, null, null );
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new BuildException( "Invalid version specification", e );
+}
log( "Resolving dependencies..." );
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=219630&r1=219629&r2=219630&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Tue Jul 19 01:23:01 2005
@@ -80,7 +80,7 @@
this.artifactId = artifactId;
// TODO: this would be where we might have a min/max instead
-this.version = versionRange != null ?
versionRange.getRecommendedVersion() : null;
+this.version = versionRange != null ?
versionRange.getRecommendedVersion().toString() : null;
this.artifactHandler = artifactHandler;
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/s
[jira] Commented: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=comments#action_43037 ] Carlos Sanchez commented on MAVENUPLOAD-431: Done, all deployed but nlog4j > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=comments#action_43034 ] Nick Faiz commented on MAVENUPLOAD-431: --- All license files in the attached jars are now named LICENSE.txt instead of LICENSE-2.0.txt . I've contacted the nlog4j mailer to ask about the jmxtools.jar dependency. Nick > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=comments#action_43035 ] Nick Faiz commented on MAVENUPLOAD-431: --- If the slf4j jars look okay, could they go on the repository while we wait to work out the nlog4j dependency? We could use the nop or simple slf4j jar in the meantime. Nick > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=all ] Nick Faiz updated MAVENUPLOAD-431: -- Attachment: slf4j-wrapper-jdk14-1.0-beta4.jar > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-jdk14-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=all ] Nick Faiz updated MAVENUPLOAD-431: -- Attachment: slf4j-wrapper-nop-1.0-beta4.jar > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-nop-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=all ] Nick Faiz updated MAVENUPLOAD-431: -- Attachment: slf4j-wrapper-simple-1.0-beta4.jar > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar, slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MAVENUPLOAD-431) Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4
[ http://jira.codehaus.org/browse/MAVENUPLOAD-431?page=all ] Nick Faiz updated MAVENUPLOAD-431: -- Attachment: nlog4j-wrapper-1.2.14.jar > Upload request for NLOG4J 1.2.14 and SLF4J 1.0-beta4 > > > Key: MAVENUPLOAD-431 > URL: http://jira.codehaus.org/browse/MAVENUPLOAD-431 > Project: maven-upload-requests > Type: Task > Reporter: Alex Karasulu > Attachments: nlog4j-wrapper-1.2.14.jar, nlog4j-wrapper-1.2.14.jar, > slf4j-wrapper-jdk14-1.0-beta4.jar, slf4j-wrapper-nop-1.0-beta4.jar, > slf4j-wrapper-simple-1.0-beta4.jar > > > These files have been listed below rather than using a bundle. The bundle > path is really a URL to our repo at safehaus where we keep these files. They > are not maven based projects so we do not have a project.xml to do this. > http://maven.safehaus.org/nlog4j/jars/nlog4j-1.2.14.jar > http://maven.safehaus.org/slf4j/jars/slf4j-jdk14-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-nop-1.0-beta4.jar > http://maven.safehaus.org/slf4j/jars/slf4j-simple-1.0-beta4.jar > Thanks, > Alex -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
