Skip to content

Commit acd6bdb

Browse files
treblereeltreblereel
authored
Merge pull request #11 from treblereel/development
Development
2 parents 34b605c + 00f81f8 commit acd6bdb

13 files changed

Lines changed: 111 additions & 163 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
*.iml
77
target/
88
dependency-reduced-pom.xml
9+
.flattened-pom.xml

‎common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>mapper-parent</artifactId>
77
<groupId>org.treblereel.gwt.json.mapper</groupId>
8-
<version>0.6</version>
8+
<version>0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎json-impl/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>mapper-parent</artifactId>
77
<groupId>org.treblereel.gwt.json.mapper</groupId>
8-
<version>0.6</version>
8+
<version>0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -45,8 +45,8 @@
4545

4646
<dependencies>
4747
<dependency>
48-
<groupId>org.treblereel.gwt.jakarta.jsonb</groupId>
49-
<artifactId>api</artifactId>
48+
<groupId>org.treblereel.gwt.jakarta</groupId>
49+
<artifactId>jsonb</artifactId>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.google.elemental2</groupId>

‎json-impl/src/main/java/jakarta/json/JsonValueDecorator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.math.BigDecimal;
2424
import java.math.BigInteger;
2525
import jsinterop.base.Js;
26-
import org.treblereel.gwt.utils.GwtIncompatible;
2726

