mirror of https://github.com/apache/ant-ivy
IVY-1566 - Store External form of URL in cached files
This closes #59 pull request at github/apache/ant-ivy repo
This commit is contained in:
parent
b691f81b48
commit
0cdcb1fd8d
|
|
@ -69,6 +69,7 @@ For details about the following changes, check our JIRA install at link:https://
|
|||
- FIX: HTTP issue: Basic authentication is stuck in 401 loop (jira:IVY-1336[])
|
||||
- FIX: command line: -types seems to not accept comma [jira:IVY-1355[]]
|
||||
- FIX: Mixed use of symlinks leads to cache corruption [jira:IVY-1498[]] (Thanks to Stephen Haberman)
|
||||
- FIX: Some cached location are badly stored which results in MalformedURLException [jira:IVY-1566[]] (Thanks to Aurélien Pupier)
|
||||
|
||||
- IMPROVEMENT: Throw an IllegalStateException when retrieving the resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or IvySettings) is not set (jira:IVY-1482[])
|
||||
- IMPROVEMENT: Optimization: limit the revision numbers scanned if revision prefix is specified (Thanks to Ernestas Vaiciukevičius)
|
||||
|
|
@ -240,3 +241,5 @@ Here is the list of people who have contributed source code and documentation up
|
|||
* Sven Zethelius
|
||||
* Aleksey Zhukov
|
||||
* Zhong Wang
|
||||
* Aurélien Pupier
|
||||
|
||||
|
|
|
|||
|
|
@ -1452,10 +1452,15 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
|
|||
}
|
||||
|
||||
private ArtifactOrigin getDefaultMetadataArtifactOrigin(ModuleRevisionId mrid) {
|
||||
final String location;
|
||||
try {
|
||||
location = this.getIvyFileInCache(mrid).toURI().toURL().toExternalForm();
|
||||
} catch (MalformedURLException e) {
|
||||
throw new RuntimeException("Failed to determine artifact origin for " + mrid);
|
||||
}
|
||||
// it's important to say the origin is not local to make sure it won't ever be used for
|
||||
// anything else than original token
|
||||
return new ArtifactOrigin(DefaultArtifact.newIvyArtifact(mrid, null), false,
|
||||
getIvyFileInCache(mrid).getPath());
|
||||
return new ArtifactOrigin(DefaultArtifact.newIvyArtifact(mrid, null), false, location);
|
||||
}
|
||||
|
||||
private Artifact getDefaultMetadataArtifact(ModuleRevisionId mrid) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue