Merge remote-tracking branch 'origin/devel' into devel

6ea53dfe · serge-rider · 89b611e5 · 298d2e3b · 6ea53dfe
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java ...rg/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java +5 -1

未找到文件。
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
@@ -424,7 +424,11 @@ public class MavenArtifactVersion implements IMavenIdentifier {
                MavenArtifactDependency.Scope scope = null;
                String scopeName = XMLUtils.getChildElementBody(dep, "scope");
                if (!CommonUtils.isEmpty(scopeName)) {
-                    scope = MavenArtifactDependency.Scope.valueOf(scopeName.toUpperCase(Locale.ENGLISH));
+                    try {
+                        scope = MavenArtifactDependency.Scope.valueOf(scopeName.toUpperCase(Locale.ENGLISH));
+                    } catch (IllegalArgumentException e) {
+                        log.debug("Bad artifact '" + getArtifactId() + "' scope: " + scopeName);
+                    }
                }
                if (scope == null && dmInfo != null) {
                    scope = dmInfo.getScope();