Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions maven-batch-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>
<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.executor</groupId>
<artifactId>maven-batch-executor</artifactId>
<packaging>jar</packaging>

Expand Down
4 changes: 2 additions & 2 deletions maven-executor-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>
<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

Expand Down
5 changes: 2 additions & 3 deletions maven-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>
<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.executor</groupId>
<artifactId>maven-executor</artifactId>
<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ public String mavenVersion() {
if (closed.get()) {
throw new ExecutorException("Executor is closed");
}
return cache.computeIfAbsent("maven.version", k -> getExecutor(
Mode.AUTO,
ExecutorRequest.mavenBuilder()
.userHomeDirectory(ExecutorRequest.discoverUserHomeDirectory())
.build())
.mavenVersion());
return cache.computeIfAbsent(
"maven.version",
k -> getExecutor(
Mode.AUTO,
ExecutorRequest.mavenBuilder()
.userHomeDirectory(ExecutorRequest.discoverUserHomeDirectory())
.build())
.mavenVersion());
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how is that change related to "undo GAV change"?

}

@Override
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>47</version>
<version>48</version>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not related to "Undo GAV change"

<relativePath />
</parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>

<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

Expand Down
4 changes: 2 additions & 2 deletions providers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>
<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

Expand Down
5 changes: 2 additions & 3 deletions test-utilities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-executor</artifactId>
<groupId>org.apache.maven.executor</groupId>
<artifactId>executor</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.maven.executor</groupId>
<artifactId>test-utilities</artifactId>
<packaging>jar</packaging>

Expand Down
Loading