Merge branch 'fix/codehaus' into merged-pull-requests

jja · jja · commit 77a526c9ff60 · 2020-08-10T13:29:26.000-06:00
diff --git a/README b/README
@@ -10,7 +10,7 @@ Documentation: https://github.com/jgritman/httpbuilder/wiki
 Contributions:
 
  This project relies on the work of many open source projects including:
-  * Groovy: http://groovy.codehaus.org
+  * Groovy: http://groovy-lang.org
   * Apache HttpClient: http://hc.apache.org
   * Json-Lib: http://json-lib.sourceforge.net/
   * Neko HTML: http://nekohtml.sourceforge.net/
diff --git a/src/site/apt/doc/get.apt b/src/site/apt/doc/get.apt
@@ -17,7 +17,7 @@ Simplified GET Request
  HTML response based on the response's content-type header.  The HTML stream is
  normalized (thanks to {{{http://nekohtml.sourceforge.net/}Neko,}}) and then
  parsed by an
- {{{http://groovy.codehaus.org/Reading+XML+using+Groovy%27s+XmlSlurper}XmlSlurper}}
+ {{{http://groovy-lang.org/processing-xml.html}XmlSlurper}}
  for easy DOM traversal.
 
  We are also taking advantage of HTTPBuilder's
diff --git a/src/site/apt/doc/index.apt b/src/site/apt/doc/index.apt
@@ -92,7 +92,7 @@ The Magic: Built-in Content-Type Parsing
 
   Probably the quickest way to debug is to turn on logging for HTTPBuilder and
   Apache HttpClient.  An example
-  {{{https://svn.codehaus.org/gmod/httpbuilder/trunk/src/test/resources/log4j.xml}
+  {{{https://github.com/jgritman/httpbuilder/blob/master/src/test/resources/log4j.xml}
   log4j configuration}} can be used to output headers and request/response
   content, as well as additional information on what HTTPBuilder is doing with
   the request and response.
diff --git a/src/site/apt/doc/xml.apt b/src/site/apt/doc/xml.apt
@@ -7,7 +7,7 @@
 Parsing XML data
 
   By default, HTTPBuilder classes will automatically parse XML responses using
-  an <<<{{{http://groovy.codehaus.org/gapi/groovy/util/XmlSlurper.html}XmlSlurper}}>>>.
+  an <<<{{{http://groovy-lang.org/processing-xml.html}XmlSlurper}}>>>.
 
   You can try the following example in the Groovy console (Groovy 1.6+ is needed
   for the <<<@Grab>>> macro):
@@ -44,7 +44,7 @@ Parsing XML data
 POSTing XML data
 
   XML data is serialized using
-  <<<{{{http://groovy.codehaus.org/gapi/index.html?groovy/xml/StreamingMarkupBuilder.html}StreamingMarkupBuilder}}>>>.
+  <<<{{{http://docs.groovy-lang.org/latest/html/gapi/groovy/xml/StreamingMarkupBuilder.html}StreamingMarkupBuilder}}>>>.
   You can define the <<<body>>> property as a closure like so:
 
 %{code-snippet|id=xml2|brush=groovy|file=src/site/examples.txt}
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -12,7 +12,7 @@
     <bannerRight>
         <name>Groovy</name>
         <src>http://media.xircles.codehaus.org/_projects/groovy/_logos/medium.png</src>
-        <href>http://groovy.codehaus.org/</href>
+        <href>http://groovy-lang.org/</href>
     </bannerRight>
     <version position="left" />
     <publishDate position="right"/>
@@ -46,7 +46,7 @@
             <item name="About" href="about.html" />
         </menu>
         <menu name="Additional Reference">
-            <item name="Groovy" href="http://groovy.codehaus.org/Documentation" />
+            <item name="Groovy" href="http://groovy-lang.org/Documentation" />
             <item name="HTTP/1.1 RFC" href="http://www.w3.org/Protocols/rfc2616/rfc2616.html" />
             <item name="HttpClient" href="http://hc.apache.org/httpcomponents-client/" />
             <item name="HttpCore" href="http://hc.apache.org/httpcomponents-core/" />
@@ -84,4 +84,4 @@
         <logo name="Ohloh" href='http://www.ohloh.net/p/http-builder' 
             img='http://www.ohloh.net/p/http-builder/widgets/project_thin_badge.gif' />
     </poweredBy>
-</project>
+</project>
diff --git a/src/site/xdoc/about.xml b/src/site/xdoc/about.xml
@@ -19,7 +19,7 @@
       both commercial and non-commercial products.</p>
       
       <p>HTTPBuilder is built on top of a number of excellent open source 
-      products, including <a href='http://groovy.codehaus.org/'>Groovy</a>, 
+      products, including <a href='http://groovy-lang.org/'>Groovy</a>, 
       <a href='http://hc.apache.org/httpcomponents-client/'>Apache HttpClient</a>, 
       and <a href='http://json-lib.sourceforge.net/'>Json-Lib</a>.</p> 
     
@@ -49,4 +49,4 @@
         </ul>
     </section>
   </body>
-</document>
+</document>
diff --git a/src/test/groovy/groovyx/net/http/URIBuilderTest.groovy b/src/test/groovy/groovyx/net/http/URIBuilderTest.groovy
@@ -98,13 +98,13 @@ public class URIBuilderTest {
         def uri = new URIBuilder( 'http://johannburkard.de/%22bla%22' )
         uri.query = [ what_is_this: 'i_dont_even' ]
 
-        uri = new URIBuilder( 'http://codehaus.org/')
+        uri = new URIBuilder( 'http://groovy-lang.org/')
         uri.path = '"bla"'
 
         uri.fragment = 'what evs'
-        assert uri.toString() == 'http://codehaus.org/%22bla%22#what%20evs'
+        assert uri.toString() == 'http://groovy-lang.org/%22bla%22#what%20evs'
         uri.query = [ a: 'b#' ]
-        assert uri.toString() == 'http://codehaus.org/%22bla%22?a=b%23#what%20evs'
+        assert uri.toString() == 'http://groovy-lang.org/%22bla%22?a=b%23#what%20evs'
         uri.port = 80
         uri.host = 'google.com'
         uri.scheme = 'https'
