(maven-site-plugin) 01/01: [MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1008
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit deee90af4e539095cfc6f3208db3df1fa9395ed8
Author: Michael Osipov
AuthorDate: Sun May 19 20:23:02 2024 +0200
[MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This closes #187
---
Jenkinsfile| 2 +-
pom.xml| 7 +++---
src/it/projects/MSITE-609/verify.bsh | 4 ++--
src/it/projects/MSITE-627/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 25 +++---
src/it/projects/MSITE-842/project/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 6 +++---
src/it/projects/full-reporting/pom.xml | 6 +-
src/it/projects/site-deploy/verify.bsh | 4 ++--
.../site/deploy/AbstractSiteDeployWebDavTest.java | 4 +++-
10 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a39af828..02ccc0c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.2.x', '3.5.x', '3.6.x',
'3.8.x', '3.9.x'])
+asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.6.x', '3.8.x', '3.9.x'])
diff --git a/pom.xml b/pom.xml
index 2ea5d662..9f115ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.plugins
maven-plugins
-41
+42
@@ -193,9 +193,8 @@ under the License.
-3.2.5
-${mavenVersion}
8
+3.6.3
9.4.54.v20240208
2.0.0-M10
@@ -254,7 +253,7 @@ under the License.
org.apache.maven
- maven-aether-provider
+ maven-resolver-provider
${mavenVersion}
provided
diff --git a/src/it/projects/MSITE-609/verify.bsh
b/src/it/projects/MSITE-609/verify.bsh
index 5fdf251a..2b4715e5 100644
--- a/src/it/projects/MSITE-609/verify.bsh
+++ b/src/it/projects/MSITE-609/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
-int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
+int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
if ( indexOf < 0 )
{
-System.err.println( "download.html doesn't contain Download Maven
3.2.5" );
+System.err.println( "download.html doesn't contain Download Maven
3.6.3" );
return false;
}
}
diff --git a/src/it/projects/MSITE-627/pom.xml
b/src/it/projects/MSITE-627/pom.xml
index 65054be5..e24f9880 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -41,6 +41,18 @@ under the License.
maven-reporting-impl
@mavenReportingImplVersion@
+
+ org.apache.maven
+ maven-plugin-api
+ @mavenVersion@
+ provided
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ @mavenPluginPluginVersion@
+ provided
+
diff --git
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index dcf40e98..19cd83bf 100644
---
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -23,7 +23,8 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -31,10 +32,8 @@ import java.util.Locale;
/**
* Goal which creates a sink in a report.
- *
- * @goal test
- * @phase site
*/
+@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE )
public class MyReport
extends AbstractMavenReport
{
@@ -54,24 +53,6 @@ public class MyReport
return "Test Report for MSITE-672";
}
-@Override
-protected Renderer getSiteRenderer()
-{
-return null;
-}
-
-@Override
-protected String getOutputDirectory()
-{
-return null;
-}
-
-@Override
-protected MavenProject getProject()
-{
-return null;
-}
-
@Override
protected void executeReport( Locale locale )
throws MavenReportException
diff --git a/src/it/projects/MSITE-842/project/pom.xml
b/src/it/projects/MSITE-842/project/pom.xml
index 874ec37e..783d6fa8 100644
--- a/src/it/projects/MSITE-842
(maven-site-plugin) 01/01: [MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1008
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 03641a2986c7241501b735c5a62aed42e8f321da
Author: Michael Osipov
AuthorDate: Sun May 19 20:23:02 2024 +0200
[MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This closes #187
---
Jenkinsfile| 2 +-
pom.xml| 7 +++---
src/it/projects/MSITE-609/verify.bsh | 4 ++--
src/it/projects/MSITE-627/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 25 +++---
src/it/projects/MSITE-842/project/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 6 +++---
src/it/projects/full-reporting/pom.xml | 2 +-
src/it/projects/site-deploy/verify.bsh | 4 ++--
.../site/deploy/AbstractSiteDeployWebDavTest.java | 4 +++-
10 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a39af828..02ccc0c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.2.x', '3.5.x', '3.6.x',
'3.8.x', '3.9.x'])
+asfMavenTlpPlgnBuild(jdk:['8','11','17'], maven:['3.6.x', '3.8.x', '3.9.x'])
diff --git a/pom.xml b/pom.xml
index 2ea5d662..9f115ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.plugins
maven-plugins
-41
+42
@@ -193,9 +193,8 @@ under the License.
-3.2.5
-${mavenVersion}
8
+3.6.3
9.4.54.v20240208
2.0.0-M10
@@ -254,7 +253,7 @@ under the License.
org.apache.maven
- maven-aether-provider
+ maven-resolver-provider
${mavenVersion}
provided
diff --git a/src/it/projects/MSITE-609/verify.bsh
b/src/it/projects/MSITE-609/verify.bsh
index 5fdf251a..2b4715e5 100644
--- a/src/it/projects/MSITE-609/verify.bsh
+++ b/src/it/projects/MSITE-609/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
-int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
+int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
if ( indexOf < 0 )
{
-System.err.println( "download.html doesn't contain Download Maven
3.2.5" );
+System.err.println( "download.html doesn't contain Download Maven
3.6.3" );
return false;
}
}
diff --git a/src/it/projects/MSITE-627/pom.xml
b/src/it/projects/MSITE-627/pom.xml
index 65054be5..e24f9880 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -41,6 +41,18 @@ under the License.
maven-reporting-impl
@mavenReportingImplVersion@
+
+ org.apache.maven
+ maven-plugin-api
+ @mavenVersion@
+ provided
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ @mavenPluginPluginVersion@
+ provided
+
diff --git
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index dcf40e98..19cd83bf 100644
---
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -23,7 +23,8 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -31,10 +32,8 @@ import java.util.Locale;
/**
* Goal which creates a sink in a report.
- *
- * @goal test
- * @phase site
*/
+@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE )
public class MyReport
extends AbstractMavenReport
{
@@ -54,24 +53,6 @@ public class MyReport
return "Test Report for MSITE-672";
}
-@Override
-protected Renderer getSiteRenderer()
-{
-return null;
-}
-
-@Override
-protected String getOutputDirectory()
-{
-return null;
-}
-
-@Override
-protected MavenProject getProject()
-{
-return null;
-}
-
@Override
protected void executeReport( Locale locale )
throws MavenReportException
diff --git a/src/it/projects/MSITE-842/project/pom.xml
b/src/it/projects/MSITE-842/project/pom.xml
index 874ec37e..783d6fa8 100644
--- a/src/it/projects/MSITE-842/pro
(maven-site-plugin) 01/01: [MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-1008
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 4a74b7c980d4c0276e793d403d3caed84893aa7f
Author: Michael Osipov
AuthorDate: Sun May 19 20:23:02 2024 +0200
[MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
This closes #187
---
pom.xml| 7 +++---
src/it/projects/MSITE-609/verify.bsh | 4 ++--
src/it/projects/MSITE-627/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 25 +++---
src/it/projects/MSITE-842/project/pom.xml | 12 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 6 +++---
src/it/projects/site-deploy/verify.bsh | 4 ++--
.../site/deploy/AbstractSiteDeployWebDavTest.java | 4 +++-
8 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ea5d662..9f115ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.maven.plugins
maven-plugins
-41
+42
@@ -193,9 +193,8 @@ under the License.
-3.2.5
-${mavenVersion}
8
+3.6.3
9.4.54.v20240208
2.0.0-M10
@@ -254,7 +253,7 @@ under the License.
org.apache.maven
- maven-aether-provider
+ maven-resolver-provider
${mavenVersion}
provided
diff --git a/src/it/projects/MSITE-609/verify.bsh
b/src/it/projects/MSITE-609/verify.bsh
index 5fdf251a..2b4715e5 100644
--- a/src/it/projects/MSITE-609/verify.bsh
+++ b/src/it/projects/MSITE-609/verify.bsh
@@ -65,10 +65,10 @@ try
return false;
}
String downloadContent = FileUtils.fileRead( download, "UTF-8" );
-int indexOf = downloadContent.indexOf( "Download Maven 3.2.5" );
+int indexOf = downloadContent.indexOf( "Download Maven 3.6.3" );
if ( indexOf < 0 )
{
-System.err.println( "download.html doesn't contain Download Maven
3.2.5" );
+System.err.println( "download.html doesn't contain Download Maven
3.6.3" );
return false;
}
}
diff --git a/src/it/projects/MSITE-627/pom.xml
b/src/it/projects/MSITE-627/pom.xml
index 65054be5..e24f9880 100644
--- a/src/it/projects/MSITE-627/pom.xml
+++ b/src/it/projects/MSITE-627/pom.xml
@@ -41,6 +41,18 @@ under the License.
maven-reporting-impl
@mavenReportingImplVersion@
+
+ org.apache.maven
+ maven-plugin-api
+ @mavenVersion@
+ provided
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ @mavenPluginPluginVersion@
+ provided
+
diff --git
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
index dcf40e98..19cd83bf 100644
---
a/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
+++
b/src/it/projects/MSITE-627/src/main/java/org/apache/maven/plugins/it/MyReport.java
@@ -23,7 +23,8 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -31,10 +32,8 @@ import java.util.Locale;
/**
* Goal which creates a sink in a report.
- *
- * @goal test
- * @phase site
*/
+@Mojo( name = "test", defaultPhase = LifecyclePhase.SITE )
public class MyReport
extends AbstractMavenReport
{
@@ -54,24 +53,6 @@ public class MyReport
return "Test Report for MSITE-672";
}
-@Override
-protected Renderer getSiteRenderer()
-{
-return null;
-}
-
-@Override
-protected String getOutputDirectory()
-{
-return null;
-}
-
-@Override
-protected MavenProject getProject()
-{
-return null;
-}
-
@Override
protected void executeReport( Locale locale )
throws MavenReportException
diff --git a/src/it/projects/MSITE-842/project/pom.xml
b/src/it/projects/MSITE-842/project/pom.xml
index 874ec37e..783d6fa8 100644
--- a/src/it/projects/MSITE-842/project/pom.xml
+++ b/src/it/projects/MSITE-842/project/pom.xml
@@ -42,6 +42,18 @@ under the License.
maven-reporting-impl
@mavenReportingImplVersion@
+
+ org.apache.maven
+ maven-plugin-api
+ @mavenVersion@
+ provided
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ @mavenPluginPluginVersion@
+ provided
+
diff --git
a/src/it/projects/MSITE-842/proj
