Author: hboutemy Date: Sun Dec 20 17:19:52 2015 New Revision: 1721046 URL: http://svn.apache.org/viewvc?rev=1721046&view=rev Log: [MSITE-702] avoid overriding skin resources / duplicate copying of skin resources
Added: maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/ maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css (with props) Modified: maven/plugins/trunk/maven-site-plugin/src/it/resources/verify.groovy Added: maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css?rev=1721046&view=auto ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css Sun Dec 20 17:19:52 2015 @@ -0,0 +1,20 @@ +/* + * 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. + */ + +This comes from src/site/resources/css/maven-base.css, overriding Skin content... Propchange: maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-site-plugin/src/it/resources/src/site/resources/css/maven-base.css ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: maven/plugins/trunk/maven-site-plugin/src/it/resources/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/resources/verify.groovy?rev=1721046&r1=1721045&r2=1721046&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/resources/verify.groovy (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/resources/verify.groovy Sun Dec 20 17:19:52 2015 @@ -21,9 +21,12 @@ assert site.exists(); // file from src/site/resources assert new File( site, 'src-site-resources.txt' ).exists(); -// file from target/generated-site/resources +// MSITE-744 file from target/generated-site/resources assert new File( site, 'generated-site-resources.txt' ).exists(); // file from maven-default-skin:jar:1.0 assert new File( site, 'images/logos/maven-feather.png' ).exists(); +// MSITE-702 overriding skin content with src/site/resources +assert new File( site, 'css/maven-base.css' ).text.contains( 'overriding Skin content...' ); + return true; \ No newline at end of file