You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/06/13 06:10:48 UTC
zeppelin git commit: [ZEPPELIN-792]Misspelt words and Wrong method
parameters
Repository: zeppelin
Updated Branches:
refs/heads/master ccd8a49ac -> 873fa8650
[ZEPPELIN-792]Misspelt words and Wrong method parameters
### What is this PR for?
Fix misspelt words and wrong method parameter on zeppelin-interpreter
https://issues.apache.org/jira/browse/ZEPPELIN-792
### What type of PR is it?
Bug Fix
### Todos
* [x] - Fix misspelt variable
* [x] - Fix wrong method parameter
### What is the Jira issue?
* [ZEPPELIN-792](https://issues.apache.org/jira/browse/ZEPPELIN-792)
### How should this be tested?
1. Edit Interpreter dep package
2. Run DependencyResolverTest
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: haden.kim <ha...@daumkakao.com>
Author: Rusty Phillips <ru...@cloudspace.com>
Closes #817 from zuny25/feature/InterpreterDependency and squashes the following commits:
d174f1c [haden.kim] Method Usage Fix
d1e6da3 [Rusty Phillips] errata classpathFlter -> classpathFilter
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/873fa865
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/873fa865
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/873fa865
Branch: refs/heads/master
Commit: 873fa8650072ae05ceb58d39b11e30aabc1248c5
Parents: ccd8a49
Author: haden.kim <ha...@daumkakao.com>
Authored: Wed Apr 6 11:18:36 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Mon Jun 13 15:10:34 2016 +0900
----------------------------------------------------------------------
.../org/apache/zeppelin/dep/AbstractDependencyResolver.java | 8 ++++----
.../main/java/org/apache/zeppelin/dep/DependencyContext.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/873fa865/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java
index f2f3baa..b22941e 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java
@@ -52,8 +52,8 @@ public abstract class AbstractDependencyResolver {
synchronized (repos) {
delRepo(id);
RemoteRepository rr = new RemoteRepository(id, "default", url);
- rr.setPolicy(true, new RepositoryPolicy(
- snapshot,
+ rr.setPolicy(snapshot, new RepositoryPolicy(
+ true,
RepositoryPolicy.UPDATE_POLICY_DAILY,
RepositoryPolicy.CHECKSUM_POLICY_WARN));
repos.add(rr);
@@ -64,8 +64,8 @@ public abstract class AbstractDependencyResolver {
synchronized (repos) {
delRepo(id);
RemoteRepository rr = new RemoteRepository(id, "default", url);
- rr.setPolicy(true, new RepositoryPolicy(
- snapshot,
+ rr.setPolicy(snapshot, new RepositoryPolicy(
+ true,
RepositoryPolicy.UPDATE_POLICY_DAILY,
RepositoryPolicy.CHECKSUM_POLICY_WARN));
rr.setAuthentication(auth);
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/873fa865/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java
index a320810..d9df994 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java
@@ -115,7 +115,7 @@ public class DependencyContext {
throws DependencyResolutionException, ArtifactResolutionException {
Artifact artifact = new DefaultArtifact(dep.getGroupArtifactVersion());
- DependencyFilter classpathFlter = DependencyFilterUtils
+ DependencyFilter classpathFilter = DependencyFilterUtils
.classpathFilter(JavaScopes.COMPILE);
PatternExclusionsDependencyFilter exclusionFilter = new PatternExclusionsDependencyFilter(
dep.getExclusions());
@@ -133,7 +133,7 @@ public class DependencyContext {
}
DependencyRequest dependencyRequest = new DependencyRequest(collectRequest,
- DependencyFilterUtils.andFilter(exclusionFilter, classpathFlter));
+ DependencyFilterUtils.andFilter(exclusionFilter, classpathFilter));
return system.resolveDependencies(session, dependencyRequest).getArtifactResults();
}