diff options
author | Olivier Lamy <olamy@apache.org> | 2012-02-26 09:07:03 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-02-26 09:07:03 +0000 |
commit | 497409737940fadbc66d85d06905658407a25c9a (patch) | |
tree | b35979a36308399daf704346c1aaa6cfab6ef080 /archiva-modules/plugins/maven2-repository/src/main | |
parent | 5fbb07bdb4056b3dd7cf165b4f475033f3ebf0ac (diff) | |
download | archiva-497409737940fadbc66d85d06905658407a25c9a.tar.gz archiva-497409737940fadbc66d85d06905658407a25c9a.zip |
[MRM-1607] maven model build failed when model have jdk profile activation.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293788 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins/maven2-repository/src/main')
-rw-r--r-- | archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index ed7d93086..4e70d48f5 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -226,6 +226,12 @@ public class Maven2RepositoryStorage .setTwoPhaseBuilding( false ) .setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL ); + + //MRM-1607. olamy this will resolve jdk profiles on the current running archiva jvm + req.setSystemProperties( System.getProperties() ); + + + // MRM-1411 req.setModelResolver( new RepositoryModelResolver( basedir, pathTranslator, wagonFactory, remoteRepositories, networkProxies, |