remove jira link; fix warnings in site generation; fixes #130

apache · Mar 25, 2024 · 0c3bb11 · 0c3bb11
1 parent 1b627b9
commit 0c3bb11
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 610 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -29,8 +29,6 @@ github:
   features:
     issues: true
   del_branch_on_merge: true
-  autolink_jira:
-    - LOG4JNET
   labels:
     - apache
     - dotnet

diff --git a/pom.xml b/pom.xml
@@ -27,16 +27,12 @@
   <url>http://logging.apache.org/log4net/</url>
   <inceptionYear>2004</inceptionYear>
   <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.apache.org/jira/browse/LOG4NET</url>
+    <system>Github</system>
+    <url>https://github.com/apache/logging-log4net/issues</url>
   </issueManagement>
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>https://builds.apache.org/job/log4net-trunk-build/</url>
-  </ciManagement>
   <mailingLists>
     <mailingList>
-      <name>log4net-user : log4net usage</name>
+      <name>log4net-user: log4net usage</name>
       <subscribe>log4net-user-subscribe@logging.apache.org</subscribe>
       <unsubscribe>log4net-user-unsubscribe@logging.apache.org</unsubscribe>
       <post>log4net-user@logging.apache.org</post>
@@ -47,19 +43,17 @@
       </otherArchives>
     </mailingList>
     <mailingList>
-      <name>dev : development of the logging projects including log4net</name>
+      <name>dev: development of the logging projects including log4net</name>
       <subscribe>dev-subscribe@logging.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@logging.apache.org</unsubscribe>
       <post>dev@logging.apache.org</post>
       <archive>https://lists.apache.org/list.html?dev@logging.apache.org</archive>
       <otherArchives>
         <otherArchive>http://mail-archives.apache.org/mod_mbox/logging-dev/</otherArchive>
-        <!--otherArchive>http://marc.info/?l=log4net-dev</otherArchive>
-        <otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4net.devel</otherArchive-->
       </otherArchives>
     </mailingList>
     <mailingList>
-      <name>logging commits : all svn/git commits of the logging projects including log4net</name>
+      <name>logging commits: all git commits of the logging projects including log4net</name>
       <subscribe>commits-subscribe@logging.apache.org</subscribe>
       <unsubscribe>commits-unsubscribe@logging.apache.org</unsubscribe>
       <post>Read-Only List</post>
@@ -74,9 +68,9 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4net.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4net.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=logging-log4net.git</url>
+    <connection>scm:git:https://github.com/apache/logging-log4net</connection>
+    <developerConnection>scm:git:https://github.com/apache/logging-log4net</developerConnection>
+    <url>https://github.com/apache/logging-log4net</url>
   </scm>
   <organization>
     <name>Apache Software Foundation</name>
@@ -140,30 +134,7 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>0.12</version>
         <configuration>
-          <excludes>
-            <!-- generated files -->
-            <exclude>**/TestResult.xml</exclude>
-            <exclude>**/*.suo</exclude>
-            <exclude>**/*.user</exclude>
-            <exclude>**/obj/**</exclude>
-            <exclude>bin/**</exclude>
-            <exclude>build/**</exclude>
-            <exclude>doc/sdk/**</exclude>
-            <exclude>src/log4net.xml</exclude>
-            <exclude>src/GeneratedAssemblyInfo.cs</exclude>
-            <exclude>src/site/resources/**</exclude>
-            <exclude>tests/bin/**</exclude>
-            <exclude>netstandard/*/bin/**</exclude>
-
-            <!-- really README files -->
-            <exclude>*.snk*</exclude>
-            <exclude>tests/lib/prerequisites.txt</exclude>
-            <exclude>CONTRIBUTING.md</exclude>
-            <exclude>ReleaseInstructions.txt</exclude>
-
-	    <!-- can't have comments in JSON -->
-	    <exclude>**/*.json</exclude>
-	  </excludes>
+		  <excludesFile>${basedir}/rat.excludesFile</excludesFile>
         </configuration>
       </plugin>
       <plugin>

