[SCM-814] Dead links on Maven SCM plugin usage page and Maven SCM Providers Matrix page
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
index e100697..2f61f57 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
@@ -53,7 +53,7 @@
     
     /**
      * currently only implemented with svn scm. Enable a workaround to prevent issue 
-     * due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
+     * due to svn client > 1.5.0 (https://issues.apache.org/jira/browse/SCM-406)
      *
      * @since 1.3
      */    
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
index cc8c01d..49a969e 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
@@ -80,7 +80,7 @@
     
     /**
      * currently only implemented with svn scm. Enable a workaround to prevent issue 
-     * due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
+     * due to svn client > 1.5.0 (https://issues.apache.org/jira/browse/SCM-406)
      *      
      * @since 1.2
      */    
diff --git a/maven-scm-plugin/src/site/apt/index.apt b/maven-scm-plugin/src/site/apt/index.apt
index 1c7f386..c6bfb61 100644
--- a/maven-scm-plugin/src/site/apt/index.apt
+++ b/maven-scm-plugin/src/site/apt/index.apt
@@ -76,9 +76,7 @@
 * Usage
 
   General instructions on how to use the SCM Plugin can be found on the {{{./usage.html}usage page}}. Some more
-  specific use cases are described in the examples given below. Last but not least, users occasionally contribute
-  additional examples, tips or errata to the
-  {{{http://docs.codehaus.org/display/MAVENUSER/SCM+Plugin}plugin's wiki page}}.
+  specific use cases are described in the examples given below.
 
   In case you still have questions regarding the plugin's usage, please feel
   free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
diff --git a/maven-scm-plugin/src/site/apt/usage.apt.vm b/maven-scm-plugin/src/site/apt/usage.apt.vm
index a1ff0e4..0305e49 100644
--- a/maven-scm-plugin/src/site/apt/usage.apt.vm
+++ b/maven-scm-plugin/src/site/apt/usage.apt.vm
@@ -142,6 +142,6 @@
 
 Related Links
 
-  * {{{http://docs.codehaus.org/display/SCM/SCM+Matrix}SCM Plugin Matrix}}
+  * {{{../matrix.html}SCM Plugin Matrix}}
 
   []
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
index ac65311..ea5c5f9 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
@@ -137,7 +137,7 @@
     protected void addDateRangeParameter( Commandline cl, String dateRange )
     {
         // There's a difference between UNIX-like OS and Windows
-        // See http://jira.codehaus.org/browse/SCM-187
+        // See https://issues.apache.org/jira/browse/SCM-187
         if ( Os.isFamily( "windows" ) )
         {
             cl.createArg().setValue( "\"" + dateRange + "\"" );
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
index bb87c31..dbec38e 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
@@ -148,7 +148,7 @@
     /**
      * If you wish to use this component, makesure to configure your 
      * TCK implementation to include plexus component configuration
-     * as doc at https://jira.codehaus.org/browse/MNG-4384
+     * as doc at https://issues.apache.org/jira/browse/MNG-4384
      * @return SecDispatcher
      * @throws Exception
      */
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
index 62e657b..280df97 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
@@ -57,7 +57,7 @@
 
         assertResultIsSuccess( branchResult );
 
-        // see https://jira.codehaus.org/browse/SCM-754
+        // see https://issues.apache.org/jira/browse/SCM-754
         //assertEquals( "check all 4 files branched", 4, branchResult.getBranchedFiles().size() );
 
         File readmeTxt = new File( getWorkingCopy(), "readme.txt" );
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
index 3692cf0..566957f 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
@@ -57,7 +57,7 @@
 
         assertResultIsSuccess( tagResult );
 
-        // see https://jira.codehaus.org/browse/SCM-754
+        // see https://issues.apache.org/jira/browse/SCM-754
         // assertEquals( "check all 4 files tagged", 4, tagResult.getTaggedFiles().size() );
 
         File readmeTxt = new File( getWorkingCopy(), "readme.txt" );
diff --git a/src/site/apt/guide/usage.apt b/src/site/apt/guide/usage.apt
index 27b297c..73363bd 100644
--- a/src/site/apt/guide/usage.apt
+++ b/src/site/apt/guide/usage.apt
@@ -32,7 +32,7 @@
 
 ** With Plexus IOC
 
-  With {{{http://plexus.codehaus.org}Plexus}}, it's very easy to use Maven SCM
+  With {{{http://codehaus-plexus.github.io/}Plexus}}, it's very easy to use Maven SCM
   because it injects all dependencies in fields, so you only have to write
   minimal code.
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 11eb4f7..27f2f3d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -50,7 +50,7 @@
         <item name="How to write a new SCM provider" href="/guide/new_provider.html"/>
       </item>
       <item name="SCM Providers Matrix" href="/matrix.html"/>
-      <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+      <!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
       <item name="License" href="http://www.apache.org/licenses/"/>
       <item name="Download" href="download.html"/>
     </menu>
diff --git a/src/site/xdoc/matrix.xml b/src/site/xdoc/matrix.xml
index 6ae8f93..355988c 100644
--- a/src/site/xdoc/matrix.xml
+++ b/src/site/xdoc/matrix.xml
@@ -1072,7 +1072,7 @@
 
     <section name="Related Links">
       <ul>
-        <li><a href="http://docs.codehaus.org/display/SCM/SCM+Matrix">Wiki of Maven SCM Matrix</a></li>
+        <li><a href="https://cwiki.apache.org/confluence/display/MAVENSCM/SCM+Matrix">Wiki of Maven SCM Matrix</a></li>
         <li><a href="http://en.wikipedia.org/wiki/Comparison_of_revision_control_software">Comparison of revision control software</a></li>
         <li><a href="http://en.wikipedia.org/wiki/Source_Code_Management#Common_vocabulary">SCM Common vocabulary</a></li>
         <li><a href="http://www.cmcrossroads.com/cgi-bin/cmwiki/view/CM/">CM Wiki</a></li>