Skip to content

Commit

Permalink
[MJAR-293] Update Parent to 39
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Solórzano <jorsol@gmail.com>
  • Loading branch information
jorsol committed Feb 27, 2023
1 parent 44f90d4 commit 34a334b
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 189 deletions.
16 changes: 7 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>

<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Expand All @@ -18,19 +17,18 @@
specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>37</version>
<artifactId>maven-plugins</artifactId>
<version>39</version>
<relativePath />
</parent>

<artifactId>maven-jar-plugin</artifactId>
<version>3.3.1-SNAPSHOT</version>
<version>3.4.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Apache Maven JAR Plugin</name>
Expand All @@ -42,10 +40,10 @@
<email>jerome@coffeebreaks.org</email>
<organization>CoffeeBreaks</organization>
<organizationUrl>http://www.coffeebreaks.org</organizationUrl>
<timezone>+1</timezone>
<roles>
<role>Java Developer</role>
</roles>
<timezone>+1</timezone>
</contributor>
</contributors>

Expand All @@ -56,8 +54,8 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-jar-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-jar-plugin.git</developerConnection>
<url>https://github.com/apache/maven-jar-plugin/tree/${project.scm.tag}</url>
<tag>HEAD</tag>
<url>https://github.com/apache/maven-jar-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
<system>JIRA</system>
Expand Down Expand Up @@ -152,8 +150,8 @@
<build>
<resources>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
</resources>
<pluginManagement>
Expand Down
7 changes: 7 additions & 0 deletions src/it/MJAR-70-no-recreation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
<configuration>
</configuration>
</plugin>
<!-- Use a fixed version of maven-compiler-plugin, this fails with versions [3.8.1, 3.10.1] -->
<!-- Fixed in https://issues.apache.org/jira/browse/MCOMPILER-525 (3.11.0) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down

0 comments on commit 34a334b

Please sign in to comment.