refactor: Reorganize project structure

jreleaser · Oct 27, 2022 · fd9c66b · fd9c66b
1 parent 37bee34
commit fd9c66b
Show file tree

Hide file tree

Showing 1,174 changed files with 27,023 additions and 13,171 deletions.
diff --git a/.github/ISSUE_TEMPLATE/translation.md b/.github/ISSUE_TEMPLATE/translation.md
@@ -13,8 +13,8 @@ Would you like to add a new translation or fix/update an existing translation?
 
 Please check the translation files you want to add/fix/update:
 
- - [ ] CLI banner: (apps/jreleaser/src/main/resources/org/jreleaser/cli/Banner*.properties)
- - [ ] CLI bundle: (apps/jreleaser/src/main/resources/org/jreleaser/cli/Messages*.properties)
+ - [ ] CLI banner: (plugins/jreleaser/src/main/resources/org/jreleaser/cli/Banner*.properties)
+ - [ ] CLI bundle: (plugins/jreleaser/src/main/resources/org/jreleaser/cli/Messages*.properties)
  - [ ] core bundle: (core/jreleaser-utils/src/main/resources/org/jreleaser/bundle/Messages*.properties)
 
 A list of language codes can be found at https://sda.berkeley.edu/man41h/localelist.htm
diff --git a/.github/test-files/build-cosign.gradle b/.github/test-files/build-cosign.gradle
@@ -8,7 +8,7 @@ jreleaser {
     dryrun = true
 
     environment {
-        properties.put('jdkPathPrefix', 'apps/jreleaser/build/jdks')
+        properties.put('jdkPathPrefix', 'plugins/jreleaser/build/jdks')
         properties.put('jdkFilePrefix', 'zulu17.32.13-ca-jdk17.0.2')
     }
 
@@ -202,10 +202,10 @@ jreleaser {
                     platform = 'windows-aarch_64'
                 }
                 mainJar {
-                    path = 'apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
+                    path = 'plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
                 }
                 jars {
-                    pattern = 'apps/jreleaser/build/dependencies/flat/*.jar'
+                    pattern = 'plugins/jreleaser/build/dependencies/flat/*.jar'
                 }
             }
         }
@@ -288,12 +288,12 @@ jreleaser {
                 }
             }
             artifact {
-                path = 'apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip'
+                path = 'plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
                 extraProperties.put('skipSpec', true)
             }
             artifact {
-                path = 'apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar'
+                path = 'plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
                 extraProperties.put('skipFlatpak', true)
             }
@@ -309,7 +309,7 @@ jreleaser {
         'jreleaser-tool-provider' {
             distributionType = 'SINGLE_JAR'
             artifact {
-                path = 'apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar'
+                path = 'plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar'
             }
         }

diff --git a/.github/test-files/build-gpg.gradle b/.github/test-files/build-gpg.gradle
@@ -8,7 +8,7 @@ jreleaser {
     dryrun = true
 
     environment {
-        properties.put('jdkPathPrefix', 'apps/jreleaser/build/jdks')
+        properties.put('jdkPathPrefix', 'plugins/jreleaser/build/jdks')
         properties.put('jdkFilePrefix', 'zulu17.32.13-ca-jdk17.0.2')
     }
 
@@ -198,10 +198,10 @@ jreleaser {
                     platform = 'windows-aarch_64'
                 }
                 mainJar {
-                    path = 'apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
+                    path = 'plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
                 }
                 jars {
-                    pattern = 'apps/jreleaser/build/dependencies/flat/*.jar'
+                    pattern = 'plugins/jreleaser/build/dependencies/flat/*.jar'
                 }
             }
         }
@@ -284,12 +284,12 @@ jreleaser {
                 }
             }
             artifact {
-                path = 'apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip'
+                path = 'plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
                 extraProperties.put('skipSpec', true)
             }
             artifact {
-                path = 'apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar'
+                path = 'plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
                 extraProperties.put('skipFlatpak', true)
             }
