svn commit: r635514 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: vsiveton Date: Mon Mar 10 03:35:51 2008 New Revision: 635514 URL: http://svn.apache.org/viewvc?rev=635514&view=rev Log: o reverted release. See: http://www.nabble.com/Re%3A-svn-commit%3A-r635240---in--maven-plugin-tools-trunk%3A-.--maven-plugin-plugin--maven-plugin-tools-ant--maven-plugin-tools-api--maven-plugin-tools-beanshell--maven-plugin-tools-java--maven-plugin-tools-javadoc--maven-plugin-tools-model--tt15929761s177.html http://www.nabble.com/-Vote--Release-Maven-Plugin-Tools-2.4-projects-%28take-2%29-tt15942941s177.html Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Mar 10 03:35:51 2008 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-plugin-plugin - 2.5-SNAPSHOT + 2.4-SNAPSHOT maven-plugin Maven Plugin Plugin @@ -238,7 +238,7 @@ 1.0-alpha-10 1.0-alpha-10 -2.4 +2.4-SNAPSHOT Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Mon Mar 10 03:35:51 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.5-SNAPSHOT +2.4-SNAPSHOT maven-plugin-tools-ant Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Mon Mar 10 03:35:51 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.5-SNAPSHOT +2.4-SNAPSHOT maven-plugin-tools-api Modified: maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml Mon Mar 10 03:35:51 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.5-SNAPSHOT +2.4-SNAPSHOT maven-plugin-tools-beanshell Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Mon Mar 10 03:35:51 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.5-SNAPSHOT +2.4-SNAPSHOT maven-plugin-tools-java Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Mon Mar 10 03:35:51 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.5-SNAPSHOT +2.4-SNAPSHOT maven-plugin-tools-javadoc Modified: maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml?rev=635514&r1=635513&r2=635514&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-model/pom.
svn commit: r635515 - /maven/plugin-tools/tags/maven-plugin-tools-2.4/
Author: vsiveton Date: Mon Mar 10 03:36:44 2008 New Revision: 635515 URL: http://svn.apache.org/viewvc?rev=635515&view=rev Log: o reverted release. See: http://www.nabble.com/Re%3A-svn-commit%3A-r635240---in--maven-plugin-tools-trunk%3A-.--maven-plugin-plugin--maven-plugin-tools-ant--maven-plugin-tools-api--maven-plugin-tools-beanshell--maven-plugin-tools-java--maven-plugin-tools-javadoc--maven-plugin-tools-model--tt15929761s177.html http://www.nabble.com/-Vote--Release-Maven-Plugin-Tools-2.4-projects-%28take-2%29-tt15942941s177.html Removed: maven/plugin-tools/tags/maven-plugin-tools-2.4/
svn commit: r635527 - /maven/plugin-tools/trunk/pom.xml
Author: vsiveton Date: Mon Mar 10 04:08:33 2008 New Revision: 635527 URL: http://svn.apache.org/viewvc?rev=635527&view=rev Log: o removed last '/' in SCM urls Modified: maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=635527&r1=635526&r2=635527&view=diff == --- maven/plugin-tools/trunk/pom.xml (original) +++ maven/plugin-tools/trunk/pom.xml Mon Mar 10 04:08:33 2008 @@ -49,8 +49,8 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk
svn commit: r635530 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: vsiveton Date: Mon Mar 10 04:15:39 2008 New Revision: 635530 URL: http://svn.apache.org/viewvc?rev=635530&view=rev Log: [maven-release-plugin] prepare release maven-plugin-tools-2.4 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=635530&r1=635529&r2=635530&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Mar 10 04:15:39 2008 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-plugin-plugin - 2.4-SNAPSHOT + 2.4 maven-plugin Maven Plugin Plugin @@ -238,7 +238,7 @@ 1.0-alpha-10 1.0-alpha-10 -2.4-SNAPSHOT +2.4 @@ -249,9 +249,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=635530&r1=635529&r2=635530&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Mon Mar 10 04:15:39 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4-SNAPSHOT +2.4 maven-plugin-tools-ant @@ -55,8 +55,8 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-tools-ant/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=635530&r1=635529&r2=635530&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Mon Mar 10 04:15:39 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4-SNAPSHOT +2.4 maven-plugin-tools-api @@ -99,8 +99,8 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-tools-api/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api Modified: maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml?rev=635530&r1=635529&r2=635530&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml Mon Mar 10 04:15:39 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4-SNAPSHOT +2.4
svn commit: r635531 - in /maven/plugin-tools/tags/maven-plugin-tools-2.4: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/
Author: vsiveton Date: Mon Mar 10 04:15:49 2008 New Revision: 635531 URL: http://svn.apache.org/viewvc?rev=635531&view=rev Log: [maven-release-plugin] copy for tag maven-plugin-tools-2.4 Added: maven/plugin-tools/tags/maven-plugin-tools-2.4/ - copied from r635528, maven/plugin-tools/trunk/ maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-beanshell/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-java/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-javadoc/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-model/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/tags/maven-plugin-tools-2.4/pom.xml - copied unchanged from r635530, maven/plugin-tools/trunk/pom.xml
svn commit: r635532 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: vsiveton Date: Mon Mar 10 04:16:00 2008 New Revision: 635532 URL: http://svn.apache.org/viewvc?rev=635532&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=635532&r1=635531&r2=635532&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Mar 10 04:16:00 2008 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-plugin-plugin - 2.4 + 2.5-SNAPSHOT maven-plugin Maven Plugin Plugin @@ -249,9 +249,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-plugin + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-plugin/ Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=635532&r1=635531&r2=635532&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Mon Mar 10 04:16:00 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4 +2.5-SNAPSHOT maven-plugin-tools-ant @@ -55,8 +55,8 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-ant + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-tools-ant/ Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=635532&r1=635531&r2=635532&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Mon Mar 10 04:16:00 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4 +2.5-SNAPSHOT maven-plugin-tools-api @@ -99,8 +99,8 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api - http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/tags/maven-plugin-tools-2.4/maven-plugin-tools-api + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ + http://svn.apache.org/viewcvs.cgi/maven/plugin-tools/trunk/maven-plugin-tools-api/ Modified: maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml?rev=635532&r1=635531&r2=635532&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml Mon Mar 10 04:16:00 2008 @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools -2.4 +2.5-SNAPSHOT maven-plugin-tools-beanshell @@ -52,8 +52,8 @@ - scm:svn:http://svn.apach
svn commit: r635613 - /maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Author: jdcasey
Date: Mon Mar 10 10:33:55 2008
New Revision: 635613
URL: http://svn.apache.org/viewvc?rev=635613&view=rev
Log:
[MNG-3415] Fixing metadata writing NOT to occur when offline or when
TrasferFailedException happens...only when resource is not found (for
updateInterval calculations) and when resolution succeeds. Integration tests to
follow.
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=635613&r1=635612&r2=635613&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Mon Mar 10 10:33:55 2008
@@ -82,19 +82,21 @@
localRepository.pathOfLocalRepositoryMetadata( metadata, repository ) );
-
boolean checkForUpdates =
-policy.checkOutOfDate( new Date( file.lastModified() )
) || !file.exists();
+!file.exists() || policy.checkOutOfDate( new Date(
file.lastModified() ) );
if ( checkForUpdates )
{
if ( wagonManager.isOnline() )
{
getLogger().info( metadata.getKey() + ": checking
for updates from " + repository.getId() );
+
+boolean storeMetadata = false;
try
{
wagonManager.getArtifactMetadata( metadata,
repository, file,
policy.getChecksumPolicy() );
+storeMetadata = true;
}
catch ( ResourceDoesNotExistException e )
{
@@ -106,6 +108,7 @@
{
file.delete();
}
+storeMetadata = true;
}
catch ( TransferFailedException e )
{
@@ -119,6 +122,30 @@
// TODO: [jc; 08-Nov-2005] revisit this for 2.1
// suppressing logging to avoid logging this
error twice.
}
+if ( storeMetadata )
+{
+// touch file so that this is not checked
again until interval has passed
+if ( file.exists() )
+{
+file.setLastModified(
System.currentTimeMillis() );
+}
+else
+{
+// this ensures that files are not
continuously checked when they don't exist remotely
+
+// TODO: [jdcasey] If this happens as a
result of ResourceDoesNotExistException, what effect will it have on subsequent
runs?
+// Will the updateInterval come into play
cleanly, or will this plug up the works??
+try
+{
+metadata.storeInLocalRepository(
localRepository, repository );
+}
+catch ( RepositoryMetadataStoreException e
)
+{
+throw new
RepositoryMetadataResolutionException(
+"Unable to store local copy of
metadata: " + e.getMessage(), e );
+}
+}
+}
}
else
{
@@ -126,28 +153,11 @@
metadata.extendedToString() + "\n\n" );
}
}
-
-// TODO: should this be inside the above check?
-// touch file so that t
svn commit: r635614 - in /maven/core-integration-testing/trunk: core-integration-tests/src/test/java/org/apache/maven/integrationtests/ core-integration-tests/src/test/resources/mng-3415-junk-reposito
Author: jdcasey Date: Mon Mar 10 10:37:22 2008 New Revision: 635614 URL: http://svn.apache.org/viewvc?rev=635614&view=rev Log: [MNG-3415] Adding an integration test to make sure metadata files aren't written when TransferFailedException happens during metadata resolution, and that the file used for updateInterval calculations (metadata file in 2.0.x and resolver-status.properties in 2.1.x) is NOT updated on successive builds inside that updateInterval. Finally, updating AbstractMavenIntegrationTest to allow matching of specific version ranges on-demand, to allow tests to adjust things like the updateInterval check-file...this is not ideal, but provides smaller code changes and maintenance overhead than duplicating unit test classes for this behavior. Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3415JunkRepositoryMetadataTest.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/dependency-pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/apache/maven/plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/apache/maven/plugin/findLocalRepo/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/maven-find-local-repo-plugin/src/main/java/org/apache/maven/plugin/findLocalRepo/FindLocalRepoMojo.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/main/java/tests/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/main/java/tests/App.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/test/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/test/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/test/java/tests/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/project/src/test/java/tests/AppTest.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3415-junk-repository-metadata/settings.xml.in (with props) Modified: maven/core-integration-testing/trunk/maven-integration-test-helper/src/main
svn commit: r635645 - /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Author: brianf
Date: Mon Mar 10 11:46:27 2008
New Revision: 635645
URL: http://svn.apache.org/viewvc?rev=635645&view=rev
Log:
MNG-2861: intermediate fix to produce better logging than an NPE
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=635645&r1=635644&r2=635645&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Mon Mar 10 11:46:27 2008
@@ -220,8 +220,18 @@
}
}
//end hack
-resetArtifact.selectVersion(
resetArtifact.getVersionRange().matchVersion(
-
resetArtifact.getAvailableVersions() ).toString() );
+
+//MNG-2861: match version can return null
+ArtifactVersion selectedVersion =
resetArtifact.getVersionRange().matchVersion(
resetArtifact.getAvailableVersions() );
+if (selectedVersion != null)
+{
+ resetArtifact.selectVersion(
selectedVersion.toString() );
+}
+else
+{
+ throw new OverConstrainedVersionException("
Unable to find a version in "+ resetArtifact.getAvailableVersions()+" to match
the range "+ resetArtifact.getVersionRange(), resetArtifact);
+}
+
fireEvent(
ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, resetNodes[j] );
}
}
svn commit: r635659 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: brianf
Date: Mon Mar 10 12:10:42 2008
New Revision: 635659
URL: http://svn.apache.org/viewvc?rev=635659&view=rev
Log:
MNG-2681: when a relocation is processed, retrieve the available versions for
the relocated artifact.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=635659&r1=635658&r2=635659&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Mon Mar 10 12:10:42 2008
@@ -169,6 +169,16 @@
return null;
}
+//MNG-2861: the artifact data has changed. If the
available versions where previously retrieved,
+//we need to update it. TODO: shouldn't the versions
be merged across relocations?
+List available = artifact.getAvailableVersions();
+if ( available != null && !available.isEmpty() )
+{
+artifact.setAvailableVersions(
this.retrieveAvailableVersions( artifact, localRepository,
+
remoteRepositories ) );
+
+}
+
String message = "\n This artifact has been relocated
to " + artifact.getGroupId() + ":" +
artifact.getArtifactId() + ":" +
artifact.getVersion() + ".\n";
svn commit: r635690 - in /maven/components: branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java trunk/maven-toolchain/src/main/java/org/apache/maven/too
Author: mkleint
Date: Mon Mar 10 14:07:54 2008
New Revision: 635690
URL: http://svn.apache.org/viewvc?rev=635690&view=rev
Log:
MAVEN-3430 make sure getType never returns null.
Modified:
maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Modified:
maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=635690&r1=635689&r2=635690&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Mon Mar 10 14:07:54 2008
@@ -58,7 +58,7 @@
public final String getType( )
{
-return type;
+return type != null ? type : model.getType();
}
Modified:
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=635690&r1=635689&r2=635690&view=diff
==
---
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
(original)
+++
maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Mon Mar 10 14:07:54 2008
@@ -58,7 +58,7 @@
public final String getType( )
{
-return type;
+return type != null ? type : model.getType();
}
svn commit: r635694 - in /maven/sandbox/trunk/shared/reports: maven-plugins.sh run.sh
Author: dennisl Date: Mon Mar 10 14:10:45 2008 New Revision: 635694 URL: http://svn.apache.org/viewvc?rev=635694&view=rev Log: Rename file. Added: maven/sandbox/trunk/shared/reports/maven-plugins.sh - copied unchanged from r635690, maven/sandbox/trunk/shared/reports/run.sh Removed: maven/sandbox/trunk/shared/reports/run.sh
svn commit: r635697 - /maven/sandbox/trunk/shared/reports/maven-plugins.sh
Author: dennisl Date: Mon Mar 10 14:24:48 2008 New Revision: 635697 URL: http://svn.apache.org/viewvc?rev=635697&view=rev Log: o Just create the report - nothing else. Modified: maven/sandbox/trunk/shared/reports/maven-plugins.sh Modified: maven/sandbox/trunk/shared/reports/maven-plugins.sh URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/reports/maven-plugins.sh?rev=635697&r1=635696&r2=635697&view=diff == --- maven/sandbox/trunk/shared/reports/maven-plugins.sh (original) +++ maven/sandbox/trunk/shared/reports/maven-plugins.sh Mon Mar 10 14:24:48 2008 @@ -1,12 +1,8 @@ #!/bin/sh -export JAVA_HOME=/opt/java/sdk/current -export JAVA_CMD=$JAVA_HOME/bin/java -export JAVA_OPTS="-ms32m -mx256m" -export JAVA="$JAVA_CMD $JAVA_OPTS" +export JAVA_HOME=/opt/java/sdk/current +export JAVA_CMD=$JAVA_HOME/bin/java +export JAVA_OPTS="-ms32m -mx256m" +export JAVA="$JAVA_CMD $JAVA_OPTS" -( - -$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven-plugins.vm - -) 2>&1 | tee $HOME/repository-staging/to-ibiblio/reports/plugins/plugin-issues.txt +$JAVA -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven-plugins.vm > maven-plugins.txt
svn commit: r635699 - /maven/sandbox/trunk/shared/reports/maven-plugins.bat
Author: dennisl Date: Mon Mar 10 14:25:14 2008 New Revision: 635699 URL: http://svn.apache.org/viewvc?rev=635699&view=rev Log: o Add a script for Windows. Added: maven/sandbox/trunk/shared/reports/maven-plugins.bat (with props) Added: maven/sandbox/trunk/shared/reports/maven-plugins.bat URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/reports/maven-plugins.bat?rev=635699&view=auto == --- maven/sandbox/trunk/shared/reports/maven-plugins.bat (added) +++ maven/sandbox/trunk/shared/reports/maven-plugins.bat Mon Mar 10 14:25:14 2008 @@ -0,0 +1,2 @@ [EMAIL PROTECTED] Please hold on, while I fetch issues from JIRA. [EMAIL PROTECTED] -jar swizzle-jirareport-1.2.1-SNAPSHOT-dep.jar maven-plugins.vm > maven-plugins.txt Propchange: maven/sandbox/trunk/shared/reports/maven-plugins.bat -- svn:eol-style = native
svn commit: r635711 - in /maven/archetype/trunk: archetype-common/src/main/java/org/apache/maven/archetype/common/ archetype-common/src/main/java/org/apache/maven/archetype/creator/ archetype-plugin/s
Author: rafale
Date: Mon Mar 10 14:55:19 2008
New Revision: 635711
URL: http://svn.apache.org/viewvc?rev=635711&view=rev
Log:
FilteredExtensions and languages can now be defined in the property file
defnied by -Darchetype.properties.
This nearly fix the ARCHETYPE-112 issue
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeCreationConfigurator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java?rev=635711&r1=635710&r2=635711&view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
Mon Mar 10 14:55:19 2008
@@ -44,6 +44,10 @@
String ARTIFACT_ID = "artifactId";
+String ARCHETYPE_FILTERED_EXTENSIONS = "archetype.filteredExtensions";
+
+String ARCHETYPE_LANGUAGES = "archetype.languages";
+
List DEFAULT_FILTERED_EXTENSIONS =
Arrays.asList(
new String[]
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=635711&r1=635710&r2=635711&view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
Mon Mar 10 14:55:19 2008
@@ -45,7 +45,7 @@
extends AbstractLogEnabled
implements ArchetypeRegistryManager
{
-private static File DEFAULT_REGISTRY = new File( System.getProperty(
"user.home" ), ".m2/archetype.xml" );
+//private static File DEFAULT_REGISTRY = new File( System.getProperty(
"user.home" ), ".m2/archetype.xml" );
/**
* Used to create ArtifactRepository objects given the urls of the remote
repositories.
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=635711&r1=635710&r2=635711&view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Mon Mar 10 14:55:19 2008
@@ -84,8 +84,8 @@
/** @plexus.requirement */
private PomManager pomManager;
-/** @plexus.requirement */
-private ArchetypeRegistryManager archetypeRegistryManager;
+///** @plexus.requirement */
+//private ArchetypeRegistryManager archetypeRegistryManager;
/** @plexus.requirement */
private MavenProjectBuilder projectBuilder;
@@ -95,7 +95,7 @@
{
MavenProject project = request.getProject();
-File propertyFile = request.getPropertyFile();
+//File propertyFile = request.getPropertyFile();
List languages = request.getLanguages();
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=635711&r1=635710&r2=635711&view=diff
=
svn commit: r635721 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
Author: brianf
Date: Mon Mar 10 15:09:11 2008
New Revision: 635721
URL: http://svn.apache.org/viewvc?rev=635721&view=rev
Log:
work around windows issues
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java?rev=635721&r1=635720&r2=635721&view=diff
==
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
(original)
+++
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
Mon Mar 10 15:09:11 2008
@@ -4,10 +4,15 @@
*/
package org.apache.maven.it.util;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.zip.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
/* @todo this can be replaced with plexus-archiver */
@@ -15,9 +20,24 @@
public static File simpleExtractResources(Class cl, String resourcePath)
throws IOException {
String tempDirPath = System.getProperty( "maven.test.tmpdir",
System.getProperty( "java.io.tmpdir" ) );
-File tempDir = new File(tempDirPath);
+File tempDir = null;
+if (Os.isFamily( "windows" ))
+{
+ //there are issues deleting on windows. use a random path.
+tempDir = new File(tempDirPath,""+ Math.round(
Math.random()*1 ));
+}
+else
+{
+tempDir = new File(tempDirPath);
+}
+
File testDir = new File( tempDir, resourcePath );
-FileUtils.deleteDirectory( testDir );
+
+if (!Os.isFamily( "windows" ))
+{
+FileUtils.deleteDirectory( testDir );
+}
+
testDir = ResourceExtractor.extractResourcePath(cl, resourcePath,
tempDir, false);
return testDir;
}
svn commit: r635725 - in /maven/shared/trunk/maven-model-converter/src: main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java test/java/org/apache/maven/model/converter/plugins/PCCJavadoc
Author: dennisl
Date: Mon Mar 10 15:14:29 2008
New Revision: 635725
URL: http://svn.apache.org/viewvc?rev=635725&view=rev
Log:
[MONE-23] one:convert kept a,b,c vs making
abc
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java?rev=635725&r1=635724&r2=635725&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
Mon Mar 10 15:14:29 2008
@@ -79,7 +79,21 @@
addConfigurationChild( configuration, "isOffline",
PropertyUtils.invertBoolean( online ) );
}
-addConfigurationChild( configuration, projectProperties,
"maven.javadoc.links", "links" );
+String links = projectProperties.getProperty( "maven.javadoc.links" );
+if ( links != null )
+{
+StringTokenizer tokenizer = new StringTokenizer( links, " ," );
+if ( tokenizer.hasMoreTokens() )
+{
+Xpp3Dom linksConfiguration = new Xpp3Dom( "links" );
+while ( tokenizer.hasMoreTokens() )
+{
+String link = tokenizer.nextToken();
+addConfigurationChild( linksConfiguration, "link", link );
+}
+configuration.addChild( linksConfiguration );
+}
+}
addConfigurationChild( configuration, projectProperties,
"maven.javadoc.locale", "locale" );
Modified:
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java?rev=635725&r1=635724&r2=635725&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCJavadocTest.java
Mon Mar 10 15:14:29 2008
@@ -87,8 +87,24 @@
value = configuration.getChild( "isOffline" ).getValue();
Assert.assertEquals( "check isOffline value", "false", value );
-value = configuration.getChild( "links" ).getValue();
-Assert.assertEquals( "check links value",
"http://java.sun.com/j2se/1.4/docs/api/";, value );
+Xpp3Dom links = configuration.getChild( "links" );
+if ( links.getChildCount() == 2 )
+{
+Xpp3Dom tagOne = links.getChild( 0 );
+
+value = tagOne.getValue();
+Assert.assertEquals( "check links/link value",
"http://java.sun.com/j2se/1.4/docs/api/";, value );
+
+Xpp3Dom tagTwo = links.getChild( 1 );
+
+value = tagTwo.getValue();
+Assert.assertEquals( "check links/link value",
"http://java.sun.com/j2ee/sdk_1.3/techdocs/api/";,
+ value );
+}
+else
+{
+Assert.fail( "Wrong number of link elements" );
+}
value = configuration.getChild( "locale" ).getValue();
Assert.assertEquals( "check locale value", "en_US", value );
Modified:
maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties?rev=635725&r1=635724&r2=635725&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
(original)
+++
maven/shared/trunk/maven-model-converter/src/test/resources/PCCJavadocTest1.properties
Mon Mar 10 15:14:29 2008
@@ -40,7 +40,7 @@
maven.javadoc.excludepackagenames=org.apache.internal,org.apache.test
maven.javadoc.footer=The footer
maven.javadoc.header=The header
-maven.javadoc.links=http://java.sun.com/j2se/1.4/docs/api/
+maven.javadoc.links=http://java.sun.com/j2se/1.4/docs/api/,
http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
maven.javadoc.locale=en_US
maven
svn commit: r635728 - /maven/plugins/trunk/maven-one-plugin/pom.xml
Author: dennisl Date: Mon Mar 10 15:21:26 2008 New Revision: 635728 URL: http://svn.apache.org/viewvc?rev=635728&view=rev Log: o Use latest version of maven-model-converter. Modified: maven/plugins/trunk/maven-one-plugin/pom.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?rev=635728&r1=635727&r2=635728&view=diff == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Mon Mar 10 15:21:26 2008 @@ -35,6 +35,7 @@ JIRA http://jira.codehaus.org/browse/MONE + @@ -87,6 +88,7 @@ http://mail-archives.apache.org/mod_mbox/maven-notifications/ + org.apache.maven @@ -117,7 +119,7 @@ org.apache.maven.shared maven-model-converter - 2.2 + 2.3-SNAPSHOT org.apache.maven @@ -130,6 +132,7 @@ 1.0.4 +
svn commit: r635742 - /maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
Author: dennisl
Date: Mon Mar 10 15:39:44 2008
New Revision: 635742
URL: http://svn.apache.org/viewvc?rev=635742&view=rev
Log:
[MONE-24] one:convert puts javadoc-plugin in build/plugins vs reporting/plugins
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java?rev=635742&r1=635741&r2=635742&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
Mon Mar 10 15:39:44 2008
@@ -46,7 +46,7 @@
public String getType()
{
-return TYPE_BUILD_PLUGIN;
+return TYPE_REPORT_PLUGIN;
}
protected void buildConfiguration( Xpp3Dom configuration,
org.apache.maven.model.v3_0_0.Model v3Model,
svn commit: r635744 - /maven/shared/trunk/maven-model-converter/pom.xml
Author: dennisl Date: Mon Mar 10 15:44:15 2008 New Revision: 635744 URL: http://svn.apache.org/viewvc?rev=635744&view=rev Log: o Add used but undeclared dependencies. Modified: maven/shared/trunk/maven-model-converter/pom.xml Modified: maven/shared/trunk/maven-model-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/pom.xml?rev=635744&r1=635743&r2=635744&view=diff == --- maven/shared/trunk/maven-model-converter/pom.xml (original) +++ maven/shared/trunk/maven-model-converter/pom.xml Mon Mar 10 15:44:15 2008 @@ -28,6 +28,7 @@ 2.3-SNAPSHOT Maven Model Converter Converts between version 3.0.0 and version 4.0.0 models. + org.apache.maven @@ -54,7 +55,14 @@ dom4j 1.4 + + junit + junit + 3.8.1 + test + + @@ -70,6 +78,7 @@ + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter
svn commit: r635758 - in /maven/shared/trunk/src: ./ site/ site/site.xml
Author: dennisl Date: Mon Mar 10 16:27:48 2008 New Revision: 635758 URL: http://svn.apache.org/viewvc?rev=635758&view=rev Log: o Add a shared site.xml with common links. Added: maven/shared/trunk/src/ maven/shared/trunk/src/site/ maven/shared/trunk/src/site/site.xml (with props) Added: maven/shared/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/src/site/site.xml?rev=635758&view=auto == --- maven/shared/trunk/src/site/site.xml (added) +++ maven/shared/trunk/src/site/site.xml Mon Mar 10 16:27:48 2008 @@ -0,0 +1,37 @@ + + + + + + + + + http://www.apache.org/"/> + http://maven.apache.org/maven-1.x"/> + http://maven.apache.org/"/> + http://maven.apache.org/plugins/"/> + http://maven.apache.org/continuum"/> + http://maven.apache.org/scm"/> + http://maven.apache.org/wagon"/> + http://maven.apache.org/jxr"/> + http://maven.apache.org/doxia"/> + + + Propchange: maven/shared/trunk/src/site/site.xml -- svn:eol-style = native
svn commit: r635760 - /maven/shared/trunk/maven-model-converter/pom.xml
Author: dennisl Date: Mon Mar 10 16:32:12 2008 New Revision: 635760 URL: http://svn.apache.org/viewvc?rev=635760&view=rev Log: o Use the latest parent. Modified: maven/shared/trunk/maven-model-converter/pom.xml Modified: maven/shared/trunk/maven-model-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/pom.xml?rev=635760&r1=635759&r2=635760&view=diff == --- maven/shared/trunk/maven-model-converter/pom.xml (original) +++ maven/shared/trunk/maven-model-converter/pom.xml Mon Mar 10 16:32:12 2008 @@ -22,7 +22,7 @@ org.apache.maven.shared maven-shared-components -7 +9-SNAPSHOT maven-model-converter 2.3-SNAPSHOT
svn commit: r635761 - in /maven/shared/trunk/maven-model-converter/src/site: ./ apt/ apt/index.apt site.xml
Author: dennisl
Date: Mon Mar 10 16:33:41 2008
New Revision: 635761
URL: http://svn.apache.org/viewvc?rev=635761&view=rev
Log:
o Add a site.
Added:
maven/shared/trunk/maven-model-converter/src/site/
maven/shared/trunk/maven-model-converter/src/site/apt/
maven/shared/trunk/maven-model-converter/src/site/apt/index.apt (with
props)
maven/shared/trunk/maven-model-converter/src/site/site.xml (with props)
Added: maven/shared/trunk/maven-model-converter/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/site/apt/index.apt?rev=635761&view=auto
==
--- maven/shared/trunk/maven-model-converter/src/site/apt/index.apt (added)
+++ maven/shared/trunk/maven-model-converter/src/site/apt/index.apt Mon Mar 10
16:33:41 2008
@@ -0,0 +1,78 @@
+ --
+ Introduction
+ --
+ Dennis Lundberg
+ --
+ 2008-03-11
+ --
+
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Maven Model Converter
+
+ This shared component is used to convert Maven POMs between version 3
+ (used by Maven 1.x) and version 4 (used by Maven 2.0). It is used by
+ {{{http://maven.apache.org/plugins/maven-one-plugin/}maven-one-plugin}} and
+ {{{http://maven.apache.org/archiva/}Archiva}}.
+
+ Apart from the main conversion of the different elements in the pom, there
+ are a couple of extensions to handle plugins and their configurations.
+ Which plugins are avaliable and how they are configured is not specified in
+ the xml schema for version 4 POMs. The schema only has generic definitions
+ for plugins and it allows them to have a configuration.
+
+
+* Plugin Configuration Converters
+
+ In Maven 1 a plugin is configured in the file <<>>. In
+ Maven 2 on the other hand the configuration is done with xml elements within
+ the plugin's <<<\>>> element. The conversion between the two
+ is handled by Plexus components that implement the
+ <<>>
+ interface.
+
+ This interface has one main method <<>> that takes
+ a Maven 1 model, a Maven 2 model and a Maven 1 <<>> object as
+ parameters. If you want to add a new plugin configuration converter it is
+ recommended that you extend <<>>. Have
+ a look at some of
+
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/}the
other implementations}}
+ to get a feel for what is needed. You basically need to implement the method
+ <<>> to build a DOM configuration object.
+
+
+* Plugin Relocators
+
+ Another thing that needs to be taken care of, is that the plugins in Maven 2
+ are not the same as they were in Maven 1. Some have changed names while
+ others have moved to other projects completely. This relocation of plugins is
+ handled by Plexus components that implement the
+ <<>>
+ interface.
+
+ If you want to implement a new relocator you can extend the class
+ <<>> to make your work easier. You simply need to
+ specify the old and new groupId and artifactId. Read the
+
{{{apidocs/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.html}Javadocs}}
+ for some important notes. You can also save yourself some work by studying
+
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/}the
other implementations}}
+ and picking the best from them.
Propchange: maven/shared/trunk/maven-model-converter/src/site/apt/index.apt
--
svn:eol-style = native
Added: maven/shared/trunk/maven-model-converter/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/site/site.xml?rev=635761&view=auto
==
--- maven/shared/trunk/maven-model-converter/src/site/site.xml (added)
+++ maven/shared/trunk/maven-model-converter/src/site/site.xml Mon Mar 10
16:33:41 2008
@@ -0,0 +1,26 @@
+
+
+
+
+
svn commit: r635762 - in /maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter: ./ plugins/ relocators/
Author: dennisl
Date: Mon Mar 10 16:44:31 2008
New Revision: 635762
URL: http://svn.apache.org/viewvc?rev=635762&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java?rev=635762&r1=635761&r2=635762&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
Mon Mar 10 16:44:31 2008
@@ -28,14 +28,14 @@
*/
public interface ArtifactPomRewriter
{
-public static final String ROLE = ArtifactPomRewriter.class.getName();
+String ROLE = ArtifactPomRewriter.class.getName();
-public static final String V3_POM = "v3";
+String V3_POM = "v3";
-public static final String V4_POM = "v4";
+String V4_POM = "v4";
-public void rewrite( Reader from, Writer to, boolean reportOnly, String
groupId, String artifactId, String version,
- String packaging )
+void rewrite( Reader from, Writer to, boolean reportOnly, String groupId,
String artifactId, String version,
+ String packaging )
throws Exception;
List getWarnings();
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java?rev=635762&r1=635761&r2=635762&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
Mon Mar 10 16:44:31 2008
@@ -1,11 +1,5 @@
package org.apache.maven.model.converter;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.ReportPlugin;
-
-import java.util.Iterator;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +18,12 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+
+import java.util.Iterator;
/**
* Utility class which features various methods associated with Maven model.
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java?rev=635762&r1=635761&r2=635762&view=diff
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
Mon Mar 10 16:44:31 2008
@@ -82,7 +82,7 @@
// Compare values
int answer;
answer = plugin1.getGroupId().compareTo( plugin2.getGroupId() );
-if( answer == 0)
+if ( answer == 0 )
{
answer = compareArtifactId( plugin1, plugin2 );
}
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java?rev=635762&r1=635761&r2=635762&view=diff
svn commit: r635774 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: brianf
Date: Mon Mar 10 18:30:38 2008
New Revision: 635774
URL: http://svn.apache.org/viewvc?rev=635774&view=rev
Log:
MNG-3454: note referring to the issue
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=635774&r1=635773&r2=635774&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Mon Mar 10 18:30:38 2008
@@ -160,6 +160,7 @@
}
if ( relocation.getVersion() != null )
{
+//note: see MNG-3454. This causes a problem, but
fixing it may break more.
artifact.setVersionRange(
VersionRange.createFromVersion( relocation.getVersion() ) );
}
svn commit: r635796 [7/7] - in /maven/sandbox/trunk/archiva/archiva-jarinfo: ./ archiva-jarinfo-bundles/ archiva-jarinfo-cli/ archiva-jarinfo-cli/src/ archiva-jarinfo-cli/src/assembly/ archiva-jarinfo
Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/archiva-jarinfo-lib/src/test/resources/mystery.jar-details.xml -- svn:eol-style = native Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/archiva-jarinfo-lib/src/test/resources/mystery.jar-details.xml -- svn:keywords = "Author Date Id Revision" Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/archiva-jarinfo-lib/src/test/resources/mystery.jar-details.xml -- svn:mime-type = text/xml Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/archiva-jarinfo-lucene/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 10 21:07:17 2008 @@ -0,0 +1,21 @@ +target +*~ +.*.swp +*.log +*.patch +*.diff +*.ipr +*.iws +*.iml +.classpath +.project +.settings +.m2eclipse +.wtpmodules +.xdoclet +*.ipr +*.iws +*.iml +CVS +cobertura.ser +jcoverage.ser Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/archiva-jarinfo-maven-plugin/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 10 21:07:17 2008 @@ -0,0 +1,21 @@ +target +*~ +.*.swp +*.log +*.patch +*.diff +*.ipr +*.iws +*.iml +.classpath +.project +.settings +.m2eclipse +.wtpmodules +.xdoclet +*.ipr +*.iws +*.iml +CVS +cobertura.ser +jcoverage.ser Added: maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml?rev=635796&view=auto == --- maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml (added) +++ maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml Mon Mar 10 21:07:17 2008 @@ -0,0 +1,74 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + org.apache.maven.archiva + archiva-jarinfo-parent + Archiva Jar Info :: Parent + 1.0-SNAPSHOT + + pom + + + + localhost.archiva + dav:http://localhost:9091/repository/snapshots + + + + + + +maven-compiler-plugin + + 1.5 + 1.5 + + + + + +org.apache.maven.wagon +wagon-webdav +1.0-beta-2 + + + + + + + + junit + junit + 3.8.1 + test + + + xmlunit + xmlunit + 1.1 + test + + + + +archiva-jarinfo-lib +archiva-jarinfo-cli + + + + Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml -- svn:eol-style = native Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml -- svn:keywords = "Author Date Id Revision" Propchange: maven/sandbox/trunk/archiva/archiva-jarinfo/pom.xml -- svn:mime-type = text/xml Added: maven/sandbox/trunk/archiva/archiva-jarinfo/src/site/apt/features.apt URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archiva/archiva-jarinfo/src/site/apt/features.apt?rev=635796&view=auto == --- maven/sandbox/trunk/archiva/archiva-jarinfo/src/site/apt/features.apt (added) +++ maven/sandbox/trunk/archiva/archiva-jarinfo/src/site/apt/features.apt Mon Mar 10 21:07:17 2008 @@ -0,0 +1,61 @@ + -- + Features + -- + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + +Features of Archiva JarInfo + +# Analyze Jar +## Identification of ids by jar file contents / name. +## Weighted Identification System. +# Create jarinfo file (xml of analyze info) +# Make
