You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/10/15 22:03:02 UTC
[maven-plugin-tools] branch MPLUGIN-485 updated (419f9e1d -> 27fb9cbb)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MPLUGIN-485
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
discard 419f9e1d [MPLUGIN-485] Upgrade Parent to 40
new 27fb9cbb [MPLUGIN-485] Upgrade Parent to 40
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (419f9e1d)
\
N -- N -- N refs/heads/MPLUGIN-485 (27fb9cbb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-plugin-plugin/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
[maven-plugin-tools] 01/01: [MPLUGIN-485] Upgrade Parent to 40
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MPLUGIN-485
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 27fb9cbbca44d9953ef162abcda9ae94d8d3712f
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Oct 15 22:59:55 2023 +0200
[MPLUGIN-485] Upgrade Parent to 40
---
maven-plugin-plugin/pom.xml | 4 ++++
.../src/it/annotation-with-inheritance-from-deps/verify.groovy | 2 ++
.../src/it/annotation-with-inheritance-reactor/verify.groovy | 2 ++
maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy | 2 ++
maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy | 2 ++
.../src/it/java-basic-annotations-jdkcurrent/verify.groovy | 2 ++
maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy | 2 ++
maven-plugin-plugin/src/it/java-basic/verify.groovy | 2 ++
maven-plugin-plugin/src/it/mplugin-223/verify.groovy | 2 ++
.../src/it/mplugin-305_defaultMojoDependencies/verify.groovy | 2 ++
.../src/it/mplugin-305_emptyMojoDependencies/verify.groovy | 2 ++
.../src/it/mplugin-305_singleMojoDependencies/verify.groovy | 2 ++
.../src/it/mplugin-382-exclude-provided-dependency/verify.groovy | 2 ++
maven-plugin-plugin/src/it/packaging-jar/verify.groovy | 2 ++
maven-plugin-plugin/src/it/source-encoding/verify.groovy | 2 ++
maven-plugin-plugin/src/it/v4api/verify.groovy | 2 ++
pom.xml | 2 +-
17 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 05326734..d8603b67 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -284,6 +284,10 @@
<pomExclude>plugin-info-jdk/pom.xml</pomExclude>
<!-- relies on just a given plugin.xml for generating a report, this is no longer supported -->
</pomExcludes>
+ <extraArtifacts>
+ <!-- used in ITs -->
+ <extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-annotations:${project.version}:test-jar</extraArtifact>
+ </extraArtifacts>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy
index 6f0f05df..ce549b05 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy
index 6b0b412d..a8e3455c 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "module-mojo/target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
index 689e0008..1b4c213f 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy
index b130e2c5..80db3ce7 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy
index c498a221..e102e813 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
index b3f34ed8..a921bee3 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/java-basic/verify.groovy b/maven-plugin-plugin/src/it/java-basic/verify.groovy
index 33f9fb71..b7389a60 100644
--- a/maven-plugin-plugin/src/it/java-basic/verify.groovy
+++ b/maven-plugin-plugin/src/it/java-basic/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File touchFile = new File( basedir, "target/touch.txt" )
assert touchFile.isFile()
diff --git a/maven-plugin-plugin/src/it/mplugin-223/verify.groovy b/maven-plugin-plugin/src/it/mplugin-223/verify.groovy
index 90914979..5794c300 100644
--- a/maven-plugin-plugin/src/it/mplugin-223/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-223/verify.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy
index 5105ea1b..642fb98c 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy
index 1e862920..71853898 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
index 583a19f6..61e3005e 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy
index 408b8f04..2484c2e5 100644
--- a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy
+++ b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/packaging-jar/verify.groovy b/maven-plugin-plugin/src/it/packaging-jar/verify.groovy
index 3883bb42..cdf45e37 100644
--- a/maven-plugin-plugin/src/it/packaging-jar/verify.groovy
+++ b/maven-plugin-plugin/src/it/packaging-jar/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/maven-plugin-plugin/src/it/source-encoding/verify.groovy b/maven-plugin-plugin/src/it/source-encoding/verify.groovy
index e5bac1cb..a40247e2 100644
--- a/maven-plugin-plugin/src/it/source-encoding/verify.groovy
+++ b/maven-plugin-plugin/src/it/source-encoding/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
def latin1File = new File(basedir, 'latin-1/target/classes/META-INF/maven/plugin.xml')
assert latin1File.exists()
def latin1Chars = new XmlParser().parse(latin1File).mojos.mojo.description.text()
diff --git a/maven-plugin-plugin/src/it/v4api/verify.groovy b/maven-plugin-plugin/src/it/v4api/verify.groovy
index 59a369a3..5ce732ad 100644
--- a/maven-plugin-plugin/src/it/v4api/verify.groovy
+++ b/maven-plugin-plugin/src/it/v4api/verify.groovy
@@ -17,6 +17,8 @@
* under the License.
*/
+import groovy.xml.XmlParser
+
File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
assert descriptorFile.isFile()
diff --git a/pom.xml b/pom.xml
index c2719a33..75066270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>39</version>
+ <version>40</version>
<relativePath />
</parent>