@@ -305,7 +305,7 @@ jreleaser {
         'jreleaser-tool-provider' {
             distributionType = 'SINGLE_JAR'
             artifact {
-                path = 'apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar'
+                path = 'plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar'
                 transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar'
             }
         }

diff --git a/.github/test-files/jreleaser-cosign.yml b/.github/test-files/jreleaser-cosign.yml
@@ -1,6 +1,6 @@
 environment:
   properties:
-    jdkPathPrefix: 'apps/jreleaser/build/jdks'
+    jdkPathPrefix: 'plugins/jreleaser/build/jdks'
     jdkFilePrefix: 'zulu17.32.13-ca-jdk17.0.2'
 
 project:
@@ -162,9 +162,9 @@ assemble:
         - path: '{{jdkPathPrefix}}/zulu17WindowsArm/{{jdkFilePrefix}}-win_aarch64'
           platform: 'windows-aarch_64'
       mainJar:
-        path: 'apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
+        path: 'plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
       jars:
-        - pattern: 'apps/jreleaser/build/dependencies/flat/*.jar'
+        - pattern: 'plugins/jreleaser/build/dependencies/flat/*.jar'
 
 distributions:
   jreleaser:
@@ -236,11 +236,11 @@ distributions:
         active: release
         name: jreleaser-copr
     artifacts:
-      - path: apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
         extraProperties:
           skipSpec: true
-      - path: apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
         extraProperties:
           skipFlatpak: true
@@ -253,7 +253,7 @@ distributions:
   jreleaser-tool-provider:
     type: SINGLE_JAR
     artifacts:
-      - path: apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar
+      - path: plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar'
 
   jreleaser-standalone:

diff --git a/.github/test-files/jreleaser-gpg.yml b/.github/test-files/jreleaser-gpg.yml
@@ -1,6 +1,6 @@
 environment:
   properties:
-    jdkPathPrefix: 'apps/jreleaser/build/jdks'
+    jdkPathPrefix: 'plugins/jreleaser/build/jdks'
     jdkFilePrefix: 'zulu17.32.13-ca-jdk17.0.2'
 
 project:
@@ -159,9 +159,9 @@ assemble:
         - path: '{{jdkPathPrefix}}/zulu17WindowsArm/{{jdkFilePrefix}}-win_aarch64'
           platform: 'windows-aarch_64'
       mainJar:
-        path: 'apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
+        path: 'plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar'
       jars:
-        - pattern: 'apps/jreleaser/build/dependencies/flat/*.jar'
+        - pattern: 'plugins/jreleaser/build/dependencies/flat/*.jar'
 
 distributions:
   jreleaser:
@@ -233,11 +233,11 @@ distributions:
         active: release
         name: jreleaser-copr
     artifacts:
-      - path: apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
         extraProperties:
           skipSpec: true
-      - path: apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
         extraProperties:
           skipFlatpak: true
@@ -250,7 +250,7 @@ distributions:
   jreleaser-tool-provider:
     type: SINGLE_JAR
     artifacts:
-      - path: apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar
+      - path: plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar'
 
   jreleaser-standalone:

diff --git a/.github/test-files/pom-cosign.xml b/.github/test-files/pom-cosign.xml
@@ -76,7 +76,7 @@
                     <jreleaser>
                         <environment>
                             <properties>
-                                <jdkPathPrefix>apps/jreleaser/build/jdks</jdkPathPrefix>
+                                <jdkPathPrefix>plugins/jreleaser/build/jdks</jdkPathPrefix>
                                 <jdkFilePrefix>zulu17.32.13-ca-jdk17.0.2</jdkFilePrefix>
                             </properties>
                         </environment>
@@ -282,11 +282,11 @@
                                         </targetJdk>
                                     </targetJdks>
                                     <mainJar>
-                                        <path>apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar</path>
+                                        <path>plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar</path>
                                     </mainJar>
                                     <jars>
                                         <jar>
-                                            <pattern>apps/jreleaser/build/dependencies/flat/*.jar</pattern>
+                                            <pattern>plugins/jreleaser/build/dependencies/flat/*.jar</pattern>
                                         </jar>
                                     </jars>
                                 </jreleaser-standalone>
@@ -385,14 +385,14 @@
                                 </spec>
                                 <artifacts>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip</path>
+                                        <path>plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip</transform>
                                         <extraProperties>
                                             <skipSpec>true</skipSpec>
                                         </extraProperties>
                                     </artifact>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar</path>
+                                        <path>plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar</transform>
                                         <extraProperties>
                                             <skipFlatpak>true</skipFlatpak>
@@ -412,7 +412,7 @@
                                 <type>SINGLE_JAR</type>
                                 <artifacts>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar</path>
+                                        <path>plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar</transform>
                                     </artifact>
                                 </artifacts>

diff --git a/.github/test-files/pom-gpg.xml b/.github/test-files/pom-gpg.xml
@@ -76,7 +76,7 @@
                     <jreleaser>
                         <environment>
                             <properties>
-                                <jdkPathPrefix>apps/jreleaser/build/jdks</jdkPathPrefix>
+                                <jdkPathPrefix>plugins/jreleaser/build/jdks</jdkPathPrefix>
                                 <jdkFilePrefix>zulu17.32.13-ca-jdk17.0.2</jdkFilePrefix>
                             </properties>
                         </environment>
@@ -278,11 +278,11 @@
                                         </targetJdk>
                                     </targetJdks>
                                     <mainJar>
-                                        <path>apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar</path>
+                                        <path>plugins/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar</path>
                                     </mainJar>
                                     <jars>
                                         <jar>
-                                            <pattern>apps/jreleaser/build/dependencies/flat/*.jar</pattern>
+                                            <pattern>plugins/jreleaser/build/dependencies/flat/*.jar</pattern>
                                         </jar>
                                     </jars>
                                 </jreleaser-standalone>
@@ -381,14 +381,14 @@
                                 </spec>
                                 <artifacts>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip</path>
+                                        <path>plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip</transform>
                                         <extraProperties>
                                             <skipSpec>true</skipSpec>
                                         </extraProperties>
                                     </artifact>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar</path>
+                                        <path>plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar</transform>
                                         <extraProperties>
                                             <skipFlatpak>true</skipFlatpak>
@@ -408,7 +408,7 @@
                                 <type>SINGLE_JAR</type>
                                 <artifacts>
                                     <artifact>
-                                        <path>apps/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar</path>
+                                        <path>plugins/{{distributionName}}/build/libs/{{distributionName}}-{{projectVersion}}.jar</path>
                                         <transform>{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.jar</transform>
                                     </artifact>
                                 </artifacts>

diff --git a/.github/workflows/smoke-tests-cli.yml b/.github/workflows/smoke-tests-cli.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Prepare
         shell: bash
         run: |
-          unzip -qo apps/jreleaser/build/distributions/jreleaser-${{ needs.precheck.outputs.VERSION }}.zip
+          unzip -qo plugins/jreleaser/build/distributions/jreleaser-${{ needs.precheck.outputs.VERSION }}.zip
           cp .github/test-files/jreleaser-${{ matrix.job.sign }}.yml jreleaser.yml
 
       - name: Assemble

diff --git a/.github/workflows/step-jlink.yml b/.github/workflows/step-jlink.yml
@@ -74,10 +74,10 @@ jobs:
           retention-days: 1
           name: artifacts
           path: |
-            apps/jreleaser/build/libs/
-            apps/jreleaser/build/dependencies/
-            apps/jreleaser/build/distributions/
-            apps/jreleaser-tool-provider/build/libs/*.jar
+            plugins/jreleaser/build/libs/
+            plugins/jreleaser/build/dependencies/
+            plugins/jreleaser/build/distributions/
+            plugins/jreleaser-tool-provider/build/libs/*.jar
             plugins/jreleaser-ant-tasks/build/distributions/*.zip
 
       - name: Upload jlink

diff --git a/.github/workflows/trigger-early-access.yml b/.github/workflows/trigger-early-access.yml
@@ -36,9 +36,9 @@ jobs:
       - name: Rename artifacts
         run: |
           mkdir early-access
-          cp apps/jreleaser-tool-provider/build/VERSION early-access/VERSION
-          cp apps/jreleaser-tool-provider/build/libs/jreleaser-tool-provider-*-SNAPSHOT.jar early-access/jreleaser-tool-provider-early-access.jar
-          cp apps/jreleaser/build/distributions/jreleaser-*-SNAPSHOT.zip early-access/jreleaser-early-access.zip
+          cp plugins/jreleaser-tool-provider/build/VERSION early-access/VERSION
+          cp plugins/jreleaser-tool-provider/build/libs/jreleaser-tool-provider-*-SNAPSHOT.jar early-access/jreleaser-tool-provider-early-access.jar
+          cp plugins/jreleaser/build/distributions/jreleaser-*-SNAPSHOT.zip early-access/jreleaser-early-access.zip
           cp plugins/jreleaser-ant-tasks/build/distributions/jreleaser-ant-tasks-*-SNAPSHOT.zip early-access/jreleaser-ant-tasks-early-access.zip
 
       - name: 'Release early-access artifacts'

diff --git a/api/jreleaser-logger-api/jreleaser-logger-api.gradle b/api/jreleaser-logger-api/jreleaser-logger-api.gradle
@@ -16,22 +16,6 @@
  * limitations under the License.
  */
 dependencies {
-    api project(':jreleaser-model-api')
-    api project(':jreleaser-resource-bundle')
-
-    compileOnly "org.kordamp.jipsy:jipsy-annotations:${jipsyVersion}"
-    annotationProcessor "org.kordamp.jipsy:jipsy-processor:${jipsyVersion}"
-
-    api('kr.motd.maven:os-maven-plugin:1.7.0') { transitive = false }
-    api "com.github.spullara.mustache.java:compiler:$mustacheVersion"
-    api "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
-    api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
-    api "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
-    // checksum
-    api "commons-codec:commons-codec:$commonsCodecVersion"
-    api "org.apache.commons:commons-compress:$commonsCompressVersion"
+    api "org.slf4j:slf4j-api:$slf4jVersion"
     api "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-    api "org.zeroturnaround:zt-exec:$ztexecVersion"
-    api "com.github.veithen.cosmos.bootstrap:org.tukaani.xz:$xzVersion"
-    api "org.commonmark:commonmark:$commonmarkVersion"
 }
diff --git a/api/jreleaser-model-api/gradle.properties b/api/jreleaser-model-api/gradle.properties
@@ -16,4 +16,4 @@
 # limitations under the License.
 #
 
-project_description = JReleaser model API
+project_description = JReleaser Model API