You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by qu...@apache.org on 2015/06/01 00:19:08 UTC
[26/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Got rid of some Class-Loading issues when
using the EventSpy from within .mvn/extensions.xml
- Got rid of some Class-Loading issues when using the EventSpy from within .mvn/extensions.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/29eeb02e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/29eeb02e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/29eeb02e
Branch: refs/heads/as3httpclient-work
Commit: 29eeb02e3a491d7be4999482074d415b18b860cd
Parents: bfe6ba9
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Apr 19 13:03:33 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Apr 19 13:03:33 2015 +0200
----------------------------------------------------------------------
.../converter/mavenextension/FlexEventSpy.java | 31 ++++++++------------
mavenizer/retrievers/base/pom.xml | 6 ++--
.../converter/retrievers/utils/ProgressBar.java | 2 +-
3 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
index f275677..f6d5c4f 100644
--- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
+++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java
@@ -99,27 +99,20 @@ public class FlexEventSpy extends AbstractEventSpy {
protected boolean canResolve(String groupId, String artifactId, String version,
String type, String classifier) {
- org.apache.maven.artifact.Artifact artifact;
- if((classifier == null) || (classifier.length() == 0)) {
- artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
- } else {
- artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
- }
- if (!artifact.isResolved()) {
- try {
- ArtifactResolutionRequest req = new ArtifactResolutionRequest();
- req.setArtifact(artifact);
- req.setLocalRepository(mavenSession.getLocalRepository());
- req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
- ArtifactResolutionResult res = repositorySystem.resolve(req);
- if (!res.isSuccess()) {
- return false;
- }
- } catch (Exception e) {
- return false;
+ try {
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setLocalRepository(mavenSession.getLocalRepository());
+ req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ if((classifier == null) || (classifier.length() == 0)) {
+ req.setArtifact(repositorySystem.createArtifact(groupId, artifactId, version, type));
+ } else {
+ req.setArtifact(repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier));
}
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ return res.isSuccess();
+ } catch (Exception e) {
+ return false;
}
- return true;
}
protected void initFlex(String version) throws MavenExecutionException {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml
index f311a65..507ee13 100644
--- a/mavenizer/retrievers/base/pom.xml
+++ b/mavenizer/retrievers/base/pom.xml
@@ -42,9 +42,9 @@
<version>1.8.1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
----------------------------------------------------------------------
diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
index 8e91864..72ee855 100644
--- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
+++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java
@@ -16,7 +16,7 @@
*/
package org.apache.flex.utilities.converter.retrievers.utils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Created by cdutz on 24.05.2014.