Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Runtime] Embed Maven 3.9.4 #1370

Merged
merged 1 commit into from
Aug 22, 2023
Merged

[Runtime] Embed Maven 3.9.4 #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions org.eclipse.m2e.feature/forceQualifierUpdate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
Update build-qualifier because maven-runtime components currently use the committer's time-zone for their qualifier and don't align with the other projects that use UTC.
Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
Move o.e.m2e.maven.runtime to m2e's git-repo root
Update build-qualifier because maven-runtime version update to Maven 3.9.4
8 changes: 4 additions & 4 deletions org.eclipse.m2e.maven.runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
</parent>

<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
<version>3.9.101-SNAPSHOT</version>
<version>3.9.400-SNAPSHOT</version>
<packaging>jar</packaging>

<name>M2E Embedded Maven Runtime (includes Incubating components)</name>

<properties>
<!-- maven core version -->
<maven-core.version>3.9.1</maven-core.version>
<maven-core.version>3.9.4</maven-core.version>
<!-- NOTE: When maven-core.version changes, this may impact the versions of the maven-resolver-*
jars that export the org.eclipse.aether.* packages in the org.eclipse.m2e.maven.runtime
bundle. So make sure the following variable has the value of the maven-resolver-* jars
https://bugs.eclipse.org/bugs/show_bug.cgi?id=529540 -->
<maven-resolver.version>1.9.7</maven-resolver.version>
<maven-resolver.version>1.9.14</maven-resolver.version>
<!-- below are m2e-specific addons -->
<plexus-build-api.version>0.0.7</plexus-build-api.version>
<okhttp-connector.version>0.17.8</okhttp-connector.version>
Expand Down Expand Up @@ -195,7 +195,7 @@
javax.annotation;version="[1.2.0,2.0.0)", \
org.apache.commons.cli;version="[1.4.0,2.0.0)"
Require-Bundle: \
com.google.guava
com.google.guava;bundle-version="32.0.1"

-failok: true
-nouses: true
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>org.eclipse.m2e</groupId>
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
<version>3.9.101-SNAPSHOT</version>
<version>3.9.400-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down