Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2014-02-10 23:21:31 -0500
committerIgor Fedorenko2014-02-10 23:21:31 -0500
commitd3b6df656115e37a1ea4780fe4a84b10c7f0a8af (patch)
treebde33b34aadb112a646f7ef485b63b10f8f2ac46
parenta19a70e2d2be8b6382953cf847ca65d353e7fdf7 (diff)
downloadm2e-core-d3b6df656115e37a1ea4780fe4a84b10c7f0a8af.tar.gz
m2e-core-d3b6df656115e37a1ea4780fe4a84b10c7f0a8af.tar.xz
m2e-core-d3b6df656115e37a1ea4780fe4a84b10c7f0a8af.zip
staged maven 3.2.0
Change-Id: Ic6119810323552558dd47857e17c71ffe7673ecc Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java50
2 files changed, 37 insertions, 21 deletions
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
index 62261048..7fe45c0d 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -23,7 +23,7 @@
<properties>
<!-- maven core version -->
- <maven.version>3.1.1</maven.version>
+ <maven.version>3.2.0</maven.version>
<guava.version>14.0.1</guava.version>
<!-- below are m2e-specific addons -->
<plexus-build-api.version>0.0.7</plexus-build-api.version>
@@ -128,6 +128,12 @@
</dependencies>
</dependencyManagement>
+ <repositories>
+ <repository>
+ <id>maven-3.2.0-staging</id>
+ <url>https://repository.apache.org/content/repositories/maven-1005/</url>
+ </repository>
+ </repositories>
<build>
<plugins>
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java
index 8b50e5a5..f1e6add9 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java
@@ -118,26 +118,6 @@ class ReadonlyMavenExecutionRequest implements MavenExecutionRequest {
return request.getMakeBehavior();
}
- public void setThreadCount(String threadCount) {
- throw new IllegalStateException();
- }
-
- public String getThreadCount() {
- return request.getThreadCount();
- }
-
- public boolean isThreadConfigurationPresent() {
- return request.isThreadConfigurationPresent();
- }
-
- public void setPerCoreThreadCount(boolean perCoreThreadCount) {
- throw new IllegalStateException();
- }
-
- public boolean isPerCoreThreadCount() {
- return request.isPerCoreThreadCount();
- }
-
public MavenExecutionRequest setRecursive(boolean recursive) {
throw new IllegalStateException();
}
@@ -449,4 +429,34 @@ class ReadonlyMavenExecutionRequest implements MavenExecutionRequest {
return request.setUseLegacyLocalRepository(useLegacyRepository);
}
+ @Override
+ public String getBuilderId() {
+ return request.getBuilderId();
+ }
+
+ @Override
+ public int getDegreeOfConcurrency() {
+ return request.getDegreeOfConcurrency();
+ }
+
+ @Override
+ public List<String> getExcludedProjects() {
+ return Collections.unmodifiableList(request.getExcludedProjects());
+ }
+
+ @Override
+ public MavenExecutionRequest setBuilderId(String builderId) {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public void setDegreeOfConcurrency(int degree) {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public MavenExecutionRequest setExcludedProjects(List<String> excludedProjects) {
+ throw new IllegalStateException();
+ }
+
}

Back to the top