You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/11/21 03:02:09 UTC

svn commit: r1715453 - in /maven/doxia/site/trunk: content/apt/doxia-ide.apt content/site.xml content/xdoc/references/index.xml pom.xml

Author: hboutemy
Date: Sat Nov 21 02:02:06 2015
New Revision: 1715453

URL: http://svn.apache.org/viewvc?rev=1715453&view=rev
Log:
updated parent pom (then moved to Fluido)

Modified:
    maven/doxia/site/trunk/content/apt/doxia-ide.apt
    maven/doxia/site/trunk/content/site.xml
    maven/doxia/site/trunk/content/xdoc/references/index.xml
    maven/doxia/site/trunk/pom.xml

Modified: maven/doxia/site/trunk/content/apt/doxia-ide.apt
URL: http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/apt/doxia-ide.apt?rev=1715453&r1=1715452&r2=1715453&view=diff
==============================================================================
--- maven/doxia/site/trunk/content/apt/doxia-ide.apt (original)
+++ maven/doxia/site/trunk/content/apt/doxia-ide.apt Sat Nov 21 02:02:06 2015
@@ -6,6 +6,26 @@
  2012-04-17
  -----
 
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Doxia IDE
 
   IDE integration to ease Doxia documents editing in your favorite IDE:

Modified: maven/doxia/site/trunk/content/site.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/site.xml?rev=1715453&r1=1715452&r2=1715453&view=diff
==============================================================================
--- maven/doxia/site/trunk/content/site.xml (original)
+++ maven/doxia/site/trunk/content/site.xml Sat Nov 21 02:02:06 2015
@@ -21,20 +21,19 @@ under the License.
 
 <project 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 ../../../doxia-sitetools/doxia-decoration-model/target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
  name="Doxia">
   <version position="none" />
 
-  <bannerLeft>
-    <name>Maven</name>
-    <src>images/apache-maven-project-2.png</src>
-    <href>http://maven.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>Doxia</name>
-    <src>images/maven-logo-2.gif</src>
-    <href>http://maven.apache.org/doxia/</href>
-  </bannerRight>
+  <custom>
+    <fluidoSkin>
+      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+      <googlePlusOne />
+      <googleSearch>
+        <sitesearch>https://maven.apache.org/doxia</sitesearch>
+      </googleSearch>
+    </fluidoSkin>
+  </custom>
 
   <body>
     <breadcrumbs>

Modified: maven/doxia/site/trunk/content/xdoc/references/index.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/xdoc/references/index.xml?rev=1715453&r1=1715452&r2=1715453&view=diff
==============================================================================
--- maven/doxia/site/trunk/content/xdoc/references/index.xml (original)
+++ maven/doxia/site/trunk/content/xdoc/references/index.xml Sat Nov 21 02:02:06 2015
@@ -202,9 +202,7 @@ under the License.
           Have a look at the available modules here: <a href="http://repo.maven.apache.org/maven2/org/apache/maven/doxia/">http://repo.maven.apache.org/maven2/org/apache/maven/doxia/</a>.
           <br/>
           If you need to add module for the maven site plugin simply add it as a dependency of the plugin
-          <source>
-            <![CDATA[
-            <plugin>
+          <source><![CDATA[            <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-site-plugin</artifactId>
               <version>3.2</version>
@@ -215,8 +213,7 @@ under the License.
                   <version>1.3</version>
                 </dependency>
               </dependencies>
-            </plugin>
-            ]]>
+            </plugin>]]>
           </source>
         </p>
 

Modified: maven/doxia/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/site/trunk/pom.xml?rev=1715453&r1=1715452&r2=1715453&view=diff
==============================================================================
--- maven/doxia/site/trunk/pom.xml (original)
+++ maven/doxia/site/trunk/pom.xml Sat Nov 21 02:02:06 2015
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>24</version>
+    <version>27</version>
     <relativePath>../../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -110,19 +110,8 @@ under the License.
         <otherArchive>http://markmail.org/list/org.apache.maven.doxia-commits</otherArchive>
       </otherArchives>
     </mailingList>
-    <mailingList>
-      <name>Maven Issues List</name>
-      <subscribe>issues-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
-      <otherArchives>
-        <otherArchive>http://www.mail-archive.com/issues@maven.apache.org</otherArchive>
-        <otherArchive>http://www.nabble.com/Maven---Issues-f15573.html</otherArchive>
-        <otherArchive>http://markmail.org/list/org.apache.maven.issues</otherArchive>
-      </otherArchives>
-    </mailingList>
 
-    <!-- duplication from parent pom - temporary until they inherit properly -->
+    <!-- duplication from parent pom - temporary until we have a feature to make them inherit properly -->
     <mailingList>
       <name>Maven Announcements List</name>
       <post>announce@maven.apache.org</post>