Skip to content

Commit

Permalink
elemental2 updated to 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
treblereel committed Nov 29, 2024
1 parent fcc0317 commit 04d0022
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 52 deletions.
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>mapper-parent</artifactId>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<version>0.5</version>
<version>0.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 1 addition & 5 deletions json-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>mapper-parent</artifactId>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<version>0.5</version>
<version>0.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -56,10 +56,6 @@
<groupId>com.google.elemental2</groupId>
<artifactId>elemental2-dom</artifactId>
</dependency>
<dependency>
<groupId>com.google.jsinterop</groupId>
<artifactId>base</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
Expand Down
20 changes: 7 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>mapper-parent</artifactId>
<packaging>pom</packaging>
<version>0.5</version>
<version>0.6</version>
<modules>
<module>json-impl</module>
<module>common</module>
Expand Down Expand Up @@ -70,7 +70,7 @@
<maven.gpg.plugin>1.6</maven.gpg.plugin>
<maven.javadoc.plugin>3.2.0</maven.javadoc.plugin>
<maven.source.plugin>3.2.1</maven.source.plugin>
<maven.j2cl.plugin>0.23.1</maven.j2cl.plugin>
<maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
<maven.release.plugin>2.5.3</maven.release.plugin>
<maven.surfire.plugin>3.0.0-M1</maven.surfire.plugin>
<maven.nexus.staging.plugin>1.6.8</maven.nexus.staging.plugin>
Expand All @@ -79,16 +79,15 @@
<!-- generation related deps -->
<javaparser.core.version>3.13.1</javaparser.core.version>

<auto.common.version>0.11</auto.common.version>
<auto.service.version>1.0-rc6</auto.service.version>
<auto.common.version>1.2.2</auto.common.version>
<auto.service.version>1.1.1</auto.service.version>

<!-- J2CL deps -->
<gwt.jakarta.version>0.4</gwt.jakarta.version>
<gwt.jakarta.version>0.5</gwt.jakarta.version>

<!-- J2CL deps -->
<com.google.jsinterop.base.version>1.0.0</com.google.jsinterop.base.version>
<elemental2.version>1.2.1</elemental2.version>
<j2cl.version>v20240622-2</j2cl.version>
<elemental2.version>1.2.3</elemental2.version>
<j2cl.version>v20241110-1</j2cl.version>

<!-- Testing -->
<junit.version>4.13.1</junit.version>
Expand All @@ -113,11 +112,6 @@
<artifactId>elemental2-dom</artifactId>
<version>${elemental2.version}</version>
</dependency>
<dependency>
<groupId>com.google.jsinterop</groupId>
<artifactId>base</artifactId>
<version>${com.google.jsinterop.base.version}</version>
</dependency>
<dependency>
<groupId>com.google.auto</groupId>
<artifactId>auto-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>mapper-parent</artifactId>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<version>0.5</version>
<version>0.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
21 changes: 8 additions & 13 deletions samples/gwt2-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<!-- Convenience property to set the GWT version -->
<gwt.version>2.10.0</gwt.version>
<gwt.version>2.12.1</gwt.version>

<!-- GWT 2.9 support 8, 9 and 11 -->
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -25,7 +25,7 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt</artifactId>
<version>${gwt.version}</version>
<type>pom</type>
Expand All @@ -36,36 +36,31 @@

<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>common</artifactId>
<version>0.5</version>
<version>0.6</version>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.5</version>
<version>0.6</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -87,7 +82,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>2.9.0</version>
<version>2.10.0</version>
<executions>
<execution>
<goals>
Expand Down
19 changes: 6 additions & 13 deletions samples/j2cl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
<webappdir>${project.build.directory}/webapp</webappdir>
<webapp.libdir>${webappdir}/WEB-INF/lib</webapp.libdir>

<j2cl.maven.plugin.version>0.23.1</j2cl.maven.plugin.version>
<elemental2.version>1.2.1</elemental2.version>
<j2cl.maven.plugin.version>0.23.2</j2cl.maven.plugin.version>
<elemental2.version>1.2.3</elemental2.version>

<google.jsinterop.version>1.0.0</google.jsinterop.version>
<j2cl.version>v20240622-2</j2cl.version>
<j2cl.version>v20241110-1</j2cl.version>

<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -34,24 +33,18 @@
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>common</artifactId>
<version>0.5</version>
<version>0.6</version>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.5</version>
<version>0.6</version>
</dependency>

<dependency>
<groupId>com.google.elemental2</groupId>
<artifactId>elemental2-dom</artifactId>
<version>1.2.1</version>
</dependency>

<dependency>
<groupId>com.google.jsinterop</groupId>
<artifactId>base</artifactId>
<version>${google.jsinterop.version}</version>
<version>${elemental2.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions tests/j2cl-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<artifactId>j2cl-tests</artifactId>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<version>0.5</version>
<version>0.6</version>

<name>J2CL tests</name>
<description>JSON marshallers</description>
Expand Down Expand Up @@ -49,12 +49,12 @@
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>common</artifactId>
<version>0.5</version>
<version>0.6</version>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.5</version>
<version>0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>mapper-parent</artifactId>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<version>0.5</version>
<version>0.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -59,13 +59,13 @@
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>common</artifactId>
<version>0.5</version>
<version>0.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.json.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.5</version>
<version>0.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 04d0022

Please sign in to comment.