Skip to content

Commit 8ffc33c

Browse files
Copilotlaeubi
andcommitted
Move ReadonlyMavenExecutionRequest to maven.runtime bundle
- Created org.eclipse.m2e.internal.maven.compat package - Moved ReadonlyMavenExecutionRequest from org.eclipse.m2e.core.internal.embedder to org.eclipse.m2e.internal.maven.compat - Changed class visibility from package-private to public - Updated import in MavenExecutionContext - Added package export in maven.runtime pom.xml Co-authored-by: laeubi <[email protected]>
1 parent dcf5b4c commit 8ffc33c

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@
7878
import org.eclipse.m2e.core.embedder.MavenSettingsLocations;
7979
import org.eclipse.m2e.core.internal.MavenPluginActivator;
8080
import org.eclipse.m2e.core.internal.Messages;
81+
import org.eclipse.m2e.internal.maven.compat.ReadonlyMavenExecutionRequest;
82+
8183

8284

8385
/**

org.eclipse.m2e.maven.runtime/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</parent>
2222

2323
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
24-
<version>3.9.1100-SNAPSHOT</version>
24+
<version>3.9.1101-SNAPSHOT</version>
2525
<packaging>jar</packaging>
2626

2727
<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
@@ -189,6 +189,7 @@
189189
-exportcontents: \
190190
META-INF.plexus;-noimport:=true;x-internal:=true,\
191191
META-INF.sisu;-noimport:=true;x-internal:=true,\
192+
org.eclipse.m2e.internal.maven.compat;x-friends:="org.eclipse.m2e.core",\
192193
org.eclipse.m2e.internal.maven.listener;x-friends:="org.eclipse.m2e.launching",\
193194
org.apache.maven.*;provider=m2e;mandatory:=provider,\
194195
org.codehaus.plexus.*;provider=m2e;mandatory:=provider,\

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java renamed to org.eclipse.m2e.maven.runtime/src/main/java/org/eclipse/m2e/internal/maven/compat/ReadonlyMavenExecutionRequest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Igor Fedorenko - initial API and implementation
1212
*******************************************************************************/
1313

14-
package org.eclipse.m2e.core.internal.embedder;
14+
package org.eclipse.m2e.internal.maven.compat;
1515

1616
import java.io.File;
1717
import java.lang.reflect.InvocationTargetException;
@@ -22,10 +22,6 @@
2222
import java.util.Map;
2323
import java.util.Properties;
2424

25-
import org.eclipse.aether.RepositoryCache;
26-
import org.eclipse.aether.repository.WorkspaceReader;
27-
import org.eclipse.aether.transfer.TransferListener;
28-
2925
import org.apache.maven.artifact.repository.ArtifactRepository;
3026
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
3127
import org.apache.maven.execution.ExecutionListener;
@@ -36,14 +32,17 @@
3632
import org.apache.maven.settings.Proxy;
3733
import org.apache.maven.settings.Server;
3834
import org.apache.maven.toolchain.model.ToolchainModel;
35+
import org.eclipse.aether.RepositoryCache;
36+
import org.eclipse.aether.repository.WorkspaceReader;
37+
import org.eclipse.aether.transfer.TransferListener;
3938

4039

4140
/**
4241
* Read-only MavenExecutionRequest that throws IllegalStateException from all modifiers.
4342
*
4443
* @since 1.4
4544
*/
46-
class ReadonlyMavenExecutionRequest implements MavenExecutionRequest {
45+
public class ReadonlyMavenExecutionRequest implements MavenExecutionRequest {
4746

4847
private final MavenExecutionRequest request;
4948

@@ -537,8 +536,8 @@ public MavenExecutionRequest setUseLegacyLocalRepository(boolean useLegacyReposi
537536
/**
538537
* @deprecated DO NOT CALL to maintain Maven 3.8 compatibility
539538
*/
540-
// @Override
541-
@Deprecated(since = "to maintain compatibility with Maven 3.8")
539+
@Override
540+
@Deprecated()
542541
public boolean isIgnoreTransitiveRepositories() {
543542
if(IS_IGNORE_TRANSITIVE_REPOSITORIES != null) {
544543
try {
@@ -551,7 +550,8 @@ public boolean isIgnoreTransitiveRepositories() {
551550
}
552551

553552
// @Override
554-
public MavenExecutionRequest setIgnoreTransitiveRepositories(boolean ignoreTransitiveRepositories) {
553+
@Override
554+
public MavenExecutionRequest setIgnoreTransitiveRepositories(boolean ignoreTransitiveRepositories) {
555555
throw new IllegalStateException();
556556
}
557557

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.eclipse.m2e</groupId>
101101
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
102-
<version>3.9.1100-SNAPSHOT</version>
102+
<version>3.9.1101-SNAPSHOT</version>
103103
</dependency>
104104
</dependencies>
105105

0 commit comments

Comments
 (0)