Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

elemental2 updated to 1.2.3 #112

Merged
merged 3 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v2
- name: Set up Java 17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
- name: Build and test
run: |
mvn -B package --file pom.xml
- name: Upload test results for review
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results-${{ matrix.os }}
Expand All @@ -37,12 +37,12 @@ jobs:
strategy:
matrix:
mvn: ['3.8.6', '3.6.3']
java: ['11']
java: ['17']
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
Expand All @@ -53,7 +53,7 @@ jobs:
run: |
mvn -B package --file pom.xml
- name: Upload test results for review
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results-mvn-v${{ matrix.mvn }}-jvm${{ matrix.java }}
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>mapper-parent</artifactId>
<version>0.8</version>
<version>0.9</version>
</parent>

<artifactId>api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>mapper-parent</artifactId>
<version>0.8</version>
<version>0.9</version>
</parent>

<artifactId>common</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>mapper-parent</artifactId>
<version>0.8</version>
<version>0.9</version>
<packaging>pom</packaging>

<name>mapper-parent</name>
Expand Down Expand Up @@ -61,17 +61,17 @@
<nexus.staging.maven.plugin>1.6.8</nexus.staging.maven.plugin>
<maven.scm.provider.gitexe>1.9.5</maven.scm.provider.gitexe>

<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>
<javax.annotation.api.version>1.3.1</javax.annotation.api.version>
<javaparser.core.version>3.13.1</javaparser.core.version>
<apache.commons.lang3.version>3.9</apache.commons.lang3.version>
<junit.version>4.13.1</junit.version>
<junit.version>4.13.2</junit.version>

<gwt.jakarta.version>0.4</gwt.jakarta.version>
<gwt.jakarta.version>0.6</gwt.jakarta.version>
<com.fasterxml.woodstox.version>6.2.1</com.fasterxml.woodstox.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>
</properties>

<modules>
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>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>mapper-parent</artifactId>
<version>0.8</version>
<version>0.9</version>
</parent>

<artifactId>processor</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions samples/gwt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.8 requires 11 -->
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -27,7 +27,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 @@ -38,30 +38,30 @@

<dependencies>
<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.xml.mapper</groupId>
<artifactId>api</artifactId>
<version>0.8</version>
<version>0.9</version>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.8</version>
<version>0.9</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 @@ -76,7 +76,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>${gwt.version}</version>
<version>2.10.0</version>
<executions>
<execution>
<goals>
Expand Down
42 changes: 6 additions & 36 deletions samples/j2cl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>j2cl-demo</artifactId>
<packaging>war</packaging>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>

<name>J2CL demo</name>
Expand All @@ -14,11 +14,10 @@
<webappdir>${project.build.directory}/webapp</webappdir>
<webapp.libdir>${webappdir}/WEB-INF/lib</webapp.libdir>

<elemental2.version>1.2.1</elemental2.version>
<elemental2.version>1.2.3</elemental2.version>

<google.jsinterop.version>1.0.0</google.jsinterop.version>
<j2cl.maven.plugin.version>0.23.1</j2cl.maven.plugin.version>
<j2cl.version>v20240622-2</j2cl.version>
<j2cl.maven.plugin.version>0.23.2</j2cl.maven.plugin.version>
<j2cl.version>v20241110-1</j2cl.version>

<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -35,12 +34,12 @@
<dependency>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>api</artifactId>
<version>0.8</version>
<version>0.9</version>
</dependency>
<dependency>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>processor</artifactId>
<version>0.8</version>
<version>0.9</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -80,14 +79,6 @@
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<packagingExcludes>WEB-INF/classes/**</packagingExcludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
Expand Down Expand Up @@ -119,27 +110,6 @@
<compilationLevel>ADVANCED</compilationLevel>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>${maven.tomcat7.plugin.version}</version>
<configuration>
<warSourceDirectory>target/gwt/launcherDir/</warSourceDirectory>
<path>/</path>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${maven.jetty.plugin.version}</version>
<configuration>
<scanIntervalSeconds>2</scanIntervalSeconds>
<webApp>
<resourceBase>target/gwt/launcherDir/</resourceBase>
<contextPath>/</contextPath>
</webApp>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 3 additions & 1 deletion tests/jre/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.treblereel.gwt.xml.mapper</groupId>
<artifactId>tests</artifactId>
<version>0.8</version>
<version>0.9</version>
</parent>

<artifactId>jre-tests</artifactId>
Expand All @@ -14,6 +14,8 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<developers>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ public class DoctypedTest {
private static final Doctyped_XMLMapperImpl mapper = Doctyped_XMLMapperImpl.INSTANCE;

private static final String XML =
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+ "<!DOCTYPE ldml SYSTEM \"../../common/dtd/ldml.dtd\">\n"
+ "<!-- Copyright © 1991-2021 Unicode, Inc.\n"
+ "For terms of use, see http://www.unicode.org/copyright.html\n"
+ "Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.\n"
+ "CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)\n"
+ "\n"
+ "Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for // derived annotations.\n"
+ "-->\n"
+ "<ldml></ldml>";
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+ "<!DOCTYPE ldml SYSTEM \"../../common/dtd/ldml.dtd\">\n"
+ "<!-- Copyright \\u00A9 1991-2021 Unicode, Inc.\n"
+ "For terms of use, see http://www.unicode.org/copyright.html\n"
+ "Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.\n"
+ "CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)\n"
+ "\n"
+ "Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for // derived annotations.\n"
+ "-->\n"
+ "<ldml></ldml>";

@Test
public void testSerializeValue() throws XMLStreamException {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,6 @@ public interface Neuron {
*/
List<Extension> getExtension();

/**
* Gets the value of the con property.
*
* <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
* modification you make to the returned list will be present inside the JAXB object. This is why
* there is not a <CODE>set</CODE> method for the con property.
*
* <p>For example, to add a new item, do as follows:
*
* <pre>
* getCon().add(newItem);
* </pre>
*
* <p>Objects of the following type(s) are allowed in the list {@link Con }
*/
List<Con> getCon();

/**
* Gets the value of the id property.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
name = "",
propOrder = {"extension"})
@XmlRootElement(name = "Con")
public class Con {
public class Content {

@XmlElement(name = "Extension")
protected List<Extension> extension;
Expand Down
Loading
Loading