diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 00e19ea..82ea0f1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -25,8 +25,7 @@ jobs: strategy: matrix: java-version: [ 17 ] - os: [ ubuntu-20.04, windows-latest, macos-latest ] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-20.04 steps: - name: Check out Git repository uses: actions/checkout@v3 @@ -49,71 +48,18 @@ jobs: with: java-version: 17 distribution: 'temurin' - - name: publish to snapshot - run: ./mvnw -Pnative,dist package -e -B - - run: mkdir staging && cp -r target/distributions/*.* staging - - uses: actions/upload-artifact@v3 - with: - name: Package - path: staging - - release-macos: - needs: verify - runs-on: macos-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v3 - - name: Install GraalVM - uses: graalvm/setup-graalvm@v1 + - uses: luangong/setup-install4j@v1 with: - java-version: 17 - distribution: 'graalvm' - - name: Set up GraalVM Native Image toolchain - uses: helpermethod/graalvm-native-image-toolchain@0.0.2 - with: - java-version: 17 - graalvm-version: '22.3.2' - - - name: Install Java and Maven - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - - name: publish to snapshot - run: ./mvnw -Pnative,dist package -e -B - - run: mkdir staging && cp -r target/distributions/*.* staging - - uses: actions/upload-artifact@v3 - with: - name: Package - path: staging - - release-windows: - needs: verify - runs-on: windows-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v3 - - - name: Install GraalVM - uses: graalvm/setup-graalvm@v1 - with: - java-version: 17 - distribution: 'graalvm' - - name: Set up GraalVM Native Image toolchain - uses: helpermethod/graalvm-native-image-toolchain@0.0.2 - with: - java-version: 17 - graalvm-version: '22.3.2' - - - name: Install Java and Maven - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - - name: publish to snapshot - run: ./mvnw -P 'native,dist' package -e -B - - run: mkdir staging && cp -r target/distributions/*.* staging + version: 10.0.6 + license: ${{ secrets.INSTALL4J_LICENSE }} + - name: development media + if: false == contains(github.ref, 'master') + run: ./mvnw -Pinstall4j package -e -B + - name: release media + if: contains(github.ref, 'master') + run: ./mvnw -Pinstall4j,release package -e -B + - run: mkdir staging && cp -r target/media/*.* staging - uses: actions/upload-artifact@v3 with: name: Package diff --git a/domino-cli.install4j b/domino-cli.install4j new file mode 100644 index 0000000..f9a2701 --- /dev/null +++ b/domino-cli.install4j @@ -0,0 +1,509 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sys.installationDir + + + context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); +return console.askOkCancel(message, true); + + + + + + + + updateCheck + + + + + ${i18n:ClickNext} + + + + + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + sys.installationDir + + + context.getVariable("sys.responseFile") == null + + + + + + ${i18n:SelectDirLabel(${compiler:sys.fullName})} + + + + + + + + suggestAppDir + validateApplicationId + existingDirWarning + checkWritable + manualEntryAllowed + checkFreeSpace + showRequiredDiskSpace + showFreeDiskSpace + allowSpacesOnUnix + validationScript + standardValidation + + + + + + + + + ${i18n:SelectComponentsLabel2} + + !context.isConsole() + + + + + + + selectionChangedScript + + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + ${compiler:sys.fullName} ${compiler:sys.version} + + + + + + ${installer:sys.installationDir} + Path + + + + + + + ${i18n:WizardPreparing} + + + + + + + + + ${form:finishedMessage} + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + + + + + + + + + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); +return console.askYesNo(message, true); + + + + + + + + + + + + + + + ${i18n:UninstallerPreparing} + + + + + + + + + + ${form:successMessage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logo/domino-logo-128x128.png b/logo/domino-logo-128x128.png old mode 100644 new mode 100755 index 797d242..a7cc788 Binary files a/logo/domino-logo-128x128.png and b/logo/domino-logo-128x128.png differ diff --git a/logo/domino-logo-16x16.png b/logo/domino-logo-16x16.png old mode 100644 new mode 100755 index ceff17a..df68594 Binary files a/logo/domino-logo-16x16.png and b/logo/domino-logo-16x16.png differ diff --git a/logo/domino-logo-24x24.png b/logo/domino-logo-24x24.png new file mode 100755 index 0000000..618ef8f Binary files /dev/null and b/logo/domino-logo-24x24.png differ diff --git a/logo/domino-logo-32x32.png b/logo/domino-logo-32x32.png index 0a9c439..fef326f 100644 Binary files a/logo/domino-logo-32x32.png and b/logo/domino-logo-32x32.png differ diff --git a/logo/domino-logo-48x48.png b/logo/domino-logo-48x48.png old mode 100644 new mode 100755 index ae206f0..ae982eb Binary files a/logo/domino-logo-48x48.png and b/logo/domino-logo-48x48.png differ diff --git a/logo/domino-logo-64x64.png b/logo/domino-logo-64x64.png old mode 100644 new mode 100755 index 88a7dfe..1c68e79 Binary files a/logo/domino-logo-64x64.png and b/logo/domino-logo-64x64.png differ diff --git a/logo/domino-logo-96x96.png b/logo/domino-logo-96x96.png index dd5503b..b383f3d 100644 Binary files a/logo/domino-logo-96x96.png and b/logo/domino-logo-96x96.png differ diff --git a/logo/domino-logo.ico b/logo/domino-logo.ico index c5cd5b4..6a2f08d 100644 Binary files a/logo/domino-logo.ico and b/logo/domino-logo.ico differ diff --git a/logo/domino-logo.jpg b/logo/domino-logo.jpg old mode 100755 new mode 100644 index 044df50..f077631 Binary files a/logo/domino-logo.jpg and b/logo/domino-logo.jpg differ diff --git a/logo/domino-logo.png b/logo/domino-logo.png index e869843..a7cc788 100755 Binary files a/logo/domino-logo.png and b/logo/domino-logo.png differ diff --git a/pom.xml b/pom.xml index 4fe3c38..d64e715 100644 --- a/pom.xml +++ b/pom.xml @@ -1,291 +1,214 @@ - - 4.0.0 - org.dominokit - domino-cli - 1.0.0-RC5 - - HEAD-SNAPSHOT - 1.0.0-RC6 - 3.11.0 - 17 - UTF-8 - UTF-8 - quarkus-bom - io.quarkus.platform - 3.1.2.Final - true - 3.0.0 - - ${project.build.directory}/distributions - - + + 4.0.0 + org.dominokit + domino-cli + 1.0.0 + + HEAD-SNAPSHOT + 1.0.0 + ${next.release.version}-${snapshot.version} + 3.11.0 + 17 + UTF-8 + UTF-8 + quarkus-bom + io.quarkus.platform + 3.1.2.Final + true + 3.0.0 + + /opt/install4j + + + + + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + - - ${quarkus.platform.group-id} - ${quarkus.platform.artifact-id} - ${quarkus.platform.version} - pom - import - + + io.quarkus + quarkus-picocli + + + io.quarkus + quarkus-arc + + + io.quarkus + quarkus-junit5 + test + + + commons-io + commons-io + 2.7 + + + org.apache.velocity + velocity + 1.7 + + + org.apache.velocity + velocity-tools + 2.0 + + + org.dominokit + domino-jackson + 1.0.0-RC6 + + + org.dominokit + domino-jackson-processor + 1.0.0-RC6 + provided + + + org.apache.maven + maven-model-builder + 3.6.1 + + + org.apache.maven.shared + maven-invoker + 3.0.1 + + + io.quarkiverse.freemarker + quarkus-freemarker + 1.0.0 + - - - - io.quarkus - quarkus-picocli - - - io.quarkus - quarkus-arc - - - io.quarkus - quarkus-junit5 - test - - - commons-io - commons-io - 2.7 - - - org.apache.velocity - velocity - 1.7 - - - org.apache.velocity - velocity-tools - 2.0 - - - org.dominokit - domino-jackson - 1.0.0-RC6 - - - org.dominokit - domino-jackson-processor - 1.0.0-RC6 - provided - - - org.apache.maven - maven-model-builder - 3.6.1 - - - org.apache.maven.shared - maven-invoker - 3.0.1 - - - io.quarkiverse.freemarker - quarkus-freemarker - 1.0.0 - - - - - - kr.motd.maven - os-maven-plugin - 1.7.1 - - - - - ${quarkus.platform.group-id} - quarkus-maven-plugin - ${quarkus.platform.version} - true - - - - build - generate-code - generate-code-tests - - - - - - maven-compiler-plugin - ${compiler-plugin.version} - - - -parameters - - - - - maven-surefire-plugin - ${surefire-plugin.version} - - - org.jboss.logmanager.LogManager - ${maven.home} - - - - - maven-failsafe-plugin - ${surefire-plugin.version} - - - - integration-test - verify - - - - ${project.build.directory}/${project.build.finalName}-runner${executable-suffix} - org.jboss.logmanager.LogManager - ${maven.home} - - - - - - - org.dominokit - gitflow-maven-plugin - 1.0.0 - - snapshot.version - next.release.version - - true + + + + ${quarkus.platform.group-id} + quarkus-maven-plugin + ${quarkus.platform.version} + true + + + + build + generate-code + generate-code-tests + + + ${project.artifactId}-fat + + + + + + maven-compiler-plugin + ${compiler-plugin.version} + + + -parameters + + + + + maven-surefire-plugin + ${surefire-plugin.version} + + + org.jboss.logmanager.LogManager + ${maven.home} + + + + + org.dominokit + gitflow-maven-plugin + 1.0.0 + + snapshot.version + next.release.version + + true - - ${bump.digit} + + ${bump.digit} - - verify - verify + + verify + verify - - - master - - development - - - - - - - - native - - - native - - - - false - native - - - - dist - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - false - false - ${project.artifactId}-${project.version}-${os.detected.classifier} - ${distribution.directory} - ${project.build.directory}/assembly/work - - src/main/assembly/assembly.xml - - - - - make-distribution - package - - single - - - - - - - - - dist-windows - - - windows - - - - .exe - - - - release - - - - org.jreleaser - jreleaser-maven-plugin - 1.6.0 - - - app - Sample Quarkus CLI application - - https://github.com/aalmiray/app - https://github.com/aalmiray/app - - APACHE-2.0 - Andres Almiray - 2021 Kordamp - - - - - - ALWAYS - conventional-commits - - - - - - BINARY - - - ${distribution.directory}/{{distributionName}}-{{projectVersion}}-linux-x86_64.tar.gz - linux-x86_64 - - - ${distribution.directory}/{{distributionName}}-{{projectVersion}}-windows-x86_64.zip - windows-x86_64 - - - ${distribution.directory}/{{distributionName}}-{{projectVersion}}-osx-x86_64.zip - osx-x86_64 - - - - - - - + + + master + + development + + + - - - + + + + + release + + + release + + + + ${project.version} + + + + install4j + + + install4j + + + + + + com.install4j + install4j-maven + 10.0.6 + + + compile-installers + package + + compile + + + ${install4j.home} + ${project.basedir}/domino-cli.install4j + ${release.version} + + + + + + + + + + + + ej-technologies + https://maven.ej-technologies.com/repository + + + diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml deleted file mode 100644 index 2cf3ef5..0000000 --- a/src/main/assembly/assembly.xml +++ /dev/null @@ -1,18 +0,0 @@ - - dist - - tar.gz - zip - dir - - - - ${project.build.directory}/${project.artifactId}-${project.version}-runner${executable-suffix} - ./bin - dominokit${executable-suffix} - - - \ No newline at end of file diff --git a/src/main/java/org/dominokit/cli/generator/Versions.java b/src/main/java/org/dominokit/cli/generator/Versions.java index 7ece94c..31a7a83 100644 --- a/src/main/java/org/dominokit/cli/generator/Versions.java +++ b/src/main/java/org/dominokit/cli/generator/Versions.java @@ -1,11 +1,11 @@ package org.dominokit.cli.generator; public enum Versions { - domino_ui_version("DOMINO_CLI_DOMINO_UI_VERSION","1.0.0-RC19"), - domino_history_version("DOMINO_CLI_DOMINO_HISTORY_VERSION","1.0.0-RC5"), - domino_mvp_version("DOMINO_CLI_DOMINO_MVP_VERSION","1.0.0-RC11"), - domino_rest_version("DOMINO_CLI_DOMINO_REST_VERSION","1.0.0-RC7"), - domino_jackson_version("DOMINO_CLI_DOMINO_JACKSON_VERSION","1.0.0-RC4"), + domino_ui_version("DOMINO_CLI_DOMINO_UI_VERSION","1.0.0"), + domino_history_version("DOMINO_CLI_DOMINO_HISTORY_VERSION","1.0.0"), + domino_mvp_version("DOMINO_CLI_DOMINO_MVP_VERSION","1.0.0"), + domino_rest_version("DOMINO_CLI_DOMINO_REST_VERSION","1.0.0"), + domino_jackson_version("DOMINO_CLI_DOMINO_JACKSON_VERSION","1.0.0"), quarkus_version("DOMINO_CLI_QUARKUS_VERSION","2.16.7.Final"), vertx_version("DOMINO_CLI_VERTX_VERSION","3.9.0"), gwt_version("DOMINO_CLI_GWT_VERSION","2.10.0"), diff --git a/src/main/java/org/dominokit/cli/generator/project/gwt/GwtMVPProject.java b/src/main/java/org/dominokit/cli/generator/project/gwt/GwtMVPProject.java index 4650a7e..710f07b 100644 --- a/src/main/java/org/dominokit/cli/generator/project/gwt/GwtMVPProject.java +++ b/src/main/java/org/dominokit/cli/generator/project/gwt/GwtMVPProject.java @@ -20,7 +20,7 @@ public void create(Project project) { .add(new Folder("runConfigurations") .add(new TemplatedFile("ALL_TESTS.xml", "/app/gwt/mvp/runConfigurations/ALL_TESTS.xml")) .add(new TemplatedFile(project.getName() + ".xml", "/app/gwt/mvp/runConfigurations/app.xml")) - .add(new TemplatedFile(project.getName() + "-api.xml", "/app/gwt/mvp/runConfigurations/app-api.xml")) + .add(new TemplatedFile(project.getName() + "-api.xml", "/app/gwt/mvp/runConfigurations/backend-api.xml")) .add(new TemplatedFile(project.getName() + "-dev.xml", "/app/gwt/mvp/runConfigurations/app-dev.xml")) .add(new TemplatedFile("Development.xml", "/app/gwt/mvp/runConfigurations/Development.xml")) .add(new TemplatedFile("process_sources.xml", "/app/gwt/mvp/runConfigurations/process_sources.xml")) diff --git a/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clMVPProject.java b/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clMVPProject.java index a7a00c9..53cb534 100644 --- a/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clMVPProject.java +++ b/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clMVPProject.java @@ -20,7 +20,7 @@ public void create(Project project){ .add(new Folder("runConfigurations") .add(new TemplatedFile("ALL_TESTS.xml", "/app/j2cl/mvp/runConfigurations/ALL_TESTS.xml")) .add(new TemplatedFile(project.getName()+".xml", "/app/j2cl/mvp/runConfigurations/app.xml")) - .add(new TemplatedFile(project.getName()+"-api.xml", "/app/j2cl/mvp/runConfigurations/app-api.xml")) + .add(new TemplatedFile(project.getName()+"-api.xml", "/app/j2cl/mvp/runConfigurations/backend-api.xml")) .add(new TemplatedFile(project.getName()+"-dev.xml", "/app/j2cl/mvp/runConfigurations/app-dev.xml")) .add(new TemplatedFile("Development.xml", "/app/j2cl/mvp/runConfigurations/Development.xml")) .add(new TemplatedFile("process_sources.xml", "/app/j2cl/mvp/runConfigurations/process_sources.xml")) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 09b8c5f..df956af 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,3 @@ -quarkus.native.resources.includes=projects-templates/** \ No newline at end of file +quarkus.native.resources.includes=projects-templates/** +quarkus.package.type=uber-jar +quarkus.package.add-runner-suffix=false diff --git a/src/main/resources/logo-128.png b/src/main/resources/logo-128.png new file mode 100755 index 0000000..a7cc788 Binary files /dev/null and b/src/main/resources/logo-128.png differ diff --git a/src/main/resources/projects-templates/app/gwt/basic/client/source/App.java b/src/main/resources/projects-templates/app/gwt/basic/client/source/App.java index 26a9233..bdfbc06 100644 --- a/src/main/resources/projects-templates/app/gwt/basic/client/source/App.java +++ b/src/main/resources/projects-templates/app/gwt/basic/client/source/App.java @@ -1,7 +1,7 @@ package ${rootPackage}; import com.google.gwt.core.client.EntryPoint; -import org.dominokit.domino.ui.Typography.Paragraph; +import org.dominokit.domino.ui.typography.Paragraph; import org.dominokit.domino.ui.cards.Card; import org.dominokit.domino.ui.icons.Icons; import org.dominokit.domino.ui.layout.Layout; diff --git a/src/main/resources/projects-templates/app/gwt/basic/pom.ftl b/src/main/resources/projects-templates/app/gwt/basic/pom.ftl index cb8821d..e10bdff 100644 --- a/src/main/resources/projects-templates/app/gwt/basic/pom.ftl +++ b/src/main/resources/projects-templates/app/gwt/basic/pom.ftl @@ -14,6 +14,7 @@ UTF-8 UTF-8 ${domino_ui_version} + ${gwt_version} @@ -21,7 +22,7 @@ com.google.gwt gwt - 2.9.0 + ${r"${gwt.version}"} pom import @@ -49,14 +50,17 @@ org.apache.maven.plugins maven-compiler-plugin - - - 3.5.1 + 3.11.0 ${r"${maven.compiler.source}"} ${r"${maven.compiler.target}"} + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + org.eclipse.jetty jetty-maven-plugin @@ -65,7 +69,7 @@ net.ltgt.gwt.maven gwt-maven-plugin - 1.0.0 + 1.0.1 true ${r"${maven.compiler.source}"} diff --git a/src/main/resources/projects-templates/app/gwt/mvp/pom.ftl b/src/main/resources/projects-templates/app/gwt/mvp/pom.ftl index 7ce1c04..36dedcc 100644 --- a/src/main/resources/projects-templates/app/gwt/mvp/pom.ftl +++ b/src/main/resources/projects-templates/app/gwt/mvp/pom.ftl @@ -144,7 +144,7 @@ net.ltgt.gwt.maven gwt-maven-plugin - 1.0.0 + 1.0.1 true ${r"${maven.compiler.source}"} diff --git a/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/Development.xml b/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/Development.xml index 845698f..5d04c02 100644 --- a/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/Development.xml +++ b/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/Development.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/app-api.xml b/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/app-api.xml deleted file mode 100644 index 11177ec..0000000 --- a/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/app-api.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/backend-api.xml b/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/backend-api.xml new file mode 100644 index 0000000..443c0e1 --- /dev/null +++ b/src/main/resources/projects-templates/app/gwt/mvp/runConfigurations/backend-api.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/projects-templates/app/j2cl/basic/client/pom.xml b/src/main/resources/projects-templates/app/j2cl/basic/client/pom.xml index 3acc4a4..cc4ceb0 100644 --- a/src/main/resources/projects-templates/app/j2cl/basic/client/pom.xml +++ b/src/main/resources/projects-templates/app/j2cl/basic/client/pom.xml @@ -43,14 +43,17 @@ maven-compiler-plugin - - - 3.5.1 + 3.11.0 ${r"${maven.compiler.source}"} ${r"${maven.compiler.target}"} + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + maven-source-plugin 3.0.1 diff --git a/src/main/resources/projects-templates/app/j2cl/basic/pom.ftl b/src/main/resources/projects-templates/app/j2cl/basic/pom.ftl index 75f2977..9660b4e 100644 --- a/src/main/resources/projects-templates/app/j2cl/basic/pom.ftl +++ b/src/main/resources/projects-templates/app/j2cl/basic/pom.ftl @@ -45,14 +45,17 @@ org.apache.maven.plugins maven-compiler-plugin - - - 3.5.1 + 3.11.0 ${r"${maven.compiler.source}"} ${r"${maven.compiler.target}"} + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + org.eclipse.jetty jetty-maven-plugin