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

[1.x] Maven 3.9.7 #997

Merged
merged 4 commits into from
May 22, 2024
Merged

[1.x] Maven 3.9.7 #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
158ffb9
Maven 3.9.7
cstamas May 22, 2024
8e2ca04
Oops, wrapper 3.3.2 is still on vote
cstamas May 22, 2024
5f77769
Specify plugin version and goalPrefix
cstamas May 22, 2024
591eb14
Implement CLI `-itr` option
cstamas May 22, 2024
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
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
wrapperVersion=3.3.1
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
2 changes: 1 addition & 1 deletion build-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<roaster.version>2.28.0.Final</roaster.version>
<maven.version>3.9.6</maven.version>
<maven.plugin-tools.version>3.12.0</maven.plugin-tools.version>
<maven.plugin-tools.version>3.13.0</maven.plugin-tools.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 0 additions & 4 deletions daemon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
Expand Down
1 change: 1 addition & 0 deletions daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,7 @@ private static void populateRequest(

request.setCacheNotFound(true);
request.setCacheTransferError(false);
request.setIgnoreTransitiveRepositories(commandLine.hasOption(CLIManager.IGNORE_TRANSITIVE_REPOSITORIES));

//
// Builder, concurrency and parallelism
Expand Down
13 changes: 13 additions & 0 deletions integration-tests/src/test/projects/extension-with-api/plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,17 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<goalPrefix>extension-with-api</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-unpacked-source-dir</id>
Expand Down
4 changes: 2 additions & 2 deletions mvnw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.0
# Apache Maven Wrapper startup batch script, version 3.3.1
#
# Optional ENV vars
# -----------------
Expand Down Expand Up @@ -199,7 +199,7 @@ elif set_java_home; then
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( new java.net.URL( args[0] ).openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
Expand Down
2 changes: 1 addition & 1 deletion mvnw.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@REM ----------------------------------------------------------------------------

@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.0
@REM Apache Maven Wrapper startup batch script, version 3.3.1
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
Expand Down
27 changes: 21 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@
<commons-compress.version>1.26.1</commons-compress.version>
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>22.3.1</graalvm.version>
<graalvm.plugin.version>0.10.1</graalvm.plugin.version>
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
<groovy.version>4.0.21</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jansi.version>2.4.1</jansi.version>
<jline.version>3.25.1</jline.version>
<maven.version>3.9.6</maven.version>
<maven.version>3.9.7</maven.version>
<!-- Keep in sync with Maven -->
<maven.resolver.version>1.9.18</maven.resolver.version>
<maven.resolver.version>1.9.20</maven.resolver.version>
<slf4j.version>1.7.36</slf4j.version>
<sisu.version>0.9.0.M2</sisu.version>

Expand All @@ -95,7 +95,7 @@
<groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.3.2</junit-platform-launcher.version>
<takari-provisio.version>1.0.24</takari-provisio.version>
<takari-provisio.version>1.0.25</takari-provisio.version>

<javassist.version>3.29.2-GA</javassist.version>
<xstream.version>1.4.20</xstream.version>
Expand Down Expand Up @@ -319,6 +319,21 @@
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>maven-2125</id>
<url>https://repository.apache.org/content/repositories/maven-2125/</url>
</repository>
</repositories>

<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -415,12 +430,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down