Merge branch 'release/1.0.2'

hal · Oct 27, 2020 · 121316e · 121316e
2 parents 4e3a63b + a147d51
commit 121316e
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 66 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -34,14 +34,14 @@ The packages have been flattened and renamed. All Elemento classes are now in th
 ## J2CL / GWT3
 
 Elemento works with both J2CL and GWT. No classes from `com.google` are used. It only depends on
-                                                                                
-- `com.google.elemental2:elemental2-core` version 1.0.0-RC1
-- `com.google.elemental2:elemental2-dom` version 1.0.0-RC1
-- `com.google.elemental2:elemental2-webstorage` version 1.0.0-RC1
-- `org.gwtproject.event:gwt-event` version HEAD-SNAPSHOT and 
+
+- `com.google.elemental2:elemental2-core` version 1.1.0
+- `com.google.elemental2:elemental2-dom` version 1.1.0
+- `com.google.elemental2:elemental2-webstorage` version 1.1.0
+- `org.gwtproject.event:gwt-event` version 1.0.0-RC1 and 
 - `org.gwtproject.safehtml:gwt-safehtml` version 1.0-SNAPSHOT
 
-You can use Elemento with GWT 2.8, HEAD-SNAPSHOT or J2CL. See the [samples](samples) for more details about how to setup your dependencies.
+You can use Elemento with GWT 2.8, 2.9, HEAD-SNAPSHOT or J2CL. See the [samples](samples) for more details about how to setup your dependencies.
 
 ## Templating
 

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Elemento is available in [Maven Central](https://maven-badges.herokuapp.com/mave
 <dependency>
     <groupId>org.jboss.elemento</groupId>
     <artifactId>elemento-core</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
         <relativePath/>
     </parent>
 
     <groupId>org.jboss.elemento</groupId>
     <artifactId>elemento-core</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>Elemento :: Core</name>
     <description>Builder API and other goodies for GWT Elemental</description>
     <url>http://github.com/hal/elemento</url>
@@ -87,8 +87,8 @@
 
     <properties>
         <!-- project / plugin related properties -->
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -98,15 +98,33 @@
         <!-- dependency versions -->
         <elemental2.version>1.1.0</elemental2.version>
         <gwt-event.version>1.0.0-RC1</gwt-event.version>
-        <gwt-safehtml.version>1.0-SNAPSHOT</gwt-safehtml.version>
-        <junit.version>5.6.2</junit.version>
+        <gwt-safehtml.version>1.0.0-RC1</gwt-safehtml.version>
+        <junit.version>5.7.0</junit.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.google.elemental2</groupId>
             <artifactId>elemental2-core</artifactId>
             <version>${elemental2.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.jsinterop</groupId>
+                    <artifactId>jsinterop-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.elemental2</groupId>
@@ -130,15 +148,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-            <version>${junit.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-            <version>${junit.version}</version>
+            <artifactId>junit-jupiter</artifactId>
         </dependency>
     </dependencies>
 
@@ -232,27 +242,5 @@
             <name>JBoss Public Maven Repository Group</name>
             <url>https://repository.jboss.org/nexus/content/groups/public/</url>
         </repository>
-        <repository>
-            <id>vertispan-snapshots</id>
-            <name>Vertispan Snapshots</name>
-            <url>https://repo.vertispan.com/gwt-snapshot/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>oss-sonatype</id>
-            <name>OSS Sonatype</name>
-            <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 </project>
diff --git a/core/src/main/java/org/jboss/elemento/InputBuilder.java b/core/src/main/java/org/jboss/elemento/InputBuilder.java
@@ -110,4 +110,16 @@ public InputBuilder<E> tabIndex(int tabIndex) {
         element().tabIndex = tabIndex;
         return that();
     }
+
+    /** Modifies the {@code multiple} attribute. */
+    public InputBuilder<E> multiple(boolean multiple) {
+        element().multiple = multiple;
+        return that();
+    }
+
+    /** Modifies the {@code accept} attribute. */
+    public InputBuilder<E> accept(String accept) {
+        element().accept = accept;
+        return that();
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
 
     <groupId>org.jboss.elemento</groupId>
     <artifactId>elemento-parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>Elemento :: Parent</name>
     <packaging>pom</packaging>
 

diff --git a/samples/crysknife/pom.xml b/samples/crysknife/pom.xml
@@ -41,7 +41,7 @@
 
         <!-- dependency versions -->
         <crysknife.version>0.1-SNAPSHOT</crysknife.version>
-        <elemento.version>1.0.1</elemento.version>
+        <elemento.version>1.0.2</elemento.version>
         <gwt-core.version>1.0-SNAPSHOT</gwt-core.version>
     </properties>
 

diff --git a/samples/gwt28/pom.xml b/samples/gwt28/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
 
     <groupId>org.jboss.elemento.samples</groupId>
@@ -118,12 +118,4 @@
             </properties>
         </profile>
     </profiles>
-
-    <repositories>
-        <repository>
-            <id>google-snapshots</id>
-            <name>OSS Sonatype</name>
-            <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-        </repository>
-    </repositories>
 </project>
diff --git a/samples/gwt29/pom.xml b/samples/gwt29/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
 
     <groupId>org.jboss.elemento.samples</groupId>
@@ -100,12 +100,4 @@
             </properties>
         </profile>
     </profiles>
-
-    <repositories>
-        <repository>
-            <id>google-snapshots</id>
-            <name>OSS Sonatype</name>
-            <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-        </repository>
-    </repositories>
 </project>
diff --git a/samples/j2cl/pom.xml b/samples/j2cl/pom.xml
@@ -40,7 +40,7 @@
         <tomcat7-plugin.version>2.2</tomcat7-plugin.version>
 
         <!-- dependency versions -->
-        <elemento.version>1.0.1</elemento.version>
+        <elemento.version>1.0.2</elemento.version>
         <gwt-core.version>1.0-SNAPSHOT</gwt-core.version>
     </properties>