From 7b52b4431a513903a277b1cafc40184fc6aa7603 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 5 Mar 2025 10:16:55 -0500
Subject: [PATCH] Build: Use package-info.java for empty dirs
instead of package.html and Dummy.java
---
core/java/src/org/minidns/Dummy.java | 7 -------
core/java/src/org/minidns/package-info.java | 11 +++++++++++
core/java/src/org/minidns/package.html | 16 ----------------
router/java/src/org/cybergarage/Dummy.java | 7 -------
.../java/src/org/cybergarage/package-info.java | 4 ++++
router/java/src/org/cybergarage/package.html | 7 -------
6 files changed, 15 insertions(+), 37 deletions(-)
delete mode 100644 core/java/src/org/minidns/Dummy.java
create mode 100644 core/java/src/org/minidns/package-info.java
delete mode 100644 core/java/src/org/minidns/package.html
delete mode 100644 router/java/src/org/cybergarage/Dummy.java
create mode 100644 router/java/src/org/cybergarage/package-info.java
delete mode 100644 router/java/src/org/cybergarage/package.html
diff --git a/core/java/src/org/minidns/Dummy.java b/core/java/src/org/minidns/Dummy.java
deleted file mode 100644
index 6dc2189ff7..0000000000
--- a/core/java/src/org/minidns/Dummy.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.minidns;
-
-/**
- * Exists only to enable package.html to be included in javadoc.
- * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
- */
-abstract class Dummy {}
diff --git a/core/java/src/org/minidns/package-info.java b/core/java/src/org/minidns/package-info.java
new file mode 100644
index 0000000000..2bcf84bae9
--- /dev/null
+++ b/core/java/src/org/minidns/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This is a portion of release 1.0.0 of MiniDNS from https://github.com/MiniDNS/minidns/ 2020-07-18
+ * Only contains the minidns-core portion of the library.
+ * Removed tests, most util classes, and DnsRootServer class.
+ *
+ * This software may be used under the terms of (at your choice)
+ * - LGPL version 2 (or later) (see LICENSE-LGPLv2.1 for details)
+ * - Apache Software licence (see LICENSE-APACHE2.0 for details)
+ * - WTFPL (see LICENSE-WTFPL for details)
+ */
+package org.minidns;
diff --git a/core/java/src/org/minidns/package.html b/core/java/src/org/minidns/package.html
deleted file mode 100644
index fa2aa829a0..0000000000
--- a/core/java/src/org/minidns/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><body>
-<p>
-This is a portion of release 1.0.0 of MiniDNS from https://github.com/MiniDNS/minidns/ 2020-07-18
-Only contains the minidns-core portion of the library.
-Removed tests, most util classes, and DnsRootServer class.
-
-</p><pre>
-
-This software may be used under the terms of (at your choice)
-- LGPL version 2 (or later) (see LICENCE_LGPL2.1 for details)
-- Apache Software licence (see LICENCE_APACHE for details)
-- WTFPL (see LICENCE_WTFPL for details)
-
-
-</pre>
-</body></html>
diff --git a/router/java/src/org/cybergarage/Dummy.java b/router/java/src/org/cybergarage/Dummy.java
deleted file mode 100644
index a7d71c9ad2..0000000000
--- a/router/java/src/org/cybergarage/Dummy.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.cybergarage;
-
-/**
- * Exists only to enable package.html to be included in javadoc.
- * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
- */
-abstract class Dummy {}
diff --git a/router/java/src/org/cybergarage/package-info.java b/router/java/src/org/cybergarage/package-info.java
new file mode 100644
index 0000000000..8375289744
--- /dev/null
+++ b/router/java/src/org/cybergarage/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The cybergarage cyberlink UPnP library version 3.0, with minor mods for I2P.
+ */
+package org.cybergarage;
diff --git a/router/java/src/org/cybergarage/package.html b/router/java/src/org/cybergarage/package.html
deleted file mode 100644
index 379ce53a04..0000000000
--- a/router/java/src/org/cybergarage/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-The cybergarage cyberlink UPnP library version 3.0, with minor mods for I2P.
-</p>
-</body>
-</html>
--
GitLab