From 72f2d856f356ecc4304245cb9ec0ab1f00b22b20 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Fri, 12 May 2023 16:03:57 +0200 Subject: [PATCH] chore: generate MIT version --- .github/scripts/release-snapshot.sh | 2 ++ plantuml-mit/build.gradle.kts | 4 ++-- settings.gradle.kts | 1 + src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java | 2 +- src/net/sourceforge/plantuml/klimt/geom/XLine2D.java | 2 +- src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/scripts/release-snapshot.sh b/.github/scripts/release-snapshot.sh index 92793263e..616d7092d 100755 --- a/.github/scripts/release-snapshot.sh +++ b/.github/scripts/release-snapshot.sh @@ -20,6 +20,8 @@ cp "build/libs/plantuml-${RELEASE_VERSION}.jar" "github_release/plantuml-SNAPSHO cp "build/libs/plantuml-${RELEASE_VERSION}-javadoc.jar" "github_release/plantuml-SNAPSHOT-javadoc.jar" cp "build/libs/plantuml-${RELEASE_VERSION}-sources.jar" "github_release/plantuml-SNAPSHOT-sources.jar" cp "build/libs/plantuml-pdf-${RELEASE_VERSION}.jar" "github_release/plantuml-pdf-SNAPSHOT.jar" +cp "plantuml-mit/build/libs/plantuml-mit-${RELEASE_VERSION}.jar" "github_release/plantuml-mit-SNAPSHOT.jar" +cp "plantuml-mit/build/libs/plantuml-mit-${RELEASE_VERSION}-sources.jar" "github_release/plantuml-mit-SNAPSHOT-sources.jar" if [[ -e "build/publications/maven/module.json.asc" ]]; then # signatures are optional so that forked repos can release snapshots without needing a gpg signing key diff --git a/plantuml-mit/build.gradle.kts b/plantuml-mit/build.gradle.kts index 6c240f7ab..1eb63ed7e 100644 --- a/plantuml-mit/build.gradle.kts +++ b/plantuml-mit/build.gradle.kts @@ -126,8 +126,8 @@ publishing { url.set("https://plantuml.com/") licenses { license { - name.set("The GNU General Public License") - url.set("http://www.gnu.org/licenses/gpl.txt") + name.set("MIT License") + url.set("https://opensource.org/license/mit/") } } developers { diff --git a/settings.gradle.kts b/settings.gradle.kts index 03f74065f..4415cd237 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,3 +2,4 @@ rootProject.name = "plantuml" val isCiBuild = System.getenv("CI") != null +include("plantuml-mit") \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java index 413b816ca..998daeec9 100644 --- a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java +++ b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java @@ -113,7 +113,7 @@ public interface Blake2b { /** max tree inner length value */ int max_tree_inner_length = 0xFF; - /** initialization values map ref-Spec IV[i] -> slice iv[i*8:i*8+7] */ + /** initialization values map ref-Spec IV[i] slice iv[i*8:i*8+7] */ long[] IV = { 0x6a09e667f3bcc908L, 0xbb67ae8584caa73bL, 0x3c6ef372fe94f82bL, 0xa54ff53a5f1d36f1L, 0x510e527fade682d1L, 0x9b05688c2b3e6c1fL, 0x1f83d9abfb41bd6bL, 0x5be0cd19137e2179L }; diff --git a/src/net/sourceforge/plantuml/klimt/geom/XLine2D.java b/src/net/sourceforge/plantuml/klimt/geom/XLine2D.java index 2ed4559f7..e974e335e 100644 --- a/src/net/sourceforge/plantuml/klimt/geom/XLine2D.java +++ b/src/net/sourceforge/plantuml/klimt/geom/XLine2D.java @@ -77,7 +77,7 @@ public class XLine2D implements UDrawable { * specified line segment * @return a double value that is the square of the distance from the specified * point to the specified line segment. - * @see #ptLineDistSq(double, double, double, double, double, double) + * * @since 1.2 */ public static double ptSegDistSq(double x1, double y1, double x2, double y2, double px, double py) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index e404d0ac6..29b2436d7 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -86,7 +86,7 @@ import net.sourceforge.plantuml.utils.LineLocation; * ' loads a remote JSON from an endpoint (and default, if not reachable) * !$STATUS_NO_CONNECTION={"status": "No connection"} * !$JSON_REMOTE_DEF=%load_json("https://localhost:7778/management/health", $STATUS_NO_CONNECTION) - * status -> $JSON_REMOTE_DEF.status + * status -> $JSON_REMOTE_DEF.status * @ enduml * *