diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenConstants.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenConstants.java index dea93b30002e..6ba71e747aa1 100644 --- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenConstants.java +++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,9 @@ public class MavenConstants { public static final String TYPE_WAR = "war"; public static final String SCOPE_COMPILE = "compile"; - public static final String SCOPE_PROVIDEED = "provided"; + public static final String SCOPE_PROVIDED = "provided"; + /* @deprecated to remove in IDEA 14 */ + @SuppressWarnings({"UnusedDeclaration", "SpellCheckingInspection"}) public static final String SCOPE_PROVIDEED = SCOPE_PROVIDED; public static final String SCOPE_RUNTIME = "runtime"; public static final String SCOPE_TEST = "test"; public static final String SCOPE_SYSTEM = "system"; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java index cd9ab2ad04d5..553175e5a07e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -317,7 +317,7 @@ public class MavenModuleImporter { public static DependencyScope selectScope(String mavenScope) { if (MavenConstants.SCOPE_RUNTIME.equals(mavenScope)) return DependencyScope.RUNTIME; if (MavenConstants.SCOPE_TEST.equals(mavenScope)) return DependencyScope.TEST; - if (MavenConstants.SCOPE_PROVIDEED.equals(mavenScope)) return DependencyScope.PROVIDED; + if (MavenConstants.SCOPE_PROVIDED.equals(mavenScope)) return DependencyScope.PROVIDED; return DependencyScope.COMPILE; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java index 3d817b51da1e..ed52f6a43891 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -529,7 +529,7 @@ public class MavenProject { return null; } - + @NotNull public String getOutputDirectory() { return myState.myOutputDirectory; @@ -803,7 +803,7 @@ public class MavenProject { @NotNull public Set getSupportedDependencyScopes() { Set result = new THashSet(Arrays.asList(MavenConstants.SCOPE_COMPILE, - MavenConstants.SCOPE_PROVIDEED, + MavenConstants.SCOPE_PROVIDED, MavenConstants.SCOPE_RUNTIME, MavenConstants.SCOPE_TEST, MavenConstants.SCOPE_SYSTEM));