diff --git a/rat.excludesFile b/rat.excludesFile
@@ -0,0 +1,26 @@
+rat.excludesFile
+**/*.suo
+**/*.user
+**/*.yml
+**/*.yaml
+**/.zarro-defaults
+**/*.md
+**/*.txt
+**/*.sh
+**/*.xml
+**/*.props
+**/*.csproj
+**/*.config
+**/*.log
+**/*.targets
+**/GeneratedAssemblyInfo.cs
+**/obj/**
+**/bin/**
+**/*.snk
+**/*.readme
+**/*.json
+src/.idea/**
+src/integration-testing/**
+build/**
+doc/**
+src/site/**
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -21,56 +21,54 @@
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
   <body>
     <links>
-      <item name="Logging Wiki" href="https://wiki.apache.org/logging"/>
       <item name="Apache" href="https://www.apache.org/"/>
       <item name="Logging Services" href="https://logging.apache.org/"/>
       <item name="GitHub" href="https://github.com/apache/logging-log4net/"/>
     </links>
 
-        <menu name="Apache log4net" inherit="top" img="icon-home">
-            <item name="About" href="/index.html"/>
-            <item name="Download" href="/download_log4net.html"/>
-            <item name="Security Reports" href="/release/security-reports.html"/>
-            <item name="Release Notes" href="/release/release-notes.html"/>
-            <item name="License" href="/license.html"/>
-        </menu>
+    <menu name="Apache log4net" inherit="top" img="icon-home">
+      <item name="About" href="/index.html"/>
+      <item name="Download" href="/download_log4net.html"/>
+      <item name="Security Reports" href="/release/security-reports.html"/>
+      <item name="Release Notes" href="/release/release-notes.html"/>
+      <item name="License" href="/license.html"/>
+    </menu>
 
-        <menu name="Documentation" inherit="top" img="icon-file">
-            <item name="Features" href="/release/features.html"/>
-            <item name="Supported Frameworks" href="/release/framework-support.html"/>
-            <item name="Example Apps" href="/release/example-apps.html"/>
-            <item name="Config Examples" href="/release/config-examples.html"/>
-            <item name="Building" href="/release/building.html"/>
-            <item name="FAQ" href="/release/faq.html"/>
-        </menu>
+    <menu name="Documentation" inherit="top" img="icon-file">
+      <item name="Features" href="/release/features.html"/>
+      <item name="Supported Frameworks" href="/release/framework-support.html"/>
+      <item name="Example Apps" href="/release/example-apps.html"/>
+      <item name="Config Examples" href="/release/config-examples.html"/>
+      <item name="Building" href="/release/building.html"/>
+      <item name="FAQ" href="/release/faq.html"/>
+    </menu>
 
-        <menu name="Manual" inherit="top" img="icon-book">
-            <item name="Introduction" href="/release/manual/introduction.html"/>
-            <item name="Configuration" href="/release/manual/configuration.html"/>
-            <item name="Contexts" href="/release/manual/contexts.html"/>
-            <item name="Plugins" href="/release/manual/plugins.html"/>
-            <item name="Repositories" href="/release/manual/repositories.html"/>
-            <item name="Internals" href="/release/manual/internals.html"/>
-        </menu>
+    <menu name="Manual" inherit="top" img="icon-book">
+      <item name="Introduction" href="/release/manual/introduction.html"/>
+      <item name="Configuration" href="/release/manual/configuration.html"/>
+      <item name="Contexts" href="/release/manual/contexts.html"/>
+      <item name="Plugins" href="/release/manual/plugins.html"/>
+      <item name="Repositories" href="/release/manual/repositories.html"/>
+      <item name="Internals" href="/release/manual/internals.html"/>
+    </menu>
 
-        <menu name="For Contributors" inherit="top" img="icon-pencil">
-            <item name="Mailing Lists" href="/mail-lists.html"/>
-            <item name="Issue Tracking" href="/issue-tracking.html"/>
-            <item name="Repository" href="/source-repository.html"/>
-            <item name="Continuous Integration" href="/integration.html"/>
-        </menu>
+    <menu name="For Contributors" inherit="top" img="icon-pencil">
+      <item name="Mailing Lists" href="/mail-lists.html"/>
+      <item name="Issue Tracking" href="/issue-tracking.html"/>
+      <item name="Repository" href="/source-repository.html"/>
+    </menu>
 
-                <menu name="Project Reports" inherit="top" img="icon-cog">
-                  <item name="RAT Report" href="/rat-report.html" />
-                </menu>
+    <menu name="Project Reports" inherit="top" img="icon-cog">
+      <item name="RAT Report" href="/rat-report.html" />
+    </menu>
 
-        <menu name="Apache" inherit="top" img="icon-info-sign">
-            <item name="Home" href="http://www.apache.org/"/>
-            <item name="License" href="http://www.apache.org/licenses/"/>
-            <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>
-            <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
-            <item name="Security" href="http://www.apache.org/security/"/>
-            <item name="Conferences" href="http://www.apachecon.com"/>
-        </menu>
-    </body>
+    <menu name="Apache" inherit="top" img="icon-info-sign">
+      <item name="Home" href="http://www.apache.org/"/>
+      <item name="License" href="http://www.apache.org/licenses/"/>
+      <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+      <item name="Security" href="http://www.apache.org/security/"/>
+      <item name="Conferences" href="http://www.apachecon.com"/>
+    </menu>
+</body>
 </project>