From 2f08ccf97af8de54e2bcebec87e36d2dddb90e46 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 15 Feb 2024 08:31:46 +0100 Subject: [PATCH] Rename pmd-ui to pmd-designer Fixes #65 --- .ci/build.sh | 3 ++- .gitignore | 2 +- .idea/.name | 1 - .idea/compiler.xml | 5 +---- .idea/encodings.xml | 1 + .idea/modules.xml | 8 -------- .idea/runConfigurations/Designer__JRE_11_.xml | 4 ++-- .idea/runConfigurations/Designer__JRE_8_.xml | 2 +- .idea/runConfigurations/Designer__JRE_9_.xml | 2 +- CHANGELOG.md | 17 +++++++++++++++++ CONTRIBUTING.md | 2 +- README.md | 6 +++--- config/pmd-check.xml | 2 +- pom.xml | 4 ++-- releasing.md | 4 ++-- .../pmd/util/fxdesigner/DesignerVersion.java | 2 +- .../util/beans/PersistenceIntegrationTest.java | 2 +- 17 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/modules.xml diff --git a/.ci/build.sh b/.ci/build.sh index bd1f9ed8..a39e0827 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -47,7 +47,8 @@ function build() { GH_RELEASE="$RESULT" # Deploy to github releases - pmd_ci_gh_releases_uploadAsset "$GH_RELEASE" "target/pmd-ui-${PMD_CI_MAVEN_PROJECT_VERSION}.jar" + # Note: This is the shaded jar + pmd_ci_gh_releases_uploadAsset "$GH_RELEASE" "target/pmd-designer-${PMD_CI_MAVEN_PROJECT_VERSION}.jar" # extract the release notes RELEASE_NAME="${PMD_CI_MAVEN_PROJECT_VERSION}" diff --git a/.gitignore b/.gitignore index ba32261c..5a730558 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,4 @@ buildNumber.properties # CSS files generated by IDE src/main/resources/net/sourceforge/pmd/util/fxdesigner/css -pmd-ui.iml +pmd-designer.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 65133fd8..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -pmd-ui \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 472a055c..f657207b 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,12 +6,9 @@ - + - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 6de6a269..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Designer__JRE_11_.xml b/.idea/runConfigurations/Designer__JRE_11_.xml index e0c930d2..d2656ead 100644 --- a/.idea/runConfigurations/Designer__JRE_11_.xml +++ b/.idea/runConfigurations/Designer__JRE_11_.xml @@ -1,13 +1,13 @@ - diff --git a/releasing.md b/releasing.md index 607d2402..8ceacb14 100644 --- a/releasing.md +++ b/releasing.md @@ -26,11 +26,11 @@ 4. Wait, until release is ready. The maven plugin will directly push the tag. The tag will be built by [github actions](https://github.com/pmd/pmd-designer/actions). - After it is done, the new release should be available under . + After it is done, the new release should be available under . 5. Verify the release on Github Releases: - The release notes from `/CHANGELOG.md` should be there. Also, the shaded pmd-ui-*.jar should + The release notes from `/CHANGELOG.md` should be there. Also, the shaded pmd-designer-*.jar should have been uploaded. 6. Add a new section at the top in `/CHANGELOG.md` to prepare for the next version. diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java index 0d8b354a..678027b6 100644 --- a/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java +++ b/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerVersion.java @@ -28,7 +28,7 @@ public final class DesignerVersion { * Determines the version from maven's generated pom.properties file. */ static { - VERSION = readProperty("/META-INF/maven/net.sourceforge.pmd/pmd-ui/pom.properties", "version").orElse(UNKNOWN_VERSION); + VERSION = readProperty("/META-INF/maven/net.sourceforge.pmd/pmd-designer/pom.properties", "version").orElse(UNKNOWN_VERSION); PMD_CORE_MIN_VERSION = readProperty(ResourceUtil.resolveResource("designer.properties"), "pmd.core.version").orElse(UNKNOWN_VERSION); } diff --git a/src/test/java/net/sourceforge/pmd/util/fxdesigner/util/beans/PersistenceIntegrationTest.java b/src/test/java/net/sourceforge/pmd/util/fxdesigner/util/beans/PersistenceIntegrationTest.java index 42f82825..89573e3d 100644 --- a/src/test/java/net/sourceforge/pmd/util/fxdesigner/util/beans/PersistenceIntegrationTest.java +++ b/src/test/java/net/sourceforge/pmd/util/fxdesigner/util/beans/PersistenceIntegrationTest.java @@ -29,7 +29,7 @@ public void testBeanRoundTrip() throws IOException { bean.setK(IOException.class); bean.setStr("hahahaha"); - File tmp = Files.createTempFile("pmd-ui-test", "").toFile(); + File tmp = Files.createTempFile("pmd-designer-test", "").toFile(); SettingsPersistenceUtil.persistProperties(bean, tmp);