diff --git a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml --- a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml +++ b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml @@ -62,7 +62,7 @@ maven-pom http://ftp.ing.umu.se/mirror/eclipse/rt/eclipselink/maven.repo/org/eclipse/persistence/eclipselink/2.1.0-RC1/eclipselink-2.1.0-RC1.pom - http://ftp.ing.umu.se/mirror/eclipse/rt/eclipselink/maven.repo/org/eclipse/persistence/org.eclipse.persistence.jpa.modelgen/2.1.0-RC1/org.eclipse.persistence.jpa.modelgen-2.1.0-RC1.pom + http://ftp.ing.umu.se/mirror/eclipse/rt/eclipselink/maven.repo/org/eclipse/persistence/org.eclipse.persistence.jpa.modelgen.processor/2.1.0-RC1/org.eclipse.persistence.jpa.modelgen.processor-2.1.0-RC1.pom http://ftp.ing.umu.se/mirror/eclipse/rt/eclipselink/maven.repo/org/eclipse/persistence/javax.persistence/2.0.0/javax.persistence-2.0.0.pom diff --git a/maven/src/org/netbeans/modules/maven/CPExtender.java b/maven/src/org/netbeans/modules/maven/CPExtender.java --- a/maven/src/org/netbeans/modules/maven/CPExtender.java +++ b/maven/src/org/netbeans/modules/maven/CPExtender.java @@ -64,6 +64,7 @@ import org.netbeans.modules.maven.indexer.api.RepositoryQueries; import org.netbeans.modules.maven.api.NbMavenProject; import org.netbeans.api.java.classpath.ClassPath; +import org.netbeans.api.java.classpath.JavaClassPathConstants; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; @@ -281,11 +282,13 @@ return grps.toArray(new SourceGroup[0]); } + @Override public String[] getExtensibleClassPathTypes(SourceGroup arg0) { return new String[] { ClassPath.COMPILE, ClassPath.EXECUTE, - CLASSPATH_COMPILE_ONLY + CLASSPATH_COMPILE_ONLY, + JavaClassPathConstants.PROCESSOR_PATH }; } @@ -298,7 +301,8 @@ if (MavenSourcesImpl.NAME_TESTSOURCE.equals(name)) { scope = "test"; //NOI18N } - if (scope == null && CLASSPATH_COMPILE_ONLY.equals(type)) { + if (scope == null && + (CLASSPATH_COMPILE_ONLY.equals(type) || JavaClassPathConstants.PROCESSOR_PATH.equals(type))) { scope = Artifact.SCOPE_PROVIDED; } final String fScope = scope; @@ -339,6 +343,9 @@ if (MavenSourcesImpl.NAME_TESTSOURCE.equals(name)) { scope = "test"; //NOI18N } + if (scope == null && JavaClassPathConstants.PROCESSOR_PATH.equals(type)) { + scope = Artifact.SCOPE_PROVIDED; + } final String fScope = scope; ModelOperation operation = new ModelOperation() { public void performOperation(POMModel model) { @@ -381,6 +388,9 @@ if (MavenSourcesImpl.NAME_TESTSOURCE.equals(name)) { scope = "test"; //NOI18N } + if (scope == null && JavaClassPathConstants.PROCESSOR_PATH.equals(classPathType)) { + scope = Artifact.SCOPE_PROVIDED; + } final String fScope = scope; ModelOperation operation = new ModelOperation() { public void performOperation(POMModel model) {