diff --git a/pom.xml b/pom.xml
index b3f6caa..9e4c799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
maven-plugins
org.apache.maven.plugins
- 34
- ../../pom/maven/maven-plugins/pom.xml
+ 36
+
maven-jar-plugin
@@ -65,7 +65,7 @@
Jenkins
- https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/
+ https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-jar-plugin/
@@ -78,6 +78,9 @@
3.0.0
3.5.2
3.1.0
+
+
+ 0.0.0.M2a
7
2022-01-08T21:19:21Z
@@ -87,16 +90,25 @@
org.apache.maven
maven-plugin-api
${mavenVersion}
+ provided
org.apache.maven
maven-core
${mavenVersion}
+ provided
org.apache.maven
maven-artifact
${mavenVersion}
+ provided
+
+
+ org.apache.maven
+ maven-model
+ ${mavenVersion}
+ provided
org.apache.maven.shared
diff --git a/src/it/MJAR-30-excludes/verify.bsh b/src/it/MJAR-30-excludes/verify.groovy
similarity index 94%
rename from src/it/MJAR-30-excludes/verify.bsh
rename to src/it/MJAR-30-excludes/verify.groovy
index b2a4607..8470d21 100644
--- a/src/it/MJAR-30-excludes/verify.bsh
+++ b/src/it/MJAR-30-excludes/verify.groovy
@@ -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();
diff --git a/src/it/MJAR-30-fullcontent/verify.bsh b/src/it/MJAR-30-fullcontent/verify.groovy
similarity index 95%
rename from src/it/MJAR-30-fullcontent/verify.bsh
rename to src/it/MJAR-30-fullcontent/verify.groovy
index b8d3016..a64ef94 100644
--- a/src/it/MJAR-30-fullcontent/verify.bsh
+++ b/src/it/MJAR-30-fullcontent/verify.groovy
@@ -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();
diff --git a/src/it/MJAR-30-include/verify.bsh b/src/it/MJAR-30-include/verify.groovy
similarity index 94%
rename from src/it/MJAR-30-include/verify.bsh
rename to src/it/MJAR-30-include/verify.groovy
index ae3a05e..258b205 100644
--- a/src/it/MJAR-30-include/verify.bsh
+++ b/src/it/MJAR-30-include/verify.groovy
@@ -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();
diff --git a/src/it/MJAR-60/verify.bsh b/src/it/MJAR-60/verify.groovy
similarity index 100%
rename from src/it/MJAR-60/verify.bsh
rename to src/it/MJAR-60/verify.groovy
diff --git a/src/it/MJAR-80-exclude/verify.bsh b/src/it/MJAR-80-exclude/verify.groovy
similarity index 96%
rename from src/it/MJAR-80-exclude/verify.bsh
rename to src/it/MJAR-80-exclude/verify.groovy
index 824872e..063dd30 100644
--- a/src/it/MJAR-80-exclude/verify.bsh
+++ b/src/it/MJAR-80-exclude/verify.groovy
@@ -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();
diff --git a/src/it/MJAR-80-fullcontent/verify.bsh b/src/it/MJAR-80-fullcontent/verify.groovy
similarity index 95%
rename from src/it/MJAR-80-fullcontent/verify.bsh
rename to src/it/MJAR-80-fullcontent/verify.groovy
index d8784e2..6cafc8d 100644
--- a/src/it/MJAR-80-fullcontent/verify.bsh
+++ b/src/it/MJAR-80-fullcontent/verify.groovy
@@ -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();
diff --git a/src/it/MJAR-80-include/verify.bsh b/src/it/MJAR-80-include/verify.groovy
similarity index 95%
rename from src/it/MJAR-80-include/verify.bsh
rename to src/it/MJAR-80-include/verify.groovy
index 04d7121..ff62d49 100644
--- a/src/it/MJAR-80-include/verify.bsh
+++ b/src/it/MJAR-80-include/verify.groovy
@@ -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();
diff --git a/src/it/manifest-content/verify.bsh b/src/it/manifest-content/verify.grovy
similarity index 100%
rename from src/it/manifest-content/verify.bsh
rename to src/it/manifest-content/verify.grovy
diff --git a/src/it/mjar-71-01/verify.bsh b/src/it/mjar-71-01/verify.groovy
similarity index 100%
rename from src/it/mjar-71-01/verify.bsh
rename to src/it/mjar-71-01/verify.groovy
diff --git a/src/it/mjar-71-02/verify.bsh b/src/it/mjar-71-02/verify.groovy
similarity index 100%
rename from src/it/mjar-71-02/verify.bsh
rename to src/it/mjar-71-02/verify.groovy
diff --git a/src/it/project-004/verify.bsh b/src/it/project-004/verify.groovy
similarity index 94%
rename from src/it/project-004/verify.bsh
rename to src/it/project-004/verify.groovy
index ede0320..e5f5506 100644
--- a/src/it/project-004/verify.bsh
+++ b/src/it/project-004/verify.groovy
@@ -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();
@@ -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();