From 9c08a2059acf037652cbc362ba7892b682525090 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Tue, 19 Dec 2023 16:41:34 +0100 Subject: [PATCH 01/10] set version to HEAD-SNAPSHOT --- .../eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java | 2 +- nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java | 2 +- nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java index 07680870..f5e08278 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java @@ -34,7 +34,7 @@ public void logProcessorVersion() { this.eventBus.fireEvent(LogEvent.create() .sdmOnly(true) .addMessage("=================================================================================") - .addMessage("Nalu processor version >>2.12.7<< used to generate this source") + .addMessage("Nalu processor version >>HEAD-SNAPSHOT<< used to generate this source") .addMessage("=================================================================================") .addMessage("")); } diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java index 329d934d..4e71c08f 100644 --- a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java +++ b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java @@ -23,7 +23,7 @@ public class Nalu { public static String getVersion() { // TODO Change this for other versions - return "2.12.7"; + return "HEAD-SNAPSHOT"; } public static boolean hasHistory() { diff --git a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java index 9aed78d1..0d191cee 100644 --- a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java +++ b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java @@ -14,7 +14,7 @@ public class NaluTest { void getVersion() throws IOException { // TODO Change this if you want to test against another version - Assertions.assertEquals("2.12.7", + Assertions.assertEquals("HEAD-SNAPSHOT", Nalu.getVersion()); } diff --git a/pom.xml b/pom.xml index ad2990e2..31dbc113 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ - 2.12.7 + HEAD-SNAPSHOT github From 3de97996edf2c895b95de0b99a760caf3912925e Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Fri, 22 Dec 2023 11:42:45 +0100 Subject: [PATCH 02/10] prevent running workflow in case only the README is changed --- .github/workflows/build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 893ac462..4655cbf4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,10 +21,8 @@ on: branches: - dev - main - pull_request: - branches: - - dev - - main + paths-ignore: + - "README.md" jobs: build: runs-on: ubuntu-latest From 4f727effa26037580768eabd1474debd4d38a403 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Fri, 5 Jan 2024 09:46:38 +0100 Subject: [PATCH 03/10] #347 fixed --- .github/workflows/build.yaml | 2 +- ...ow-runs.yaml => delete-workflow-runs.yaml} | 0 .../nalukit/nalu/processor/NaluProcessor.java | 11 ++- .../generator/ControllerGenerator.java | 12 +-- .../processor/generator/ModuleGenerator.java | 29 ++---- .../generator/PopUpControllerGenerator.java | 9 +- .../processor/generator/ShellGenerator.java | 13 +-- .../nalu/processor/model/MetaModel.java | 92 +++++++++++-------- pom.xml | 9 -- 9 files changed, 84 insertions(+), 93 deletions(-) rename .github/workflows/{delete-old-workflow-runs.yaml => delete-workflow-runs.yaml} (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4655cbf4..cca24b7a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,7 +63,7 @@ jobs: needs: test services: owasp-db: - image: philkohl/owasp-maven-action:latest + image: nalusolutionsgmbh/owasp-maven-action:latest options: --entrypoint /bin/sh --name owasp-db --hostname owasp-db steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/delete-old-workflow-runs.yaml b/.github/workflows/delete-workflow-runs.yaml similarity index 100% rename from .github/workflows/delete-old-workflow-runs.yaml rename to .github/workflows/delete-workflow-runs.yaml diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java index 0071e6a2..9b133dc1 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/NaluProcessor.java @@ -481,7 +481,7 @@ private void handleErrorPopUpControllerAnnotation(RoundEnvironment roundEnv) errorPopUpControllerModels.add(errorPopUpControllerModel); } // save data in metaModel - if (errorPopUpControllerModels.size() > 0) { + if (!errorPopUpControllerModels.isEmpty()) { this.metaModel.setErrorPopUpController(errorPopUpControllerModels.get(0)); } } @@ -845,9 +845,12 @@ private MetaModel restore() { .getResource(StandardLocation.CLASS_OUTPUT, "", this.createRelativeFileName()); - return gson.fromJson(resource.getCharContent(true) - .toString(), - MetaModel.class); + MetaModel model = gson.fromJson(resource.getCharContent(true) + .toString(), + MetaModel.class); + // clear working lists + model.clearGeneratedConditionList(); + return model; } catch (IOException e) { // every thing is ok -> no operation return null; diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ControllerGenerator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ControllerGenerator.java index e6974e6d..9328746b 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ControllerGenerator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ControllerGenerator.java @@ -81,9 +81,8 @@ private void generateLoadControllers() { .getSimpleName() + ProcessorConstants.CREATOR_IMPL)); - if (controllerModel.getComposites() - .size() > 0) { - List generatedConditionClassNames = new ArrayList<>(); + if (!controllerModel.getComposites() + .isEmpty()) { controllerModel.getComposites() .forEach(controllerCompositeModel -> { if (AlwaysLoadComposite.class.getSimpleName() @@ -103,8 +102,7 @@ private void generateLoadControllers() { .getSimpleName()); } else { String conditionVariableName; - if (generatedConditionClassNames.contains(controllerCompositeModel.getCondition() - .getClassName())) { + if (this.metaModel.isCondtionAlreadyGenerated(controllerCompositeModel.getCondition())) { conditionVariableName = this.setFirstCharacterToLowerCase(controllerCompositeModel.getCondition() .getSimpleName()) + this.getNameWithVariableCount(controllerCompositeModel.getCondition(), @@ -114,7 +112,6 @@ private void generateLoadControllers() { .getSimpleName()) + this.getNameWithVariableCount(controllerCompositeModel.getCondition(), true); - loadComponentsMethodBuilder.addStatement("$T $L = new $T()", ClassName.get(controllerCompositeModel.getCondition() .getPackage(), @@ -128,8 +125,7 @@ private void generateLoadControllers() { .addStatement("$L.setContext(super.context)", conditionVariableName); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(controllerCompositeModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(controllerCompositeModel.getCondition()); } loadComponentsMethodBuilder.addStatement("$T.INSTANCE.registerCondition($S, $S, $L)", ClassName.get(CompositeConditionFactory.class), diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ModuleGenerator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ModuleGenerator.java index c625f6cb..f2212f28 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ModuleGenerator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ModuleGenerator.java @@ -190,9 +190,8 @@ private void generateLoadShellFactory(TypeSpec.Builder typeSpec) { .getSimpleName() + ProcessorConstants.CREATOR_IMPL)); - if (shellModel.getComposites() - .size() > 0) { - List generatedConditionClassNames = new ArrayList<>(); + if (!shellModel.getComposites() + .isEmpty()) { shellModel.getComposites() .forEach(controllerCompositeModel -> { if (AlwaysLoadComposite.class.getSimpleName() @@ -211,8 +210,7 @@ private void generateLoadShellFactory(TypeSpec.Builder typeSpec) { controllerCompositeModel.getComposite() .getSimpleName()); } else { - if (!generatedConditionClassNames.contains(controllerCompositeModel.getCondition() - .getClassName())) { + if (!this.metaModel.isCondtionAlreadyGenerated(controllerCompositeModel.getCondition())) { loadShellFactoryMethodBuilder.addStatement("$T $L = new $T()", ClassName.get(controllerCompositeModel.getCondition() .getPackage(), @@ -228,8 +226,7 @@ private void generateLoadShellFactory(TypeSpec.Builder typeSpec) { this.setFirstCharacterToLowerCase(controllerCompositeModel.getCondition() .getSimpleName())); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(controllerCompositeModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(controllerCompositeModel.getCondition()); } loadShellFactoryMethodBuilder.addStatement("$T.INSTANCE.registerCondition($S, $S, $L)", ClassName.get(CompositeConditionFactory.class), @@ -293,9 +290,8 @@ private void generateLoadContollers(TypeSpec.Builder typeSpec) { .getSimpleName() + ProcessorConstants.CREATOR_IMPL)); - if (controllerModel.getComposites() - .size() > 0) { - List generatedConditionClassNames = new ArrayList<>(); + if (!controllerModel.getComposites() + .isEmpty()) { controllerModel.getComposites() .forEach(controllerCompositeModel -> { if (AlwaysLoadComposite.class.getSimpleName() @@ -314,8 +310,7 @@ private void generateLoadContollers(TypeSpec.Builder typeSpec) { controllerCompositeModel.getComposite() .getSimpleName()); } else { - if (!generatedConditionClassNames.contains(controllerCompositeModel.getCondition() - .getClassName())) { + if (!this.metaModel.isCondtionAlreadyGenerated(controllerCompositeModel.getCondition())) { loadComponentsMethodBuilder.addStatement("$T $L = new $T()", ClassName.get(controllerCompositeModel.getCondition() .getPackage(), @@ -331,8 +326,7 @@ private void generateLoadContollers(TypeSpec.Builder typeSpec) { this.setFirstCharacterToLowerCase(controllerCompositeModel.getCondition() .getSimpleName())); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(controllerCompositeModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(controllerCompositeModel.getCondition()); } loadComponentsMethodBuilder.addStatement("$T.INSTANCE.registerCondition($S, $S, $L)", ClassName.get(CompositeConditionFactory.class), @@ -514,7 +508,6 @@ private void generateLoadPopUpControllers(TypeSpec.Builder typeSpec) { MethodSpec.Builder loadPopUpControllersMethod = MethodSpec.methodBuilder("loadPopUpControllers") .addAnnotation(Override.class) .addModifiers(Modifier.PUBLIC); - List generatedConditionClassNames = new ArrayList<>(); this.metaModel.getPopUpControllers() .forEach(popUpControllerModel -> { loadPopUpControllersMethod.addStatement("$T.INSTANCE.registerPopUpController($S, new $L(super.router, super.moduleContext, super.eventBus))", @@ -533,8 +526,7 @@ private void generateLoadPopUpControllers(TypeSpec.Builder typeSpec) { popUpControllerModel.getName()); } else { String conditionVariableName; - if (generatedConditionClassNames.contains(popUpControllerModel.getCondition() - .getClassName())) { + if (this.metaModel.isCondtionAlreadyGenerated(popUpControllerModel.getCondition())) { conditionVariableName = this.setFirstCharacterToLowerCase(popUpControllerModel.getCondition() .getSimpleName()) + this.getNameWithVariableCount(popUpControllerModel.getCondition(), @@ -558,8 +550,7 @@ private void generateLoadPopUpControllers(TypeSpec.Builder typeSpec) { .addStatement("$L.setContext(super.context)", conditionVariableName); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(popUpControllerModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(popUpControllerModel.getCondition()); } loadPopUpControllersMethod.addStatement("$T.INSTANCE.registerCondition($S, $L)", ClassName.get(PopUpConditionFactory.class), diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/PopUpControllerGenerator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/PopUpControllerGenerator.java index 989e32b7..c9dad451 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/PopUpControllerGenerator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/PopUpControllerGenerator.java @@ -26,9 +26,7 @@ import com.squareup.javapoet.TypeSpec; import javax.lang.model.element.Modifier; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; public class PopUpControllerGenerator { @@ -56,7 +54,6 @@ void generate() { MethodSpec.Builder loadPopUpControllerFactoryMethodBuilder = MethodSpec.methodBuilder("loadPopUpControllerFactory") .addModifiers(Modifier.PUBLIC) .addAnnotation(Override.class); - List generatedConditionClassNames = new ArrayList<>(); this.metaModel.getPopUpControllers() .forEach(popUpControllerModel -> { loadPopUpControllerFactoryMethodBuilder.addStatement("$T.INSTANCE.registerPopUpController($S, new $L(router, context, eventBus))", @@ -75,8 +72,7 @@ void generate() { popUpControllerModel.getName()); } else { String conditionVariableName; - if (generatedConditionClassNames.contains(popUpControllerModel.getCondition() - .getClassName())) { + if (this.metaModel.isCondtionAlreadyGenerated(popUpControllerModel.getCondition())) { conditionVariableName = this.setFirstCharacterToLowerCase(popUpControllerModel.getCondition() .getSimpleName()) + this.getNameWithVariableCount(popUpControllerModel.getCondition(), @@ -100,8 +96,7 @@ void generate() { .addStatement("$L.setContext(super.context)", conditionVariableName); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(popUpControllerModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(popUpControllerModel.getCondition()); } loadPopUpControllerFactoryMethodBuilder.addStatement("$T.INSTANCE.registerCondition($S, $L)", ClassName.get(PopUpConditionFactory.class), diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ShellGenerator.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ShellGenerator.java index a3dae479..d269f3b2 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ShellGenerator.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/generator/ShellGenerator.java @@ -27,9 +27,7 @@ import com.squareup.javapoet.TypeSpec; import javax.lang.model.element.Modifier; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; public class ShellGenerator { @@ -96,9 +94,8 @@ private void generateLoadShellFactory() { .getSimpleName() + ProcessorConstants.CREATOR_IMPL)); - if (shellModel.getComposites() - .size() > 0) { - List generatedConditionClassNames = new ArrayList<>(); + if (!shellModel.getComposites() + .isEmpty()) { shellModel.getComposites() .forEach(controllerCompositeModel -> { if (AlwaysLoadComposite.class.getSimpleName() @@ -118,8 +115,7 @@ private void generateLoadShellFactory() { .getSimpleName()); } else { String conditionVariableName; - if (generatedConditionClassNames.contains(controllerCompositeModel.getCondition() - .getClassName())) { + if (this.metaModel.isCondtionAlreadyGenerated(controllerCompositeModel.getCondition())) { conditionVariableName = this.setFirstCharacterToLowerCase(controllerCompositeModel.getCondition() .getSimpleName()) + this.getNameWithVariableCount(controllerCompositeModel.getCondition(), @@ -143,8 +139,7 @@ private void generateLoadShellFactory() { .addStatement("$L.setContext(super.context)", conditionVariableName); // remember generated condition to avoid creating the same class again! - generatedConditionClassNames.add(controllerCompositeModel.getCondition() - .getClassName()); + this.metaModel.addGeneratedCondition(controllerCompositeModel.getCondition()); } loadShellFactoryMethodBuilder.addStatement("$T.INSTANCE.registerCondition($S, $S, $L)", ClassName.get(CompositeConditionFactory.class), diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java index df338ea3..32d089f2 100644 --- a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java +++ b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java @@ -36,53 +36,54 @@ public class MetaModel { - private String generateToPackage; - private ClassNameModel application; - private ClassNameModel loader; - private ClassNameModel postLoader; - private ClassNameModel customAlertPresenter; - private ClassNameModel customConfirmPresenter; - private final List modules; - private boolean usingHash; - private boolean usingColonForParametersInUrl; - private boolean stayOnSide; + private String generateToPackage; + private ClassNameModel application; + private ClassNameModel loader; + private ClassNameModel postLoader; + private ClassNameModel customAlertPresenter; + private ClassNameModel customConfirmPresenter; + private final List modules; + private boolean usingHash; + private boolean usingColonForParametersInUrl; + private boolean stayOnSide; /* this model represents the plugin interface */ /* is the model not null, we have to deal */ /* with a a plugin and not with application */ - private ModuleModel moduleModel; - private final List shells; - private ClassNameModel context; - private String startRoute; - private String illegalRouteTarget; - private ErrorPopUpControllerModel errorPopUpController; - private boolean hasPluginsAnnotation; - private boolean hasLoggerAnnotation; - private List controllers; - private List blockControllers; - private List parameterConstraintRules; - private List popUpControllers; - private TrackerModel tracker; - private List filters; - private List popUpFilters; - private List handlers; - private ClassNameModel componentType; - private final List compositeModels; - private ClassNameModel logger; - private ClassNameModel clientLogger; + private ModuleModel moduleModel; + private final List shells; + private ClassNameModel context; + private String startRoute; + private String illegalRouteTarget; + private ErrorPopUpControllerModel errorPopUpController; + private boolean hasPluginsAnnotation; + private boolean hasLoggerAnnotation; + private List controllers; + private List blockControllers; + private List parameterConstraintRules; + private List popUpControllers; + private TrackerModel tracker; + private List filters; + private List popUpFilters; + private List handlers; + private ClassNameModel componentType; + private final List compositeModels; + private ClassNameModel logger; + private ClassNameModel clientLogger; /* flag, that indicates, if a Nalu application */ /* uses a history token or not. */ - private boolean history; + private boolean history; /* Version of the applicaiton set by the */ /* Version annotation */ - private String applicationVersion; + private String applicationVersion; /* does the context extends */ /* AbstractModuleContext? */ - private boolean extendingIsModuleContext; + private boolean extendingIsModuleContext; /* do we have to remove the URL parameter */ /* from the URL */ - private boolean removeUrlParameterAtStart; + private boolean removeUrlParameterAtStart; /* list of used parameter constraints */ - private final List usedParameterConstraints; + private final List usedParameterConstraints; + private final List generatedConditions; public MetaModel() { this.modules = new ArrayList<>(); @@ -96,6 +97,7 @@ public MetaModel() { this.compositeModels = new ArrayList<>(); this.parameterConstraintRules = new ArrayList<>(); this.usedParameterConstraints = new ArrayList<>(); + this.generatedConditions = new ArrayList<>(); this.applicationVersion = "APPLCIATION-VERSION-NOT-AVAILABLE"; this.extendingIsModuleContext = false; @@ -362,7 +364,7 @@ public void addParameterConstraintUsing(ClassNameModel model) { .filter(m -> m.getClassName() .equals(model.getClassName())) .findFirst(); - if (!optional.isPresent()) { + if (optional.isEmpty()) { this.usedParameterConstraints.add(model); } } @@ -371,6 +373,24 @@ public List getUsedParameterConstraints() { return usedParameterConstraints; } + public void addGeneratedCondition(ClassNameModel condition) { + this.generatedConditions.add(condition); + } + + public void clearGeneratedConditionList() { + this.generatedConditions.clear(); + } + + public boolean isCondtionAlreadyGenerated(ClassNameModel condition) { + if (Objects.isNull(condition)) { + return false; + } + return this.generatedConditions.stream() + .map(ClassNameModel::getClassName) + .anyMatch(m -> condition.getClassName() + .equals(m)); + } + public TrackerModel getTracker() { return tracker; } diff --git a/pom.xml b/pom.xml index 31dbc113..423dfb71 100644 --- a/pom.xml +++ b/pom.xml @@ -62,15 +62,6 @@ Java Developer - - Philipp Kohl - philippkohl - contact@nalu-solutions.de - Nalu Solutions GmbH - - Java Developer - - From 5485b777f6b8e2351df0bf44757da3c1ec8ea109 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jan 2024 06:48:13 +0100 Subject: [PATCH 04/10] done --- pom.xml | 71 ++------------------------------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-) diff --git a/pom.xml b/pom.xml index 423dfb71..49e312bb 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 32.1.1-jre 1.0.0-RC1 1.0.0-RC1 - 2.10.0 + 2.11.0 2.2 ${java.home}/bin/javadoc 1.13.0 @@ -231,21 +231,6 @@ - - - - - - - - - - - - - - - org.apache.maven.plugins maven-gpg-plugin @@ -303,17 +288,6 @@ false - - - - - - - - - - - @@ -329,41 +303,9 @@ nalu-plugin-gwt nalu-plugin-gwt-processor - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - org.apache.maven.plugins maven-javadoc-plugin @@ -387,14 +329,5 @@ - - - - - - - - - From 4db70494ea120c4c22037905e5b15ae9ce291459 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jan 2024 10:45:06 +0100 Subject: [PATCH 05/10] #351 - update versions - done --- nalu-plugin-core-web/pom.xml | 6 ++++++ nalu-plugin-domino-v2/pom.xml | 16 ++++++++++++++ nalu-plugin-elemental2/pom.xml | 6 ++++++ nalu-plugin-elemento/pom.xml | 14 +++++++++++++ nalu-plugin-gwt-processor/pom.xml | 35 +++++++++++++++++++++++++++++-- nalu-plugin-gwt/pom.xml | 6 ++++++ nalu-processor/pom.xml | 10 +++++++++ pom.xml | 24 ++++++++++----------- 8 files changed, 102 insertions(+), 15 deletions(-) diff --git a/nalu-plugin-core-web/pom.xml b/nalu-plugin-core-web/pom.xml index 2bb3b67e..e72bd1ba 100644 --- a/nalu-plugin-core-web/pom.xml +++ b/nalu-plugin-core-web/pom.xml @@ -79,6 +79,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + com.google.elemental2 diff --git a/nalu-plugin-domino-v2/pom.xml b/nalu-plugin-domino-v2/pom.xml index cff92bbd..be982d91 100644 --- a/nalu-plugin-domino-v2/pom.xml +++ b/nalu-plugin-domino-v2/pom.xml @@ -83,6 +83,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + com.github.nalukit @@ -116,6 +122,16 @@ org.dominokit domino-ui ${domino.ui.version} + + + elemental2-dom + com.google.elemental2 + + + elemental2-core + com.google.elemental2 + + org.dominokit diff --git a/nalu-plugin-elemental2/pom.xml b/nalu-plugin-elemental2/pom.xml index 9028fe65..a08d5405 100644 --- a/nalu-plugin-elemental2/pom.xml +++ b/nalu-plugin-elemental2/pom.xml @@ -79,6 +79,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + com.github.nalukit diff --git a/nalu-plugin-elemento/pom.xml b/nalu-plugin-elemento/pom.xml index 38e6f18d..439b17e4 100644 --- a/nalu-plugin-elemento/pom.xml +++ b/nalu-plugin-elemento/pom.xml @@ -83,6 +83,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + com.github.nalukit @@ -118,6 +124,14 @@ elemental2-dom com.google.elemental2 + + base + com.google.jsinterop + + + jsinterop-annotations + com.google.jsinterop + + + guava + com.google.guava + ${guava.version} + @@ -163,6 +190,10 @@ truth com.google.truth + + checker-qual + org.checkerframework + test diff --git a/nalu-plugin-gwt/pom.xml b/nalu-plugin-gwt/pom.xml index bbe81d75..ac041a5e 100644 --- a/nalu-plugin-gwt/pom.xml +++ b/nalu-plugin-gwt/pom.xml @@ -112,6 +112,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + com.github.nalukit diff --git a/nalu-processor/pom.xml b/nalu-processor/pom.xml index ad19d9c3..d2ff06b5 100644 --- a/nalu-processor/pom.xml +++ b/nalu-processor/pom.xml @@ -79,6 +79,12 @@ com.github.nalukit nalu ${project.version} + + + elemental2-core + com.google.elemental2 + + @@ -132,6 +138,10 @@ truth com.google.truth + + checker-qual + org.checkerframework + test diff --git a/pom.xml b/pom.xml index 49e312bb..6fc87548 100644 --- a/pom.xml +++ b/pom.xml @@ -91,21 +91,20 @@ github - 1.0 - 1.0.1 + 1.2.2 + 1.1.1 0.21.0 2.10.1 1.2.1 - 32.1.1-jre + 33.0.0-jre 1.0.0-RC1 1.0.0-RC1 2.11.0 2.2 ${java.home}/bin/javadoc 1.13.0 - 2.0.0 - 5.9.2 - 1.9.2 + 5.10.1 + 1.10.1 1.1.3 11 @@ -113,13 +112,12 @@ 3.1.1 0.12 - 1.6 - 3.2.0 - 1.6.8 - 3.0.0 - 1.6.3 - 3.2.1 - 3.2.2 + 3.1.0 + 3.6.3 + 3.5.0 + 1.6.13 + 3.3.0 + 3.2.3 1.5.0 3.3.2 1.5.3 From 585df6fd0cfe8e50fa08e78b25958a1a9514813c Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jan 2024 10:51:32 +0100 Subject: [PATCH 06/10] run wiki-pages action only on push to main --- .github/workflows/wiki-pages.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wiki-pages.yaml b/.github/workflows/wiki-pages.yaml index d0ba1835..65e125d9 100644 --- a/.github/workflows/wiki-pages.yaml +++ b/.github/workflows/wiki-pages.yaml @@ -1,6 +1,9 @@ name: WikiPages -on: [push] +on: + push: + branches: + - main jobs: build: From 9fe6cfe6bc690d081c8953d1139c7f9f84796ac7 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jan 2024 11:07:55 +0100 Subject: [PATCH 07/10] Update CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3d190c7d..a43cfd8c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may -be reported by contacting the project team at info@hossfeld-solutions.de. All complaints will +be reported by contacting the project team at code-of-conduct@nalu-solutions.de. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of From d3b1edd2ce21383378c2abf3175f8c092d482cb3 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jan 2024 11:08:59 +0100 Subject: [PATCH 08/10] Update .gitignore --- .gitignore | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.gitignore b/.gitignore index 277af35a..d3c4d1e9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,22 +2,9 @@ ### GWT template *.class -# gwt caches and compiled units # -gwt-unitCache/ - -# boilerplate generated classes # -.apt_generated/ - -# more caches and things from deploy # -war/WEB-INF/deploy/ -war/WEB-INF/classes/ - #compilation logs .gwt/ -#gwt junit compilation files -www-test/ - #old GWT (1.5) created this dir .gwt-tmp/ ### Java template @@ -26,12 +13,6 @@ www-test/ # Log file *.log -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - # Package Files # *.jar *.war From 2e6caf1d3982cc6500c5c1e68dfc4d7f59972482 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sun, 4 Feb 2024 21:11:15 +0100 Subject: [PATCH 09/10] update action --- .github/workflows/build.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cca24b7a..568f1b35 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,8 +27,8 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: '11' @@ -40,8 +40,8 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: '11' @@ -66,8 +66,8 @@ jobs: image: nalusolutionsgmbh/owasp-maven-action:latest options: --entrypoint /bin/sh --name owasp-db --hostname owasp-db steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: '11' @@ -97,8 +97,8 @@ jobs: needs: build-and-owasp if: github.ref == 'refs/heads/dev' steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: '11' @@ -135,8 +135,8 @@ jobs: needs: build-and-owasp if: github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: '11' From 6b45e16e1c175a9f1613c33dca461394fa58c257 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sun, 4 Feb 2024 21:24:57 +0100 Subject: [PATCH 10/10] set version to 2.20.0 --- README.md | 12 ++++++------ .../ApplicationWithFilterImpl.java | 2 +- .../java/com/github/nalukit/nalu/client/Nalu.java | 2 +- .../com/github/nalukit/nalu/client/NaluTest.java | 2 +- pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 609fdc13..5fafb8e6 100644 --- a/README.md +++ b/README.md @@ -136,12 +136,12 @@ To use Nalu add the following dependencies to your pom: com.github.nalukit nalu - 2.12.7 + 2.20.0 com.github.nalukit nalu-processor - 2.12.7 + 2.20.0 provided ``` @@ -171,7 +171,7 @@ If the project uses a widget set based on **Elemental2**, **Elemento** or **Domi com.github.nalukit nalu-plugin-elemental2 - 2.12.7 + 2.20.0 ``` @@ -200,7 +200,7 @@ For Elemento there's a dedicated plugin which supports `org.jboss.gwt.elemento.c com.github.nalukit nalu-plugin-elemento - 2.12.7 + 2.20.0 ``` @@ -245,12 +245,12 @@ If your project uses a widget set based on **GWT** 2.8.2 or newer, use the **Nal com.github.nalukit nalu-plugin-gwt - 2.12.7 + 2.20.0 com.github.nalukit nalu-plugin-gwt-processor - 2.12.7 + 2.20.0 provided ``` diff --git a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java index f5e08278..02ff5801 100644 --- a/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java +++ b/nalu-processor/src/test/resources/com/github/nalukit/nalu/processor.templates/filter/eventhandler/eventHandlerOnAFilterOk02/ApplicationWithFilterImpl.java @@ -34,7 +34,7 @@ public void logProcessorVersion() { this.eventBus.fireEvent(LogEvent.create() .sdmOnly(true) .addMessage("=================================================================================") - .addMessage("Nalu processor version >>HEAD-SNAPSHOT<< used to generate this source") + .addMessage("Nalu processor version >>2.20.0<< used to generate this source") .addMessage("=================================================================================") .addMessage("")); } diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java index 4e71c08f..cb77b74a 100644 --- a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java +++ b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java @@ -23,7 +23,7 @@ public class Nalu { public static String getVersion() { // TODO Change this for other versions - return "HEAD-SNAPSHOT"; + return "2.20.0"; } public static boolean hasHistory() { diff --git a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java index 0d191cee..8028a062 100644 --- a/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java +++ b/nalu/src/test/java/com/github/nalukit/nalu/client/NaluTest.java @@ -14,7 +14,7 @@ public class NaluTest { void getVersion() throws IOException { // TODO Change this if you want to test against another version - Assertions.assertEquals("HEAD-SNAPSHOT", + Assertions.assertEquals("2.20.0", Nalu.getVersion()); } diff --git a/pom.xml b/pom.xml index 6fc87548..d5104a37 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ - HEAD-SNAPSHOT + 2.20.0 github