Author: ltheussl
Date: Sat Apr 2 07:18:15 2011
New Revision: 1087968
URL: http://svn.apache.org/viewvc?rev=1087968&view=rev
Log:
formatting to sync with trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site_sv.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
Sat Apr 2 07:18:15 2011
@@ -19,7 +19,6 @@ specific language governing permissions
under the License.
-->
-<!--$Id$-->
<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/pom.xml Sat
Apr 2 07:18:15 2011
@@ -43,7 +43,6 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
Sat Apr 2 07:18:15 2011
@@ -1,45 +1,45 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-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;
-
-assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest'
);
-
-assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert new File(basedir, 'target/site/index.html').exists();
-assert new File(basedir, 'target/site/checkstyle.html').exists();
-assert new File(basedir, 'target/site/cpd.html').exists();
-assert new File(basedir, 'target/site/apidocs/index.html').exists();
-assert new File(basedir,
'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
-assert new File(basedir, 'target/site/cobertura/index.html').exists();
-assert new File(basedir, 'target/site/xref/index.html').exists();
-assert new File(basedir, 'target/site/xref-test/index.html').exists();
-
-assert new File(basedir, 'target/site/taglist.html').exists();
-assert new File(basedir, 'target/site/team-list.html').exists();
-
-assert new File(basedir, 'target/site/dependencies.html').exists();
-content = new File(basedir, 'target/site/dependencies.html').text;
-assert content.contains( 'junit:junit:jar:3.8.2' );
-
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+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;
+
+assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest'
);
+
+assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
+
+assert new File(basedir, 'target/site/surefire-report.html').exists();
+assert new File(basedir, 'target/site/index.html').exists();
+assert new File(basedir, 'target/site/checkstyle.html').exists();
+assert new File(basedir, 'target/site/cpd.html').exists();
+assert new File(basedir, 'target/site/apidocs/index.html').exists();
+assert new File(basedir,
'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
+assert new File(basedir, 'target/site/cobertura/index.html').exists();
+assert new File(basedir, 'target/site/xref/index.html').exists();
+assert new File(basedir, 'target/site/xref-test/index.html').exists();
+
+assert new File(basedir, 'target/site/taglist.html').exists();
+assert new File(basedir, 'target/site/team-list.html').exists();
+
+assert new File(basedir, 'target/site/dependencies.html').exists();
+content = new File(basedir, 'target/site/dependencies.html').text;
+assert content.contains( 'junit:junit:jar:3.8.2' );
+
return true;
\ No newline at end of file
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
Sat Apr 2 07:18:15 2011
@@ -19,7 +19,6 @@ specific language governing permissions
under the License.
-->
-<!--$Id$-->
<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site_sv.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site_sv.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site_sv.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site_sv.xml
Sat Apr 2 07:18:15 2011
@@ -19,7 +19,6 @@ specific language governing permissions
under the License.
-->
-<!--$Id$-->
<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
Sat Apr 2 07:18:15 2011
@@ -19,7 +19,6 @@ specific language governing permissions
under the License.
-->
-<!--$Id$-->
<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
Sat Apr 2 07:18:15 2011
@@ -19,7 +19,6 @@ specific language governing permissions
under the License.
-->
-<!--$Id$-->
<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
Sat Apr 2 07:18:15 2011
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
</plugins>
</reporting>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy?rev=1087968&r1=1087967&r2=1087968&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
Sat Apr 2 07:18:15 2011
@@ -1,31 +1,31 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-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;
-
-assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest'
);
-
-assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert !new File(basedir, 'target/site/index.html').exists();
-
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+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;
+
+assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest'
);
+
+assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
+
+assert new File(basedir, 'target/site/surefire-report.html').exists();
+assert !new File(basedir, 'target/site/index.html').exists();
+
return true;
\ No newline at end of file
