Swicthed soem more http:// to https://. Fixed some deadd references to JIRA
diff --git a/Jenkinsfile b/Jenkinsfile
index 23b72fc..a16b5cc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * https@://www.apache.org/licenses/LICENSE-2.0
+ * https://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
diff --git a/NOTICE b/NOTICE
index a186c7d..45abf96 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,5 +2,5 @@
Copyright 2003-2019 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/asn1/api/src/main/java/org/apache/directory/api/asn1/package.html b/asn1/api/src/main/java/org/apache/directory/api/asn1/package.html
index af798cb..8b84a20 100644
--- a/asn1/api/src/main/java/org/apache/directory/api/asn1/package.html
+++ b/asn1/api/src/main/java/org/apache/directory/api/asn1/package.html
@@ -33,9 +33,9 @@
For overviews, tutorials, examples, guides, and tool documentation, please see:
<ul>
- <li><a href="http://directory.apache.org/subprojects/asn1/index.html">ASN.1 Project</a></li>
- <li><a href="http://directory.apache.org/subprojects/asn1/codec-stateful/index.html">Stateful Codecs</a></li>
- <li><a href="http://directory.apache.org/subprojects/asn1/ber-codec/index.html">ASN.1 BER Codecs</a></li>
+ <li><a href="https://directory.apache.org/subprojects/asn1/index.html">ASN.1 Project</a></li>
+ <li><a href="https://directory.apache.org/subprojects/asn1/codec-stateful/index.html">Stateful Codecs</a></li>
+ <li><a href="https://directory.apache.org/subprojects/asn1/ber-codec/index.html">ASN.1 BER Codecs</a></li>
</ul>
<!-- Put @see and @since tags down here. -->
diff --git a/distribution/src/main/release/NOTICE b/distribution/src/main/release/NOTICE
index 6969106..0c94b33 100644
--- a/distribution/src/main/release/NOTICE
+++ b/distribution/src/main/release/NOTICE
@@ -2,20 +2,20 @@
Copyright 2003-2019 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
Additional copyright notices and license terms applicable are
present in the 'licenses' directory.
-This product includes/uses Apache Commons (http://commons.apache.org/).
+This product includes/uses Apache Commons (https://commons.apache.org/).
-This product includes/uses Apache Logging Services (http://logging.apache.org/).
+This product includes/uses Apache Logging Services (https://logging.apache.org/).
-This product includes/uses Apache Felix (http://felix.apache.org/).
+This product includes/uses Apache Felix (https://felix.apache.org/).
-This product uses Apache Maven (http://maven.apache.org/).
+This product uses Apache Maven (https://maven.apache.org/).
-This product includes/uses Apache Mina (http://mina.apache.org/).
+This product includes/uses Apache Mina (https://mina.apache.org/).
This product includes/uses software, AntLR Parser Generator (http://www.antlr.org/).
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterCloneTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterCloneTest.java
index 0098252..4fa0f97 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterCloneTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterCloneTest.java
@@ -475,7 +475,7 @@
/**
* Enrique just found this bug with the filter parser when parsing substring
* expressions like *any*. Here's the JIRA issue: <a
- * href="http://nagoya.apache.org/jira/browse/DIRLDAP-21">DIRLDAP-21</a>.
+ * href="https://issues.apache.org/jira/browse/DIRSERVER-235">DIRSERVER-235</a>.
*/
@Test
public void testSubstringStarAnyStar() throws ParseException
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
index fea21d8..fac1f72 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
@@ -756,7 +756,7 @@
/**
* Enrique just found this bug with the filter parser when parsing substring
* expressions like *any*. Here's the JIRA issue: <a
- * href="http://nagoya.apache.org/jira/browse/DIRLDAP-21">DIRLDAP-21</a>.
+ * href="https://issues.apache.org/jira/browse/DIRSERVER-235">DIRSERVER-235</a>.
*/
@Test
public void testSubstringStarAnyStar() throws ParseException
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifRevertorTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifRevertorTest.java
index 64006c8..788e5b1 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifRevertorTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifRevertorTest.java
@@ -643,7 +643,7 @@
* Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
* with deleteOldRdn = false, and the Ava not present in the initial entry?
*
- * Covers case 1.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 1.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -687,7 +687,7 @@
* Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
* with deleteOldRdn = false, and with a Ava present in the initial entry.
*
- * Covers case 1.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 1.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -733,7 +733,7 @@
* Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
* with deleteOldRdn = true, and the Ava not present in the initial entry
*
- * Covers case 2.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 2.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -777,7 +777,7 @@
* Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
* with deleteOldRdn = true, and with a Ava present in the initial entry.
*
- * Covers case 2.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 2.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -824,7 +824,7 @@
* the new Rdn is simple, not overlapping, with deleteOldRdn = false, and
* with a Ava not present in the initial entry.
*
- * Covers case 3 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 3 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -871,7 +871,7 @@
* the new Rdn is simple, not overlapping, with deleteOldRdn = false, and
* with an Ava present in the initial entry.
*
- * Covers case 3 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 3 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -920,7 +920,7 @@
* the new Rdn is simple, not overlapping, with deleteOldRdn = true, and
* with an Ava not present in the initial entry.
*
- * Covers case 4 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 4 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -967,7 +967,7 @@
* the new Rdn is simple, not overlapping, with deleteOldRdn = true, and
* with an Ava present in the initial entry.
*
- * Covers case 4 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 4 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1015,7 +1015,7 @@
* Test a reversed rename ModifyDN, where the initial Rdn is composite,
* the new Rdn is simple, they overlap, with deleteOldRdn = false.
*
- * Covers case 5 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 5 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1061,7 +1061,7 @@
* Test a reversed rename ModifyDN, where the initial Rdn is composite,
* the new Rdn is simple, they overlap, with deleteOldRdn = true.
*
- * Covers case 5 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 5 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1108,7 +1108,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
* the new values don't exist in the entry.
*
- * Covers case 6.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 6.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1155,7 +1155,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
* the new values exists in the entry.
*
- * Covers case 6.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 6.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1215,7 +1215,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
* none of new values exists in the entry.
*
- * Covers case 7.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 7.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1262,7 +1262,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
* some of new values exists in the entry.
*
- * Covers case 7.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 7.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1322,7 +1322,7 @@
* the new Rdn is composite, they overlap, with deleteOldRdn = false, and
* none of new values exists in the entry.
*
- * Covers case 8.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 8.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1369,7 +1369,7 @@
* the new Rdn is composite, they overlap, with deleteOldRdn = false, and
* some of the new values exist in the entry.
*
- * Covers case 8.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 8.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1429,7 +1429,7 @@
* the new Rdn is composite, they overlap, with deleteOldRdn = true, and
* none of new values exists in the entry.
*
- * Covers case 9.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 9.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1476,7 +1476,7 @@
* the new Rdn is composite, they overlap, with deleteOldRdn = true, and
* some of the new values exists in the entry.
*
- * Covers case 9.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 9.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: cn=test,ou=system
@@ -1536,7 +1536,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
* none of new values exists in the entry.
*
- * Covers case 10.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 10.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1585,7 +1585,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
* some of the new values exists in the entry.
*
- * Covers case 10.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 10.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1647,7 +1647,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
* none of new values exists in the entry.
*
- * Covers case 11.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 11.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1696,7 +1696,7 @@
* the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
* some of the new values exists in the entry.
*
- * Covers case 11.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 11.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1758,7 +1758,7 @@
* the new Rdn is composite, they are overlapping, with deleteOldRdn = false, and
* none of new values exists in the entry.
*
- * Covers case 12.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 12.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1807,7 +1807,7 @@
* the new Rdn is composite, they are overlapping, with deleteOldRdn = false, and
* some of the new values exists in the entry.
*
- * Covers case 12.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 12.2 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1856,7 +1856,7 @@
* the new Rdn is composite, they are overlapping, with deleteOldRdn = true, and
* none of new values exists in the entry.
*
- * Covers case 13.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 13.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
@@ -1905,7 +1905,7 @@
* the new Rdn is composite, they are overlapping, with deleteOldRdn = true, and
* some of the new values exists in the entry.
*
- * Covers case 13.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
+ * Covers case 13.1 of https://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
*
* Initial entry
* dn: sn=small+cn=test,ou=system
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
index 012a7e6..c82dc95 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
@@ -491,8 +491,8 @@
/**
* Tests to see if inner whitespace is preserved after an escaped ',' in a
* value of a name component. This test was added to try to reproduce the
- * bug encountered in DIREVE-179 <a
- * href="http://issues.apache.org/jira/browse/DIREVE-179"> here</a>.
+ * bug encountered in DIRSERVER-297 <a
+ * href="https://issues.apache.org/jira/browse/DIRSERVER-297"> here</a>.
*
* @throws LdapException
* if anything goes wrong on parse()
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastDnParserTest.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastDnParserTest.java
index 33d2236..36ba882 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastDnParserTest.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastDnParserTest.java
@@ -534,8 +534,8 @@
/**
* Tests to see if inner whitespace is preserved after an escaped ',' in a
* value of a name component. This test was added to try to reproduce the
- * bug encountered in DIREVE-179 <a
- * href="http://issues.apache.org/jira/browse/DIREVE-179"> here</a>.
+ * bug encountered in DIRSERVER-297 <a
+ * href="https://issues.apache.org/jira/browse/DIRSERVER-297"> here</a>.
*/
@Test
public final void testPreserveSpaceAfterEscape() throws LdapException
diff --git a/src/site/site.xml b/src/site/site.xml
index 9ddc46e..6e3c31c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,7 +21,7 @@
<project name="${project.name}">
<bannerLeft>
<src>images/server-icon_128x128.png</src>
- <href>http://directory.apache.org/</href>
+ <href>https://directory.apache.org/</href>
<name>${project.name}</name>
</bannerLeft>
<skin>
@@ -42,9 +42,9 @@
and as of https://bugzilla.mozilla.org/show_bug.cgi?id=43659
this workaround doesn't works in FF 3.x ...
-->
- <item name="Apache Directory" href="http://directory.apache%2eorg/"/>
- <item name="Apache" href="http://www.apache%2eorg/"/>
- <item name="Maven" href="http://maven.apache%2eorg/"/>
+ <item name="Apache Directory" href="https://directory.apache.org/"/>
+ <item name="Apache" href="https://www.apache.org/"/>
+ <item name="Maven" href="https://maven.apache.org/"/>
</links>
<menu ref="reports"/>
<menu ref="modules"/>
