From e1ea7b0252b67ef30ac35ae376a5a1d9661bc153 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 8 Nov 2023 16:56:31 -0800
Subject: [PATCH] Minor cleanup

---
 examples/bld/.idea/misc.xml                   | 10 ++++
 .../com/example/ReadingTimeExampleBuild.java  |  7 +--
 pom.xml                                       | 55 ++++++-------------
 .../net/thauvin/erik/ReadingTimeBuild.java    | 10 +++-
 4 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/examples/bld/.idea/misc.xml b/examples/bld/.idea/misc.xml
index ba79751..d286b3d 100644
--- a/examples/bld/.idea/misc.xml
+++ b/examples/bld/.idea/misc.xml
@@ -5,6 +5,16 @@
     <pattern value="com.example.ReadingTimeExampleBuild" method="runJava" />
   </component>
   <component name="PDMPlugin">
+    <option name="customRuleSets">
+      <list>
+        <option value="K:\java\semver\config\pmd.xml" />
+        <option value="$PROJECT_DIR$/../../../../java/bld-pitest/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../../../java/bld-jacoco-report/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../../../java/bld-checkstyle/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../../../java/bld-exec/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../../../java/bld-testng/config/pmd.xml" />
+      </list>
+    </option>
     <option name="skipTestSources" value="false" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
diff --git a/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java b/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
index aa97d7f..4a11390 100644
--- a/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
+++ b/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
@@ -8,8 +8,7 @@ import rife.bld.operations.RunOperation;
 
 import java.util.List;
 
-import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
-import static rife.bld.dependencies.Repository.MAVEN_LOCAL;
+import static rife.bld.dependencies.Repository.*;
 import static rife.bld.dependencies.Scope.compile;
 
 public class ReadingTimeExampleBuild extends BaseProject {
@@ -23,11 +22,11 @@ public class ReadingTimeExampleBuild extends BaseProject {
         javaRelease = 11;
         downloadSources = true;
         autoDownloadPurge = true;
-        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
+        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY);
 
         scope(compile)
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)))
-                .include(dependency("net.thauvin.erik", "readingtime", version(0, 9, 2, "SNAPSHOT")));
+                .include(dependency("net.thauvin.erik", "readingtime", version(0, 9, 1)));
     }
 
     public static void main(String[] args) {
diff --git a/pom.xml b/pom.xml
index 275380e..6f36ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- This module was also published with a richer model, Gradle metadata,  -->
-  <!-- which should be used instead. Do not delete the following line which  -->
-  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
-  <!-- that they should prefer consuming it instead. -->
-  <!-- do_not_remove: published-with-gradle-metadata -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik</groupId>
   <artifactId>readingtime</artifactId>
-  <version>0.9.1</version>
+  <version>0.9.2-SNAPSHOT</version>
   <name>readingtime</name>
   <description>Estimated Reading Time for Blog Posts, Articles, etc.</description>
   <url>https://github.com/ethauvin/readingtime</url>
@@ -18,6 +14,20 @@
       <url>https://opensource.org/licenses/BSD-3-Clause</url>
     </license>
   </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.9.20</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.16.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
   <developers>
     <developer>
       <id>ethauvin</id>
@@ -27,37 +37,8 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/ethauvin/readingtime.git</connection>
+    <connection>scm:git:https://github.com/ethauvin/readingtime</connection>
     <developerConnection>scm:git:git@github.com:ethauvin/readingtime.git</developerConnection>
     <url>https://github.com/ethauvin/readingtime</url>
   </scm>
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/ethauvin/readingtime/issues</url>
-  </issueManagement>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-bom</artifactId>
-        <version>1.7.10</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.7.10</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.15.3</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
index 3dde2b1..0f4c52c 100644
--- a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
+++ b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
@@ -43,6 +43,7 @@ import rife.bld.publish.PomBuilder;
 import rife.bld.publish.PublishDeveloper;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
+import rife.tools.exceptions.FileUtilsErrorException;
 
 import java.io.File;
 import java.io.IOException;
@@ -67,7 +68,7 @@ public class ReadingTimeBuild extends Project {
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)))
                 .include(dependency("org.jsoup", "jsoup", version(1, 16, 2)));
         scope(test)
-                .include(dependency("org.jetbrains.kotlin:kotlin-test-junit5:1.9.20"))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 20)))
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));
 
@@ -135,7 +136,12 @@ public class ReadingTimeBuild extends Project {
     @Override
     public void publish() throws Exception {
         super.publish();
-        PomBuilder.generateInto(publishOperation().info(), publishOperation().dependencies(),
+        pomRoot();
+    }
+
+    @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory")
+    public void pomRoot() throws FileUtilsErrorException {
+        PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(),
                 new File(workDirectory, "pom.xml"));
     }
 }