Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
b1bf499a
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1bf499a
编写于
10月 11, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Dependencies model
Former-commit-id:
68e3d992
上级
347d2076
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
3 deletion
+10
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDependencies.java
...org/jkiss/dbeaver/registry/driver/DriverDependencies.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
...rg/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
+6
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDependencies.java
浏览文件 @
b1bf499a
...
...
@@ -52,6 +52,7 @@ public class DriverDependencies implements DBPDriverDependencies
libraryList
.
clear
();
libraryList
.
addAll
(
libMap
.
values
());
/*
{
StringBuilder sb = new StringBuilder();
Set<String> ns = new TreeSet<>();
...
...
@@ -72,12 +73,14 @@ public class DriverDependencies implements DBPDriverDependencies
dumpNode(node, 0);
}
}
*/
}
}
catch
(
IOException
e
)
{
throw
new
DBException
(
"IO error while resolving dependencies"
,
e
);
}
}
/*
private void dumpNode(DependencyNode node, int level) {
if (node.duplicate) {
return;
...
...
@@ -88,6 +91,7 @@ public class DriverDependencies implements DBPDriverDependencies
dumpNode(child, level + 1);
}
}
*/
private
void
resolveDependencies
(
DBRProgressMonitor
monitor
,
DependencyNode
ownerNode
,
Map
<
String
,
DBPDriverLibrary
>
libMap
)
throws
IOException
{
Collection
<?
extends
DBPDriverLibrary
>
dependencies
=
ownerNode
.
library
.
getDependencies
(
monitor
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
浏览文件 @
b1bf499a
...
...
@@ -236,13 +236,13 @@ public class MavenArtifactVersion {
Element
dependenciesElement
=
XMLUtils
.
getChildElement
(
element
,
"dependencies"
);
if
(
dependenciesElement
!=
null
)
{
for
(
Element
dep
:
XMLUtils
.
getChildElementList
(
dependenciesElement
,
"dependency"
))
{
String
groupId
=
XMLUtils
.
getChildElementBody
(
dep
,
"groupId"
);
String
artifactId
=
XMLUtils
.
getChildElementBody
(
dep
,
"artifactId"
);
String
groupId
=
evaluateString
(
XMLUtils
.
getChildElementBody
(
dep
,
"groupId"
)
);
String
artifactId
=
evaluateString
(
XMLUtils
.
getChildElementBody
(
dep
,
"artifactId"
)
);
if
(
groupId
==
null
||
artifactId
==
null
)
{
log
.
warn
(
"Broken dependency reference: "
+
groupId
+
":"
+
artifactId
);
continue
;
}
String
version
=
XMLUtils
.
getChildElementBody
(
dep
,
"version"
);
String
version
=
evaluateString
(
XMLUtils
.
getChildElementBody
(
dep
,
"version"
)
);
if
(
version
==
null
)
{
version
=
findDependencyVersion
(
monitor
,
groupId
,
artifactId
);
}
...
...
@@ -308,6 +308,9 @@ public class MavenArtifactVersion {
}
private
String
evaluateString
(
String
value
)
{
if
(
value
==
null
)
{
return
null
;
}
return
GeneralUtils
.
replaceVariables
(
value
,
variableResolver
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录