Skip to content

[MJAR-288] Upgrade Parent to 36 #40

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

Merged
slawekjaranowski merged 1 commit into from
May 13, 2022
Merged

[MJAR-288] Upgrade Parent to 36 #40

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
18 changes: 15 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>34</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
<version>36</version>
<relativePath/>
</parent>

<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -65,7 +65,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/</url>
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/</url>
</ciManagement>
<distributionManagement>
<site>
Expand All @@ -78,6 +78,9 @@
<mavenFileManagementVersion>3.0.0</mavenFileManagementVersion>
<mavenArchiverVersion>3.5.2</mavenArchiverVersion>
<mavenVersion>3.1.0</mavenVersion>
<!-- TODO remove with Maven APi upgrade -->
<!-- the same version as in Maven 3.1.0 -->
<sisuVersion>0.0.0.M2a</sisuVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2022-01-08T21:19:21Z</project.build.outputTimestamp>
</properties>
Expand All @@ -87,16 +90,25 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-30-excludes/verify.bsh → src/it/MJAR-30-excludes/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ try
return false;
}

String[] artifactNames = new String[] { "default-configuration.properties", "META-INF/MANIFEST.MF",
String[] artifactNames = [ "default-configuration.properties", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-03/pom.xml" ];

Set contents = new HashSet();

Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-30-fullcontent/verify.bsh → src/it/MJAR-30-fullcontent/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ try
return false;
}

String[] artifactNames = new String[] { "default-configuration.properties",
String[] artifactNames = [ "default-configuration.properties",
"foo/project001/App.class", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-01/pom.xml" ];

Set contents = new HashSet();

Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-30-include/verify.bsh → src/it/MJAR-30-include/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ try
return false;
}

String[] artifactNames = new String[] { "service/TestInterface.class", "META-INF/MANIFEST.MF",
String[] artifactNames = [ "service/TestInterface.class", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-30-02/pom.xml" ];

Set contents = new HashSet();

Expand Down
0 src/it/MJAR-60/verify.bsh → src/it/MJAR-60/verify.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/it/MJAR-80-exclude/verify.bsh → src/it/MJAR-80-exclude/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ try
return false;
}

String[] artifactNames = new String[] { "test-default-configuration.properties",
String[] artifactNames = [ "test-default-configuration.properties",
"foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-03/pom.xml" ];

Set contents = new HashSet();

Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-80-fullcontent/verify.bsh → src/it/MJAR-80-fullcontent/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ try
return false;
}

String[] artifactNames = new String[] { "test-default-configuration.properties",
String[] artifactNames = [ "test-default-configuration.properties",
"foo/project003/AppTest.class", "foo/project003/AppIntegrationTest.class", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-01/pom.xml" ];

Set contents = new HashSet();

Expand Down
4 changes: 2 additions & 2 deletions src/it/MJAR-80-include/verify.bsh → src/it/MJAR-80-include/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ try
return false;
}

String[] artifactNames = new String[] { "foo/project003/AppIntegrationTest.class",
String[] artifactNames = [ "foo/project003/AppIntegrationTest.class",
"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-mjar-80-02/pom.xml" ];

Set contents = new HashSet();

Expand Down
0 src/it/manifest-content/verify.bsh → src/it/manifest-content/verify.grovy
View file
Open in desktop
File renamed without changes.
0 src/it/mjar-71-01/verify.bsh → src/it/mjar-71-01/verify.groovy
View file
Open in desktop
File renamed without changes.
0 src/it/mjar-71-02/verify.bsh → src/it/mjar-71-02/verify.groovy
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/it/project-004/verify.bsh → src/it/project-004/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ try
return false;
}

String[] artifactNames = new String[] { "service/TestInterface.class",
String[] artifactNames = [ "service/TestInterface.class",
"service/impl/TestImplementation.class", "TestCompile1.class", "notIncluded.xml", "META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" ];

Set contents = new HashSet();

Expand Down Expand Up @@ -84,10 +84,10 @@ try
return false;
}

artifactNames = new String[] { "service/TestInterface.class",
artifactNames = [ "service/TestInterface.class",
"META-INF/MANIFEST.MF",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.properties",
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" };
"META-INF/maven/org.apache.maven.plugins/maven-jar-plugin-test-project-004/pom.xml" ];

contents = new HashSet();

Expand Down