From 380031b414004b818e042d9a33317f22de533379 Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Mon, 17 Jun 2024 20:36:26 -0700 Subject: [PATCH 1/2] * bump elemental2 to 1.2.1 --- api/pom.xml | 2 +- common/pom.xml | 2 +- pom.xml | 8 +- processor/dependency-reduced-pom.xml | 122 ------------------ processor/pom.xml | 2 +- samples/gwt/pom.xml | 4 +- samples/j2cl/pom.xml | 12 +- .../treblereel/gwt/xml/mapper/App.native.js | 7 +- .../j2cl/src/main/resources/public/index.html | 2 +- tests/jre/pom.xml | 2 +- tests/pom.xml | 2 +- 11 files changed, 21 insertions(+), 144 deletions(-) delete mode 100644 processor/dependency-reduced-pom.xml diff --git a/api/pom.xml b/api/pom.xml index a091b777..272165d4 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.7 + 0.8-SNAPSHOT api diff --git a/common/pom.xml b/common/pom.xml index bc3a931d..e07aa208 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.7 + 0.8-SNAPSHOT common diff --git a/pom.xml b/pom.xml index f46f5fe7..61a596a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.7 + 0.8-SNAPSHOT pom mapper-parent @@ -61,14 +61,14 @@ 1.6.8 1.9.5 - 1.1.0 - 0.10.0-3c97afeac + 1.2.1 + v20230718-1 1.3.1 3.13.1 3.9 4.13.1 - 0.2 + 0.4-SNAPSHOT 6.2.1 0.11 1.0-rc6 diff --git a/processor/dependency-reduced-pom.xml b/processor/dependency-reduced-pom.xml deleted file mode 100644 index 01670aa5..00000000 --- a/processor/dependency-reduced-pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - mapper-parent - org.treblereel.gwt.xml.mapper - 0.7 - - 4.0.0 - processor - Apt processor - apt processor - - - treblereel - Dmitrii Tikhomirov - chani.liet@gmail.com - - - - - Apache License Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - Treblereel - https://github.com/treblereel - - - - - src/main/resources - - - - - maven-source-plugin - - - attach-sources - package - - jar - - - - - - maven-shade-plugin - - - package - - shade - - - true - - - *:*:*:* - - **/*.java - - - - - - - - - - - - release - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - maven-deploy-plugin - - false - - - - - - - diff --git a/processor/pom.xml b/processor/pom.xml index c2901911..feae6442 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.7 + 0.8-SNAPSHOT processor diff --git a/samples/gwt/pom.xml b/samples/gwt/pom.xml index e1acd617..814515bd 100644 --- a/samples/gwt/pom.xml +++ b/samples/gwt/pom.xml @@ -51,12 +51,12 @@ org.treblereel.gwt.xml.mapper api - 0.7 + 0.8-SNAPSHOT org.treblereel.gwt.xml.mapper processor - 0.7 + 0.8-SNAPSHOT junit diff --git a/samples/j2cl/pom.xml b/samples/j2cl/pom.xml index 7a64edc5..2e51fc5f 100644 --- a/samples/j2cl/pom.xml +++ b/samples/j2cl/pom.xml @@ -14,12 +14,12 @@ ${project.build.directory}/webapp ${webappdir}/WEB-INF/lib - 0.20 - 1.1.0 + 0.22 + 1.2.1 1.0.0 - 0.10.0-3c97afeac - 0.19 + v20230718-1 + 0.22.0 1.8 1.8 @@ -36,12 +36,12 @@ org.treblereel.gwt.xml.mapper api - 0.7 + 0.8-SNAPSHOT org.treblereel.gwt.xml.mapper processor - 0.7 + 0.8-SNAPSHOT provided diff --git a/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js b/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js index fcdf7307..5cde8c1b 100644 --- a/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js +++ b/samples/j2cl/src/main/java/org/treblereel/gwt/xml/mapper/App.native.js @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,6 +27,5 @@ setTimeout(function(){ // static imports haven't been resolved yet. var ep = App.$create__(); // Invoke onModuleLoad to start the app. - ep.m_onModuleLoad__() + ep.m_onModuleLoad__void() }, 0); - diff --git a/samples/j2cl/src/main/resources/public/index.html b/samples/j2cl/src/main/resources/public/index.html index 2c175781..91eada79 100644 --- a/samples/j2cl/src/main/resources/public/index.html +++ b/samples/j2cl/src/main/resources/public/index.html @@ -9,6 +9,6 @@ - + diff --git a/tests/jre/pom.xml b/tests/jre/pom.xml index 296c73a2..952d1f1f 100644 --- a/tests/jre/pom.xml +++ b/tests/jre/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper tests - 0.7 + 0.8-SNAPSHOT jre-tests diff --git a/tests/pom.xml b/tests/pom.xml index 6e428d14..c0d70a50 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.7 + 0.8-SNAPSHOT tests From c0375c2c3fc33aa36ec941908087185d67eccd99 Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Mon, 8 Jul 2024 20:45:31 -0700 Subject: [PATCH 2/2] 0.8 release --- api/pom.xml | 2 +- common/pom.xml | 2 +- pom.xml | 6 +++--- processor/pom.xml | 2 +- .../gwt/xml/mapper/apt/ApplicationProcessor.java | 2 +- samples/gwt/pom.xml | 14 +++++++------- samples/j2cl/pom.xml | 15 +++++++-------- tests/jre/pom.xml | 2 +- tests/pom.xml | 2 +- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 272165d4..eb63f00e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.8-SNAPSHOT + 0.8 api diff --git a/common/pom.xml b/common/pom.xml index e07aa208..76ef2ed7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.8-SNAPSHOT + 0.8 common diff --git a/pom.xml b/pom.xml index 61a596a3..34142209 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.8-SNAPSHOT + 0.8 pom mapper-parent @@ -62,13 +62,13 @@ 1.9.5 1.2.1 - v20230718-1 + v20240622-2 1.3.1 3.13.1 3.9 4.13.1 - 0.4-SNAPSHOT + 0.4 6.2.1 0.11 1.0-rc6 diff --git a/processor/pom.xml b/processor/pom.xml index feae6442..d784f596 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.8-SNAPSHOT + 0.8 processor diff --git a/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java b/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java index ca089cf8..23f03c37 100644 --- a/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java +++ b/processor/src/main/java/org/treblereel/gwt/xml/mapper/apt/ApplicationProcessor.java @@ -44,7 +44,7 @@ import org.treblereel.gwt.xml.mapper.apt.processor.BeanProcessor; @AutoService(Processor.class) -@SupportedSourceVersion(SourceVersion.RELEASE_8) +@SupportedSourceVersion(SourceVersion.RELEASE_11) public class ApplicationProcessor extends AbstractProcessor { private final TreeLogger logger = new PrintWriterTreeLogger(); diff --git a/samples/gwt/pom.xml b/samples/gwt/pom.xml index 814515bd..b860c0e4 100644 --- a/samples/gwt/pom.xml +++ b/samples/gwt/pom.xml @@ -17,9 +17,9 @@ 2.10.0 - - 1.8 - 1.8 + + 11 + 11 UTF-8 @@ -51,12 +51,12 @@ org.treblereel.gwt.xml.mapper api - 0.8-SNAPSHOT + 0.8 org.treblereel.gwt.xml.mapper processor - 0.8-SNAPSHOT + 0.8 junit @@ -126,8 +126,8 @@ maven-compiler-plugin 3.8.0 - 1.8 - 1.8 + 11 + 11 diff --git a/samples/j2cl/pom.xml b/samples/j2cl/pom.xml index 2e51fc5f..924cf3ed 100644 --- a/samples/j2cl/pom.xml +++ b/samples/j2cl/pom.xml @@ -14,15 +14,14 @@ ${project.build.directory}/webapp ${webappdir}/WEB-INF/lib - 0.22 1.2.1 1.0.0 - v20230718-1 - 0.22.0 + 0.23.1 + v20240622-2 - 1.8 - 1.8 + 11 + 11 3.8.0 2.2 @@ -36,12 +35,12 @@ org.treblereel.gwt.xml.mapper api - 0.8-SNAPSHOT + 0.8 org.treblereel.gwt.xml.mapper processor - 0.8-SNAPSHOT + 0.8 provided @@ -103,7 +102,7 @@ - com.vertispan.j2cl + org.kie.j2cl.tools j2cl-maven-plugin ${j2cl.maven.plugin.version} diff --git a/tests/jre/pom.xml b/tests/jre/pom.xml index 952d1f1f..b339c450 100644 --- a/tests/jre/pom.xml +++ b/tests/jre/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper tests - 0.8-SNAPSHOT + 0.8 jre-tests diff --git a/tests/pom.xml b/tests/pom.xml index c0d70a50..0dd1a5f2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ org.treblereel.gwt.xml.mapper mapper-parent - 0.8-SNAPSHOT + 0.8 tests