From 5bcaf4de50e8a7dcfddf1aac6fce4a0203df467a Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 29 Aug 2024 11:07:46 +0200 Subject: [PATCH] Remove sub projects (#32) --- build.gradle | 87 ++++++++++++++----- io.github.adr.embedded.demo/build.gradle | 3 - io.github.adr.embedded/build.gradle | 53 ----------- io.github.adr.embedded/gradle.properties | 6 -- settings.gradle | 1 - .../embedded/ArchitecturallySignificant.java | 0 .../java/io/github/adr/embedded/MADR.java | 0 .../java/io/github/adr/embedded/MADRs.java | 0 .../adr/embedded/YStatementJustification.java | 0 .../embedded/YStatementJustifications.java | 0 .../main/java/io/github/adr/linked/ADR.java | 0 .../java/io/github/adr/linked/ADRref.java | 0 .../java/io/github/adr/linked/ADRrefs.java | 0 .../main/java/io/github/adr/linked/ADRs.java | 0 .../adr/embedded/AnnotatedElements.java | 0 .../ArchitecturallySignificantDemoClass.java | 0 .../ArchitecturallySignificantTest.java | 0 .../embedded/MADRAnnotationPojoDemoClass.java | 0 .../java/io/github/adr/embedded/MADRTest.java | 0 .../YStatementAnnotationDemoClass.java | 0 .../embedded/YStatementJustificationTest.java | 0 21 files changed, 66 insertions(+), 84 deletions(-) delete mode 100644 io.github.adr.embedded.demo/build.gradle delete mode 100644 io.github.adr.embedded/build.gradle delete mode 100644 io.github.adr.embedded/gradle.properties delete mode 100644 settings.gradle rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/embedded/ArchitecturallySignificant.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/embedded/MADR.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/embedded/MADRs.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/embedded/YStatementJustification.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/embedded/YStatementJustifications.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/linked/ADR.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/linked/ADRref.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/linked/ADRrefs.java (100%) rename {io.github.adr.embedded/src => src}/main/java/io/github/adr/linked/ADRs.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/AnnotatedElements.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/ArchitecturallySignificantDemoClass.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/ArchitecturallySignificantTest.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/MADRAnnotationPojoDemoClass.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/MADRTest.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/YStatementAnnotationDemoClass.java (100%) rename {io.github.adr.embedded/src => src}/test/java/io/github/adr/embedded/YStatementJustificationTest.java (100%) diff --git a/build.gradle b/build.gradle index 19f13bb..20a942d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,41 +1,86 @@ plugins { + id 'java-library' + + // maven-publish is the successor of maven plugin + // Also required by https://github.com/gradle-nexus/publish-plugin?tab=readme-ov-file + id 'maven-publish' + id 'signing' id "io.github.gradle-nexus.publish-plugin" version "2.0.0" } +apply plugin: 'java' + group = 'io.github.adr' version = '2.0.0-SNAPSHOT' -allprojects { - apply plugin: 'java' +ext.isReleaseVersion = !version.endsWith("SNAPSHOT") - group = 'io.github.adr' - version = '1.1.0-SNAPSHOT' - ext.isReleaseVersion = !version.endsWith("SNAPSHOT") +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0' + testImplementation 'org.junit.platform:junit-platform-launcher:1.10.3' +} - repositories { - mavenCentral() - } +repositories { + mavenCentral() +} - java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 - withJavadocJar() - withSourcesJar() - } + withJavadocJar() + withSourcesJar() +} + +test { + useJUnitPlatform() +} - dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0' - testImplementation 'org.junit.platform:junit-platform-launcher:1.10.3' +jar { + manifest { + attributes('Automatic-Module-Name': 'io.github.adr.embedded') } +} - test { - useJUnitPlatform() +publishing { + publications { + mavenJava(MavenPublication) { + artifactId = 'e-adr' + from components.java + pom { + name ='Embedded Architectural Decision Records' + description = 'Architectural Decision Records embedded in Java code' + url = 'https://github.com/adr/e-adr/' + + licenses { + license { + name = 'Eclipse Public License - v 2.0' + url = 'https://www.eclipse.org/org/documents/epl-2.0/' + } + } + developers { + developer { + id = 'koppor' + name = 'Oliver Kopp' + email = 'kopp.dev@gmail.com' + } + } + scm { + url = 'https://github.com/adr/e-adr' + connection = 'scm:git:https://github.com/adr/e-adr.git' + developerConnection = 'scm:git:github.com:adr/e-adr.git' + } + } + } } } -// Needs to be in the root build.gradle -// See https://github.com/gradle-nexus/publish-plugin/issues/81 for details +signing { + required = isReleaseVersion + useInMemoryPgpKeys(System.getenv("SIGNING_KEY"), System.getenv("SIGNING_PASSWORD")) + sign publishing.publications.mavenJava +} + nexusPublishing { repositories { // e-adr was registered before 2021 diff --git a/io.github.adr.embedded.demo/build.gradle b/io.github.adr.embedded.demo/build.gradle deleted file mode 100644 index dae1c01..0000000 --- a/io.github.adr.embedded.demo/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation project(":io.github.adr.embedded") -} diff --git a/io.github.adr.embedded/build.gradle b/io.github.adr.embedded/build.gradle deleted file mode 100644 index 368af79..0000000 --- a/io.github.adr.embedded/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -plugins { - id 'java-library' - - // maven-publish is the successor of maven plugin - // Also required by https://github.com/gradle-nexus/publish-plugin?tab=readme-ov-file - id 'maven-publish' - id 'signing' -} - -jar { - manifest { - attributes('Automatic-Module-Name': 'io.github.adr.embedded') - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - artifactId = 'e-adr' - from components.java - pom { - name ='Embedded Architectural Decision Records' - description = 'Architectural Decision Records embedded in Java code' - url = 'https://github.com/adr/e-adr/' - - licenses { - license { - name = 'Eclipse Public License - v 2.0' - url = 'https://www.eclipse.org/org/documents/epl-2.0/' - } - } - developers { - developer { - id = 'koppor' - name = 'Oliver Kopp' - email = 'kopp.dev@gmail.com' - } - } - scm { - url = 'https://github.com/adr/e-adr' - connection = 'scm:git:https://github.com/adr/e-adr.git' - developerConnection = 'scm:git:github.com:adr/e-adr.git' - } - } - } - } -} - -signing { - required = isReleaseVersion - useInMemoryPgpKeys(System.getenv("SIGNING_KEY"), System.getenv("SIGNING_PASSWORD")) - sign publishing.publications.mavenJava -} diff --git a/io.github.adr.embedded/gradle.properties b/io.github.adr.embedded/gradle.properties deleted file mode 100644 index 905f47a..0000000 --- a/io.github.adr.embedded/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -signing.keyId= -signing.password= -signing.secretKeyRingFile= - -ossrhUsername= -ossrhPassword= diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index d4ae083..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'io.github.adr.embedded', 'io.github.adr.embedded.demo' diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/embedded/ArchitecturallySignificant.java b/src/main/java/io/github/adr/embedded/ArchitecturallySignificant.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/embedded/ArchitecturallySignificant.java rename to src/main/java/io/github/adr/embedded/ArchitecturallySignificant.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/embedded/MADR.java b/src/main/java/io/github/adr/embedded/MADR.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/embedded/MADR.java rename to src/main/java/io/github/adr/embedded/MADR.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/embedded/MADRs.java b/src/main/java/io/github/adr/embedded/MADRs.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/embedded/MADRs.java rename to src/main/java/io/github/adr/embedded/MADRs.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/embedded/YStatementJustification.java b/src/main/java/io/github/adr/embedded/YStatementJustification.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/embedded/YStatementJustification.java rename to src/main/java/io/github/adr/embedded/YStatementJustification.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/embedded/YStatementJustifications.java b/src/main/java/io/github/adr/embedded/YStatementJustifications.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/embedded/YStatementJustifications.java rename to src/main/java/io/github/adr/embedded/YStatementJustifications.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/linked/ADR.java b/src/main/java/io/github/adr/linked/ADR.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/linked/ADR.java rename to src/main/java/io/github/adr/linked/ADR.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRref.java b/src/main/java/io/github/adr/linked/ADRref.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRref.java rename to src/main/java/io/github/adr/linked/ADRref.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRrefs.java b/src/main/java/io/github/adr/linked/ADRrefs.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRrefs.java rename to src/main/java/io/github/adr/linked/ADRrefs.java diff --git a/io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRs.java b/src/main/java/io/github/adr/linked/ADRs.java similarity index 100% rename from io.github.adr.embedded/src/main/java/io/github/adr/linked/ADRs.java rename to src/main/java/io/github/adr/linked/ADRs.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/AnnotatedElements.java b/src/test/java/io/github/adr/embedded/AnnotatedElements.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/AnnotatedElements.java rename to src/test/java/io/github/adr/embedded/AnnotatedElements.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/ArchitecturallySignificantDemoClass.java b/src/test/java/io/github/adr/embedded/ArchitecturallySignificantDemoClass.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/ArchitecturallySignificantDemoClass.java rename to src/test/java/io/github/adr/embedded/ArchitecturallySignificantDemoClass.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/ArchitecturallySignificantTest.java b/src/test/java/io/github/adr/embedded/ArchitecturallySignificantTest.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/ArchitecturallySignificantTest.java rename to src/test/java/io/github/adr/embedded/ArchitecturallySignificantTest.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/MADRAnnotationPojoDemoClass.java b/src/test/java/io/github/adr/embedded/MADRAnnotationPojoDemoClass.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/MADRAnnotationPojoDemoClass.java rename to src/test/java/io/github/adr/embedded/MADRAnnotationPojoDemoClass.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/MADRTest.java b/src/test/java/io/github/adr/embedded/MADRTest.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/MADRTest.java rename to src/test/java/io/github/adr/embedded/MADRTest.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/YStatementAnnotationDemoClass.java b/src/test/java/io/github/adr/embedded/YStatementAnnotationDemoClass.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/YStatementAnnotationDemoClass.java rename to src/test/java/io/github/adr/embedded/YStatementAnnotationDemoClass.java diff --git a/io.github.adr.embedded/src/test/java/io/github/adr/embedded/YStatementJustificationTest.java b/src/test/java/io/github/adr/embedded/YStatementJustificationTest.java similarity index 100% rename from io.github.adr.embedded/src/test/java/io/github/adr/embedded/YStatementJustificationTest.java rename to src/test/java/io/github/adr/embedded/YStatementJustificationTest.java