maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [maven-site-plugin] 01/02: Revert "Disable three ITs which fail due to DOXIASITETOOLS-155 for now"
Date Fri, 02 Mar 2018 21:24:30 GMT
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit d1a59255b04676f8355014fc4bec60c8ad289d47
Author: Hervé Boutemy <hboutemy@apache.org>
AuthorDate: Fri Mar 2 22:02:12 2018 +0100

    Revert "Disable three ITs which fail due to DOXIASITETOOLS-155 for now"
    
    This reverts commit d3302eeed2281684108acdcc7768e381e9dc32e2.
---
 src/it/effective-site/invoker.properties         | 1 -
 src/it/effective-site/verify.groovy              | 5 ++---
 src/it/full-reporting/invoker.properties         | 3 +--
 src/it/full-reporting/verify.groovy              | 7 +++----
 src/it/site-sd-stagingSiteURL/invoker.properties | 1 -
 src/it/site-sd-stagingSiteURL/verify.groovy      | 6 +++---
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/it/effective-site/invoker.properties b/src/it/effective-site/invoker.properties
index 9be7aad..301e7be 100644
--- a/src/it/effective-site/invoker.properties
+++ b/src/it/effective-site/invoker.properties
@@ -17,4 +17,3 @@
 
 invoker.goals = clean site:effective-site
 invoker.mavenOpts = -Doutput=effective-site.xml
-invoker.buildResult = failure
diff --git a/src/it/effective-site/verify.groovy b/src/it/effective-site/verify.groovy
index 15e62fb..078e562 100644
--- a/src/it/effective-site/verify.groovy
+++ b/src/it/effective-site/verify.groovy
@@ -17,7 +17,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+assert new File( basedir, 'effective-site.xml' ).exists();
 
-return true;
-
-assert new File( basedir, 'effective-site.xml' ).exists();
\ No newline at end of file
+return true;
\ No newline at end of file
diff --git a/src/it/full-reporting/invoker.properties b/src/it/full-reporting/invoker.properties
index a2b5af2..84ce062 100644
--- a/src/it/full-reporting/invoker.properties
+++ b/src/it/full-reporting/invoker.properties
@@ -17,5 +17,4 @@
 
 invoker.profiles=reporting
 # see MNG-5140
-invoker.maven.version = 2.2.2+
-invoker.buildResult = failure
+invoker.maven.version = 2.2.2+
\ No newline at end of file
diff --git a/src/it/full-reporting/verify.groovy b/src/it/full-reporting/verify.groovy
index e80ffa9..cb209c7 100644
--- a/src/it/full-reporting/verify.groovy
+++ b/src/it/full-reporting/verify.groovy
@@ -17,9 +17,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-return true;
-
 assert new File( basedir, 'target/surefire-reports' ).exists();
 assert new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt'
).exists();
 content = new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt'
).text;
@@ -93,4 +90,6 @@ for ( String report : reports )
     index1 = i1;
     index2 = i2;
     previousReportLink = link;
-}
\ No newline at end of file
+}
+
+return true;
\ No newline at end of file
diff --git a/src/it/site-sd-stagingSiteURL/invoker.properties b/src/it/site-sd-stagingSiteURL/invoker.properties
index 56178df..c18ff86 100644
--- a/src/it/site-sd-stagingSiteURL/invoker.properties
+++ b/src/it/site-sd-stagingSiteURL/invoker.properties
@@ -16,4 +16,3 @@
 # under the License.
 
 invoker.goals=clean site:site site:stage-deploy
-invoker.buildResult = failure
diff --git a/src/it/site-sd-stagingSiteURL/verify.groovy b/src/it/site-sd-stagingSiteURL/verify.groovy
index 7790535..48c4ac8 100644
--- a/src/it/site-sd-stagingSiteURL/verify.groovy
+++ b/src/it/site-sd-stagingSiteURL/verify.groovy
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-return true;
-
 target = new File( basedir, 'target' );
 assert target.isDirectory();
 
 stageDeploy = new File( target, 'MSITE-649-1.0-SNAPSHOT' );
 assert stageDeploy.isDirectory();
 
-assert !new File( stageDeploy, 'MSITE-649' ).exists(); // a MSITE-649 subdirectory has been
created inside the staging directory
\ No newline at end of file
+assert !new File( stageDeploy, 'MSITE-649' ).exists(); // a MSITE-649 subdirectory has been
created inside the staging directory
+
+return true;
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.

Mime
View raw message