Repository: maven-surefire Updated Branches: refs/heads/master ca7fca497 -> c8858944c
updated parent pom Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c8858944 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c8858944 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c8858944 Branch: refs/heads/master Commit: c8858944ca1409ae368f217cc2f7ca039651bd98 Parents: ca7fca4 Author: Hervé Boutemy <[email protected]> Authored: Sun Apr 27 19:13:58 2014 +0200 Committer: Hervé Boutemy <[email protected]> Committed: Sun Apr 27 19:13:58 2014 +0200 ---------------------------------------------------------------------- README.TXT | 28 +--------------------------- deploySite.sh | 3 ++- pom.xml | 34 +++++++++------------------------- 3 files changed, 12 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8858944/README.TXT ---------------------------------------------------------------------- diff --git a/README.TXT b/README.TXT index 611bc3a..95e288f 100644 --- a/README.TXT +++ b/README.TXT @@ -5,31 +5,5 @@ But in order to test it tests, you can do: Deploying web site ------------------ -You can use the deploySite.sh script -Without any profile the site will be deployed to http://maven.apache.org/surefire-archives/surefire-${project.version} -sh ./deploySite.sh -Preporting - -To deploy main version http://maven.apache.org/surefire, use -sh ./deploySite.sh -Preporting -Psite-release - -Note you can add arguments to the script to pass your svn credentials: --Dusername= --Dpassword= - -Workflow for site when releasing --------------------------------- -Once release staged, you can publish a staged site. -cd target/checkout -sh ./deploySite.sh -Preporting -content will be in http://maven.apache.org/surefire-archives/surefire-${project.version} - -If something goes wrong when publishing the site to svnpubsub (like https://jira.codehaus.org/browse/MSCMPUB-6), -you can avoid rebuilding the site before publishing with -mvn -Preporting scm-publish:publish-scm - -Once vote passed, redeploy main site: -cd target/checkout (or use the version tag) -sh ./deploySite.sh -Preporting -Psite-release - - +see http://maven.apache.org/developers/website/deploy-component-reference-documentation.html \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8858944/deploySite.sh ---------------------------------------------------------------------- diff --git a/deploySite.sh b/deploySite.sh index b6517a2..f6c265d 100644 --- a/deploySite.sh +++ b/deploySite.sh @@ -19,4 +19,5 @@ # under the License. # -mvn clean site-deploy scm-publish:publish-scm $@ +mvn -Preporting site site:stage $@ +mvn scm-publish:publish-scm $@ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8858944/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d09d41d..6a4e17a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>maven-parent</artifactId> <groupId>org.apache.maven</groupId> - <version>23</version> + <version>24</version> <relativePath>../pom/maven/pom.xml</relativePath> </parent> @@ -111,24 +111,21 @@ <system>Jenkins</system> <url>https://builds.apache.org/job/maven-surefire/</url> </ciManagement> + <distributionManagement> + <site> + <id>apache.website</id> + <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url> + </site> + </distributionManagement> <properties> <mavenVersion>2.0.9</mavenVersion> <shadedVersion>2.12.4</shadedVersion> <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion> - <maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection> - <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path> </properties> - <distributionManagement> - <site> - <id>apache.website</id> - <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url> - </site> - </distributionManagement> - <dependencyManagement> <dependencies> <dependency> @@ -314,18 +311,11 @@ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> </configuration> </plugin> - <plugin> + <plugin><!-- TODO remove when upgrading maven-parent to 25 --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> <configuration> - <content>${project.build.directory}/staging/${maven.site.path}</content> - <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory> - <tryUpdate>true</tryUpdate> + <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL> </configuration> </plugin> <plugin> @@ -358,7 +348,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> <configuration> <dependencyLocationsEnabled>false</dependencyLocationsEnabled><!-- waiting for MPIR-267 --> <!-- pin down urls to to avoid interpolation in the modules --> @@ -393,11 +382,6 @@ <artifactId>maven-surefire-report-plugin</artifactId> <version>${shadedVersion}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - </plugin> <!-- plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId>