2827
public class JsonValueDecorator {
2928

‎json-impl/src/main/java/jakarta/json/bind/serializer/JsonDeserializationContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package jakarta.json.bind.serializer;
1818

19+
import jakarta.json.GwtIncompatible;
1920
import jakarta.json.Json;
2021
import jakarta.json.stream.JsonParser;
2122
import jakarta.json.stream.JsonParserImpl;
2223
import jakarta.json.stream.gwt.JsonObjectImpl;
2324
import java.io.StringReader;
2425
import java.lang.reflect.Type;
25-
import org.treblereel.gwt.utils.GwtIncompatible;
2626

2727
public class JsonDeserializationContext implements DeserializationContext {
2828

‎json-impl/src/main/java/jakarta/json/bind/serializer/JsonSerializationContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package jakarta.json.bind.serializer;
1818

19+
import jakarta.json.GwtIncompatible;
1920
import jakarta.json.Json;
2021
import jakarta.json.JsonObjectBuilder;
2122
import jakarta.json.stream.JsonGenerator;
2223
import jakarta.json.stream.JsonGeneratorDecorator;
2324
import jakarta.json.stream.gwt.GWTJsonGenerator;
2425
import jakarta.json.stream.gwt.JsonObjectBuilderImpl;
2526
import jakarta.json.stream.jre.JreJsonGenerator;
26-
import org.treblereel.gwt.utils.GwtIncompatible;
2727

2828
public class JsonSerializationContext implements SerializationContext {
2929

‎json-impl/src/main/java/jakarta/json/stream/jre/JreJsonGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package jakarta.json.stream.jre;
1818

19+
import jakarta.json.GwtIncompatible;
1920
import jakarta.json.JsonArrayBuilder;
2021
import jakarta.json.JsonObjectBuilder;
2122
import jakarta.json.bind.serializer.SerializationContext;
2223
import jakarta.json.stream.JsonArrayGenerator;
2324
import jakarta.json.stream.JsonGenerator;
2425
import jakarta.json.stream.JsonGeneratorDecorator;
25-
import org.treblereel.gwt.utils.GwtIncompatible;
2626

2727
public class JreJsonGenerator extends JsonGeneratorDecorator {
2828

‎pom.xml‎

Lines changed: 47 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.treblereel.gwt.json.mapper</groupId>
88
<artifactId>mapper-parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>0.6</version>
10+
<version>0.7</version>
1111
<modules>
1212
<module>json-impl</module>
1313
<module>common</module>
@@ -58,23 +58,21 @@
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6060

61-
<maven.compiler.source>8</maven.compiler.source>
62-
<maven.compiler.target>8</maven.compiler.target>
61+
<maven.compiler.source>11</maven.compiler.source>
62+
<maven.compiler.target>11</maven.compiler.target>
6363

6464
<maven.compiler.version>3.8.0</maven.compiler.version>
6565
<maven.source.version>3.2.1</maven.source.version>
6666
<maven.fmt.plugin>2.9</maven.fmt.plugin>
6767
<maven.license.plugin>3.0</maven.license.plugin>
6868
<maven.shade.plugin>3.2.4</maven.shade.plugin>
69-
<maven.deploy.plugin>2.8.2</maven.deploy.plugin>
7069
<maven.gpg.plugin>1.6</maven.gpg.plugin>
7170
<maven.javadoc.plugin>3.2.0</maven.javadoc.plugin>
7271
<maven.source.plugin>3.2.1</maven.source.plugin>
73-
<maven.j2cl.plugin>0.23.2</maven.j2cl.plugin>
7472
<maven.release.plugin>2.5.3</maven.release.plugin>
7573
<maven.surfire.plugin>3.0.0-M1</maven.surfire.plugin>
76-
<maven.nexus.staging.plugin>1.6.8</maven.nexus.staging.plugin>
77-
<maven.scm.provider.gitexe>1.9.5</maven.scm.provider.gitexe>
74+
<maven.flatten.plugin>1.5.0</maven.flatten.plugin>
75+
<maven.central.publishing.plugin>0.9.0</maven.central.publishing.plugin>
7876

7977
<!-- generation related deps -->
8078
<javaparser.core.version>3.13.1</javaparser.core.version>
@@ -83,34 +81,26 @@
8381
<auto.service.version>1.1.1</auto.service.version>
8482

8583
<!-- J2CL deps -->
86-
<gwt.jakarta.version>0.5</gwt.jakarta.version>
84+
<jakarta4g.version>0.7</jakarta4g.version>
85+
<j2cl.platform.version>20251001-1</j2cl.platform.version>
8786

88-
<!-- J2CL deps -->
89-
<elemental2.version>1.2.3</elemental2.version>
90-
<j2cl.version>v20241110-1</j2cl.version>
91-
92-
<!-- Testing -->
93-
<junit.version>4.13.1</junit.version>
9487
</properties>
9588

9689
<dependencyManagement>
9790
<dependencies>
9891
<dependency>
9992
<groupId>org.treblereel.gwt.jakarta</groupId>
10093
<artifactId>bom</artifactId>
101-
<version>${gwt.jakarta.version}</version>
94+
<version>${jakarta4g.version}</version>
10295
<type>pom</type>
10396
<scope>import</scope>
10497
</dependency>
10598
<dependency>
106-
<groupId>com.google.elemental2</groupId>
107-
<artifactId>elemental2-core</artifactId>
108-
<version>${elemental2.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>com.google.elemental2</groupId>
112-
<artifactId>elemental2-dom</artifactId>
113-
<version>${elemental2.version}</version>
99+
<groupId>org.treblereel.j2cl.platform</groupId>
100+
<artifactId>bom</artifactId>
101+
<version>${j2cl.platform.version}</version>
102+
<type>pom</type>
103+
<scope>import</scope>
114104
</dependency>
115105
<dependency>
116106
<groupId>com.google.auto</groupId>
@@ -127,13 +117,6 @@
127117
<artifactId>javaparser-core</artifactId>
128118
<version>${javaparser.core.version}</version>
129119
</dependency>
130-
131-
<dependency>
132-
<groupId>junit</groupId>
133-
<artifactId>junit</artifactId>
134-
<version>${junit.version}</version>
135-
<scope>test</scope>
136-
</dependency>
137120
</dependencies>
138121
</dependencyManagement>
139122

@@ -155,11 +138,6 @@
155138
<artifactId>fmt-maven-plugin</artifactId>
156139
<version>${maven.fmt.plugin}</version>
157140
</plugin>
158-
<plugin>
159-
<groupId>org.apache.maven.plugins</groupId>
160-
<artifactId>maven-deploy-plugin</artifactId>
161-
<version>${maven.deploy.plugin}</version>
162-
</plugin>
163141
<plugin>
164142
<groupId>org.apache.maven.plugins</groupId>
165143
<artifactId>maven-source-plugin</artifactId>
@@ -170,11 +148,6 @@
170148
<artifactId>maven-shade-plugin</artifactId>
171149
<version>${maven.shade.plugin}</version>
172150
</plugin>
173-
<plugin>
174-
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>maven-release-plugin</artifactId>
176-
<version>${maven.release.plugin}</version>
177-
</plugin>
178151
<plugin>
179152
<groupId>org.apache.maven.plugins</groupId>
180153
<artifactId>maven-javadoc-plugin</artifactId>
@@ -185,11 +158,6 @@
185158
<artifactId>maven-gpg-plugin</artifactId>
186159
<version>${maven.gpg.plugin}</version>
187160
</plugin>
188-
<plugin>
189-
<groupId>com.vertispan.j2cl</groupId>
190-
<artifactId>j2cl-maven-plugin</artifactId>
191-
<version>${maven.j2cl.plugin}</version>
192-
</plugin>
193161
</plugins>
194162
</pluginManagement>
195163

@@ -257,38 +225,6 @@
257225
</execution>
258226
</executions>
259227
</plugin>
260-
<plugin>
261-
<groupId>org.apache.maven.plugins</groupId>
262-
<artifactId>maven-deploy-plugin</artifactId>
263-
<version>${maven.deploy.plugin}</version>
264-
<executions>
265-
<execution>
266-
<id>default-deploy</id>
267-
<phase>deploy</phase>
268-
<goals>
269-
<goal>deploy</goal>
270-
</goals>
271-
</execution>
272-
</executions>
273-
</plugin>
274-
<plugin>
275-
<groupId>org.apache.maven.plugins</groupId>
276-
<artifactId>maven-release-plugin</artifactId>
277-
<version>${maven.release.plugin}</version>
278-
<configuration>
279-
<localCheckout>true</localCheckout>
280-
<pushChanges>false</pushChanges>
281-
<mavenExecutorId>forked-path</mavenExecutorId>
282-
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
283-
</configuration>
284-
<dependencies>
285-
<dependency>
286-
<groupId>org.apache.maven.scm</groupId>
287-
<artifactId>maven-scm-provider-gitexe</artifactId>
288-
<version>${maven.scm.provider.gitexe}</version>
289-
</dependency>
290-
</dependencies>
291-
</plugin>
292228
<plugin>
293229
<groupId>org.apache.maven.plugins</groupId>
294230
<artifactId>maven-javadoc-plugin</artifactId>
@@ -301,7 +237,6 @@
301237
</build>
302238

303239
<profiles>
304-
<!-- release profile to create sources, javadoc, and sign all artifacts before uploading -->
305240
<profile>
306241
<id>release</id>
307242
<build>
@@ -321,7 +256,6 @@
321256
</execution>
322257
</executions>
323258
</plugin>
324-
<!-- see http://central.sonatype.org/pages/working-with-pgp-signatures.html for more detail -->
325259
<plugin>
326260
<groupId>org.apache.maven.plugins</groupId>
327261
<artifactId>maven-gpg-plugin</artifactId>
@@ -335,20 +269,43 @@
335269
</execution>
336270
</executions>
337271
</plugin>
272+
<plugin>
273+
<groupId>org.sonatype.central</groupId>
274+
<artifactId>central-publishing-maven-plugin</artifactId>
275+
<version>${maven.central.publishing.plugin}</version>
276+
<extensions>true</extensions>
277+
<configuration>
278+
<publishingServerId>sonatype</publishingServerId>
279+
</configuration>
280+
</plugin>
281+
<plugin>
282+
<groupId>org.codehaus.mojo</groupId>
283+
<artifactId>flatten-maven-plugin</artifactId>
284+
<version>${maven.flatten.plugin}</version>
285+
<configuration>
286+
<flattenMode>oss</flattenMode>
287+
<updatePomFile>true</updatePomFile>
288+
</configuration>
289+
<executions>
290+
<execution>
291+
<id>flatten</id>
292+
<phase>process-resources</phase>
293+
<goals>
294+
<goal>flatten</goal>
295+
</goals>
296+
</execution>
297+
<execution>
298+
<id>flatten.clean</id>
299+
<phase>clean</phase>
300+
<goals>
301+
<goal>clean</goal>
302+
</goals>
303+
</execution>
304+
</executions>
305+
</plugin>
338306
</plugins>
339307
</build>
340308
</profile>
341309
</profiles>
342310

343-
<distributionManagement>
344-
<snapshotRepository>
345-
<id>ossrh</id>
346-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
347-
</snapshotRepository>
348-
<repository>
349-
<id>ossrh</id>
350-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
351-
</repository>
352-
</distributionManagement>
353-
354311
</project>

‎processor/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>mapper-parent</artifactId>
77
<groupId>org.treblereel.gwt.json.mapper</groupId>
8-
<version>0.6</version>
8+
<version>0.7</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -37,8 +37,8 @@
3737

3838
<dependencies>
3939
<dependency>
40-
<groupId>org.treblereel.gwt.jakarta.jsonb</groupId>
41-
<artifactId>api</artifactId>
40+
<groupId>org.treblereel.gwt.jakarta</groupId>
41+
<artifactId>jsonb</artifactId>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.treblereel.gwt.json.mapper</groupId>
@@ -82,6 +82,7 @@
8282
<plugin>
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-shade-plugin</artifactId>
85+
<version>3.5.1</version>
8586
<executions>
8687
<execution>
8788
<phase>package</phase>

‎samples/gwt2-demo/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<groupId>org.treblereel.gwt.json.mapper</groupId>
99
<artifactId>gwt2-demo</artifactId>
1010
<packaging>war</packaging>
11-
<version>1.0-SNAPSHOT</version>
11+
<version>0.7</version>
1212
<name>Maven Archetype for GWT</name>
1313

1414
<properties>
1515
<!-- Convenience property to set the GWT version -->
16-
<gwt.version>2.12.1</gwt.version>
16+
<gwt.version>2.12.2</gwt.version>
1717

18-
<!-- GWT 2.9 support 8, 9 and 11 -->
1918
<maven.compiler.source>11</maven.compiler.source>
2019
<maven.compiler.target>11</maven.compiler.target>
2120

@@ -49,12 +48,12 @@
4948
<dependency>
5049
<groupId>org.treblereel.gwt.json.mapper</groupId>
5150
<artifactId>common</artifactId>
52-
<version>0.6</version>
51+
<version>${project.version}</version>
5352
</dependency>
5453
<dependency>
5554
<groupId>org.treblereel.gwt.json.mapper</groupId>
5655
<artifactId>processor</artifactId>
57-
<version>0.6</version>
56+
<version>${project.version}</version>
5857
</dependency>
5958

6059
<dependency>
@@ -95,6 +94,7 @@
9594
<!-- Plugin configuration. There are many available options, see
9695
gwt-maven-plugin documentation at codehaus.org -->
9796
<configuration>
97+
<sourceLevel>11</sourceLevel>
9898
<runTarget>App.html</runTarget>
9999
<modules>
100100
<module>org.treblereel.gwt.json.mapper.App</module>

0 commit comments

Comments
 (0)