From c04e43c8957722f59d999bdfda0a94de9407fa82 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sat, 6 Jun 2020 14:16:05 +0200 Subject: [PATCH 1/9] improvements * update Maven to be more CI-friendly * add Java 8 to GitHub action * avoid deploying test modules * update gwt to 2.9.0 * remocve commented code --- .github/workflows/maven.yml | 7 +++ .mvn/maven.config | 1 + README.md | 2 + gwt-event-compat-gwt2-tests/pom.xml | 56 ++++++++--------------- gwt-event-compat/pom.xml | 68 ++++++++++++++++++++++++---- gwt-event-gwt2-tests/pom.xml | 47 +++++++------------ gwt-event-j2cl-tests/pom.xml | 47 +++++++++---------- gwt-event-legacy/pom.xml | 68 ++++++++++++++++++++++++---- gwt-event-logical-gwt2-tests/pom.xml | 55 ++++++++-------------- gwt-event-logical-j2cl-tests/pom.xml | 46 +++++++++---------- gwt-event-logical/pom.xml | 68 ++++++++++++++++++++++++---- gwt-event/pom.xml | 68 ++++++++++++++++++++++++---- pom.xml | 43 +++++++++++++++--- 13 files changed, 377 insertions(+), 199 deletions(-) create mode 100644 .mvn/maven.config diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index daa6113..fd3572e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,16 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + java_version: [ 8 ] steps: - uses: actions/checkout@v2 + - name: Set up ${{ matrix.java_version }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java_version }} # TODO: cache dependencies (taking into accounts: Maven plugins, snapshots, etc.) diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..2597e5c --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Drevision=HEAD-SNAPSHOT \ No newline at end of file diff --git a/README.md b/README.md index 3a0f39e..31c4682 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ GWT Events ========== +![GWT3/J2CL compatible](https://img.shields.io/badge/GWT3/J2CL-compatible-brightgreen.svg) [![License](https://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Chat on Gitter](https://badges.gitter.im/hal/elemento.svg)](https://gitter.im/gwtproject/gwt-modules) ![CI](https://github.com/gwtproject/gwt-events/workflows/CI/badge.svg) + A future-proof port of the `com.google.web.bindery.event.Event` GWT module, with no dependency on `gwt-user` (besides the Java Runtime Emulation), to prepare for GWT 3 / J2Cl. diff --git a/gwt-event-compat-gwt2-tests/pom.xml b/gwt-event-compat-gwt2-tests/pom.xml index 8cea736..71ec71c 100644 --- a/gwt-event-compat-gwt2-tests/pom.xml +++ b/gwt-event-compat-gwt2-tests/pom.xml @@ -6,7 +6,7 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} gwt-event-compat-gwt2-tests gwt-lib @@ -15,19 +15,13 @@ Test cases for the GWT 2 tests - UTF-8 - - 1.8 - 1.8 - 1.0.0 https://repo.vertispan.com/j2cl/ https://oss.sonatype.org/content/repositories/google-snapshots/ - - 2.8.2 + 2.9.0 4.12 @@ -35,37 +29,10 @@ org.gwtproject.event gwt-event-compat - HEAD-SNAPSHOT + ${project.version} test - - - - - - - - - - - - - - - - - - - - - - - - - - - junit junit @@ -89,6 +56,23 @@ com.mycila license-maven-plugin + ${maven.license.plugin} + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + diff --git a/gwt-event-compat/pom.xml b/gwt-event-compat/pom.xml index c1cdc8c..a3014b8 100644 --- a/gwt-event-compat/pom.xml +++ b/gwt-event-compat/pom.xml @@ -1,4 +1,21 @@ + @@ -6,7 +23,7 @@ org.gwtproject.event gwt-event-compat - HEAD-SNAPSHOT + ${revision} gwt-lib GWT Compat Event @@ -43,11 +60,18 @@ 2017 + UTF-8 + + 1.8 + 1.8 + + 3.8.1 3.0.0-M1 - 1.6 + 1.1.0 1.0.0 - 3.1.1 - 3.0 + 1.6 + 3.2.0 + 3.0 3.2.1 2.9.0 @@ -86,10 +110,10 @@ com.mycila license-maven-plugin - ${maven.licence.plugin} + ${maven.license.plugin}
LICENSE.header
- UTF-8 + ${project.build.sourceEncoding} true SLASHSTAR_STYLE @@ -99,13 +123,12 @@ **/LICENSE **/LICENSE.header **/AUTHORS - **/*.xml src/test/resources/** src/main/resources/** ${project.inceptionYear} - The GWT Authors + ${project.organization.name} @@ -125,10 +148,35 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} + + org.codehaus.mojo + flatten-maven-plugin + ${maven.flatten.plugin} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/gwt-event-gwt2-tests/pom.xml b/gwt-event-gwt2-tests/pom.xml index 4370cf7..60c4696 100644 --- a/gwt-event-gwt2-tests/pom.xml +++ b/gwt-event-gwt2-tests/pom.xml @@ -6,7 +6,7 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} gwt-event-gwt2-tests gwt-lib @@ -26,39 +26,10 @@ https://repo.vertispan.com/j2cl/ https://oss.sonatype.org/content/repositories/google-snapshots/ - - 4.12 - - - - - - - - - - - - - - - - - - - - - - - - - - - junit junit @@ -83,6 +54,22 @@ com.mycila license-maven-plugin + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-j2cl-tests/pom.xml b/gwt-event-j2cl-tests/pom.xml index 20f7724..c03e29f 100644 --- a/gwt-event-j2cl-tests/pom.xml +++ b/gwt-event-j2cl-tests/pom.xml @@ -6,7 +6,7 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} gwt-event-j2cl-tests @@ -15,37 +15,15 @@ https://github.com/gwtproject/gwt-event - UTF-8 - - 1.8 - 1.8 - - 0.13-SNAPSHOT - 3.0 - 3.0.0-M1 + 0.15-SNAPSHOT https://repo.vertispan.com/j2cl/ - 1.0.0-RC1 0.7-SNAPSHOT - - - - - - - - - - - - - - com.vertispan.j2cl @@ -73,19 +51,20 @@ com.mycila license-maven-plugin + ${maven.license.plugin} com.vertispan.j2cl j2cl-maven-plugin ${maven.j2cl.plugin} - ADVANCED - + com.vertispan.j2cl:closure-test:zip:jszip:0.7-20200424.004055-5 j2cl-test + test test @@ -100,6 +79,22 @@ true + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-legacy/pom.xml b/gwt-event-legacy/pom.xml index 80225de..f286235 100644 --- a/gwt-event-legacy/pom.xml +++ b/gwt-event-legacy/pom.xml @@ -1,4 +1,21 @@ + @@ -6,7 +23,7 @@ org.gwtproject.event gwt-event-legacy - HEAD-SNAPSHOT + ${revision} gwt-lib GWT Legacy Event @@ -43,11 +60,18 @@ 2017 + UTF-8 + + 1.8 + 1.8 + + 3.8.1 3.0.0-M1 - 1.6 + 1.1.0 1.0.0 - 3.1.1 - 3.0 + 1.6 + 3.2.0 + 3.0 3.2.1 @@ -73,10 +97,10 @@ com.mycila license-maven-plugin - ${maven.licence.plugin} + ${maven.license.plugin}
LICENSE.header
- UTF-8 + ${project.build.sourceEncoding} true SLASHSTAR_STYLE @@ -86,13 +110,12 @@ **/LICENSE **/LICENSE.header **/AUTHORS - **/*.xml src/test/resources/** src/main/resources/** ${project.inceptionYear} - The GWT Authors + ${project.organization.name} @@ -112,10 +135,35 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} + + org.codehaus.mojo + flatten-maven-plugin + ${maven.flatten.plugin} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/gwt-event-logical-gwt2-tests/pom.xml b/gwt-event-logical-gwt2-tests/pom.xml index e429e6a..22bef29 100644 --- a/gwt-event-logical-gwt2-tests/pom.xml +++ b/gwt-event-logical-gwt2-tests/pom.xml @@ -6,7 +6,7 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} gwt-event-logical-gwt2-tests gwt-lib @@ -15,19 +15,12 @@ Test cases for the GWT 2 tests - UTF-8 - - 1.8 - 1.8 - 1.0.0 https://repo.vertispan.com/j2cl/ https://oss.sonatype.org/content/repositories/google-snapshots/ - - 4.12 @@ -35,37 +28,10 @@ org.gwtproject.event gwt-event-logical - HEAD-SNAPSHOT + ${project.version} test - - - - - - - - - - - - - - - - - - - - - - - - - - - junit junit @@ -89,6 +55,23 @@ com.mycila license-maven-plugin + ${maven.license.plugin} + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + diff --git a/gwt-event-logical-j2cl-tests/pom.xml b/gwt-event-logical-j2cl-tests/pom.xml index cd07213..92ea765 100644 --- a/gwt-event-logical-j2cl-tests/pom.xml +++ b/gwt-event-logical-j2cl-tests/pom.xml @@ -6,7 +6,7 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} gwt-event-logical-j2cl-tests @@ -15,19 +15,11 @@ https://github.com/gwtproject/gwt-event - UTF-8 - - 1.8 - 1.8 - - 0.13-SNAPSHOT - 3.0 - 3.0.0-M1 + 0.15-SNAPSHOT https://repo.vertispan.com/j2cl/ - 1.0.0-RC1 0.7-SNAPSHOT @@ -38,19 +30,6 @@ ${project.version} test - - - - - - - - - - - - - @@ -79,19 +58,20 @@ com.mycila license-maven-plugin + ${maven.license.plugin} com.vertispan.j2cl j2cl-maven-plugin ${maven.j2cl.plugin} - ADVANCED - + com.vertispan.j2cl:closure-test:zip:jszip:0.7-20200424.004055-5 j2cl-test + test test @@ -106,6 +86,22 @@ true + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-logical/pom.xml b/gwt-event-logical/pom.xml index 8768b78..7858365 100644 --- a/gwt-event-logical/pom.xml +++ b/gwt-event-logical/pom.xml @@ -1,4 +1,21 @@ + @@ -6,7 +23,7 @@ org.gwtproject.event gwt-event-logical - HEAD-SNAPSHOT + ${revision} gwt-lib GWT Logical Event @@ -43,11 +60,18 @@ 2017 + UTF-8 + + 1.8 + 1.8 + + 3.8.1 3.0.0-M1 - 1.6 + 1.1.0 1.0.0 - 3.1.1 - 3.0 + 1.6 + 3.2.0 + 3.0 3.2.1 @@ -73,10 +97,10 @@ com.mycila license-maven-plugin - ${maven.licence.plugin} + ${maven.license.plugin}
LICENSE.header
- UTF-8 + ${project.build.sourceEncoding} true SLASHSTAR_STYLE @@ -86,13 +110,12 @@ **/LICENSE **/LICENSE.header **/AUTHORS - **/*.xml src/test/resources/** src/main/resources/** ${project.inceptionYear} - The GWT Authors + ${project.organization.name} @@ -112,10 +135,35 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} + + org.codehaus.mojo + flatten-maven-plugin + ${maven.flatten.plugin} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/gwt-event/pom.xml b/gwt-event/pom.xml index d1c5f7e..fb0f529 100644 --- a/gwt-event/pom.xml +++ b/gwt-event/pom.xml @@ -1,4 +1,21 @@ + @@ -6,7 +23,7 @@ org.gwtproject.event gwt-event - HEAD-SNAPSHOT + ${revision} gwt-lib GWT Event @@ -45,11 +62,18 @@ 2017 + UTF-8 + + 1.8 + 1.8 + + 3.8.1 3.0.0-M1 - 1.6 + 1.1.0 1.0.0 - 3.1.1 - 3.0 + 1.6 + 3.2.0 + 3.0 3.2.1 @@ -67,10 +91,10 @@ com.mycila license-maven-plugin - ${maven.licence.plugin} + ${maven.license.plugin}
LICENSE.header
- UTF-8 + ${project.build.sourceEncoding} true SLASHSTAR_STYLE @@ -80,13 +104,12 @@ **/LICENSE **/LICENSE.header **/AUTHORS - **/*.xml src/test/resources/** src/main/resources/** ${project.inceptionYear} - The GWT Authors + ${project.organization.name} @@ -106,10 +129,35 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} + + org.codehaus.mojo + flatten-maven-plugin + ${maven.flatten.plugin} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/pom.xml b/pom.xml index 8788cd0..a34fe2f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,12 @@ org.gwtproject.event gwt-event-parent - HEAD-SNAPSHOT + ${revision} pom GWT Event Parent - Parent POM containing the gwt-event modules and the test modules (gwt2-tests and j2cl-tests) - + Parent POM containing the gwt-event modules and the test modules (gwt2-tests and j2cl-tests) https://github.com/gwtproject/gwt-timer @@ -57,16 +56,23 @@ UTF-8 + 1.8 + 1.8 + + 3.8.1 3.0.0-M1 + 1.1.0 2.9 - 3.0 + 3.0.0-M1 + 3.0 + 3.0.0-M1 org.gwtproject.event gwt-event - HEAD-SNAPSHOT + ${project.version} test @@ -93,13 +99,38 @@ true + + org.codehaus.mojo + flatten-maven-plugin + ${maven.flatten.plugin} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + com.mycila license-maven-plugin - ${maven.licence.plugin} + ${maven.license.plugin}
LICENSE.header
${project.build.sourceEncoding} From d79967f5367b4a78159f8d8aa541c327adeb8d0a Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sat, 6 Jun 2020 14:27:31 +0200 Subject: [PATCH 2/9] update README.md --- README.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31c4682..e85e88d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -GWT Events -========== +GWT Event +========= ![GWT3/J2CL compatible](https://img.shields.io/badge/GWT3/J2CL-compatible-brightgreen.svg) [![License](https://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Chat on Gitter](https://badges.gitter.im/hal/elemento.svg)](https://gitter.im/gwtproject/gwt-modules) ![CI](https://github.com/gwtproject/gwt-events/workflows/CI/badge.svg) @@ -178,3 +178,27 @@ and then refactor your code from `GwtEvent` to `Event`). import org.gwtproject.event.legacy.shared.EventHandler; import org.gwtproject.event.legacy.shared.GwtEvent; ``` + +## Instructions + +To build gwt-event: + +* run `mvn clean install` + +on the parent directory. + +To run the j2cl tests: + +* switch to the 'gwt-timer-j2cl-tests' directory +* run `mvn j2cl:clean` & `mvn j2cl:test` + +**Note: To build the module you need Maven 3.6.3 or newer** + +## System Requirements + +**GWT Event requires GWT 2.9.0 or newer!** + + +## Dependencies + +GWT Event does not depend on any other module. From 7e36379bcd575de0c99d72f32c0cb351a59cabea Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sat, 6 Jun 2020 16:45:56 +0200 Subject: [PATCH 3/9] update README.md & poms --- README.md | 5 ----- gwt-event-compat-gwt2-tests/pom.xml | 2 -- gwt-event-gwt2-tests/pom.xml | 2 -- gwt-event-j2cl-tests/pom.xml | 1 - gwt-event-logical-gwt2-tests/pom.xml | 2 -- gwt-event-logical-j2cl-tests/pom.xml | 1 - 6 files changed, 13 deletions(-) diff --git a/README.md b/README.md index e85e88d..462c17b 100644 --- a/README.md +++ b/README.md @@ -187,11 +187,6 @@ To build gwt-event: on the parent directory. -To run the j2cl tests: - -* switch to the 'gwt-timer-j2cl-tests' directory -* run `mvn j2cl:clean` & `mvn j2cl:test` - **Note: To build the module you need Maven 3.6.3 or newer** ## System Requirements diff --git a/gwt-event-compat-gwt2-tests/pom.xml b/gwt-event-compat-gwt2-tests/pom.xml index 71ec71c..4563d48 100644 --- a/gwt-event-compat-gwt2-tests/pom.xml +++ b/gwt-event-compat-gwt2-tests/pom.xml @@ -9,7 +9,6 @@ ${revision} gwt-event-compat-gwt2-tests - gwt-lib GWT Compat Event GWT 2 Tests Test cases for the GWT 2 tests @@ -50,7 +49,6 @@ true true - org.gwtproject.event.compat.shared.EventCompatSuite diff --git a/gwt-event-gwt2-tests/pom.xml b/gwt-event-gwt2-tests/pom.xml index 60c4696..c9bf8e6 100644 --- a/gwt-event-gwt2-tests/pom.xml +++ b/gwt-event-gwt2-tests/pom.xml @@ -9,7 +9,6 @@ ${revision} gwt-event-gwt2-tests - gwt-lib GWT Event GWT 2 Tests Test cases for the GWT 2 tests @@ -47,7 +46,6 @@ true true - org.gwtproject.event.shared.EventSharedSuite diff --git a/gwt-event-j2cl-tests/pom.xml b/gwt-event-j2cl-tests/pom.xml index c03e29f..d6cdf8e 100644 --- a/gwt-event-j2cl-tests/pom.xml +++ b/gwt-event-j2cl-tests/pom.xml @@ -59,7 +59,6 @@ ${maven.j2cl.plugin} ADVANCED - com.vertispan.j2cl:closure-test:zip:jszip:0.7-20200424.004055-5 diff --git a/gwt-event-logical-gwt2-tests/pom.xml b/gwt-event-logical-gwt2-tests/pom.xml index 22bef29..9796b29 100644 --- a/gwt-event-logical-gwt2-tests/pom.xml +++ b/gwt-event-logical-gwt2-tests/pom.xml @@ -9,7 +9,6 @@ ${revision} gwt-event-logical-gwt2-tests - gwt-lib GWT Logical Event GWT 2 Tests Test cases for the GWT 2 tests @@ -49,7 +48,6 @@ true true - org.gwtproject.event.logical.shared.LogicalEventSuite diff --git a/gwt-event-logical-j2cl-tests/pom.xml b/gwt-event-logical-j2cl-tests/pom.xml index 92ea765..7fbfe22 100644 --- a/gwt-event-logical-j2cl-tests/pom.xml +++ b/gwt-event-logical-j2cl-tests/pom.xml @@ -66,7 +66,6 @@ ${maven.j2cl.plugin} ADVANCED - com.vertispan.j2cl:closure-test:zip:jszip:0.7-20200424.004055-5 From 2230906bbe4eeff7868b9dc559c2af614bbf8350 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Sun, 7 Jun 2020 17:51:57 +0200 Subject: [PATCH 4/9] improvements --- .editorconfig | 16 ++++++ .github/workflows/maven.yml | 25 ++++++--- .gitignore | 1 + .../LICENSE.header => LICENSE.header | 0 README.md | 4 +- gwt-event-compat-gwt2-tests/pom.xml | 38 ++++++------- gwt-event-compat/pom.xml | 11 +--- gwt-event-gwt2-tests/LICENSE.header | 13 ----- gwt-event-gwt2-tests/pom.xml | 44 ++++++--------- gwt-event-j2cl-tests/LICENSE.header | 13 ----- gwt-event-j2cl-tests/pom.xml | 38 ++++++------- gwt-event-legacy/pom.xml | 15 +++-- gwt-event-logical-gwt2-tests/LICENSE.header | 13 ----- gwt-event-logical-gwt2-tests/pom.xml | 42 +++++++------- gwt-event-logical-j2cl-tests/LICENSE.header | 13 ----- gwt-event-logical-j2cl-tests/pom.xml | 38 ++++++------- gwt-event-logical/pom.xml | 22 ++++---- gwt-event/pom.xml | 19 ++++--- pom.xml | 55 +++++++++++++++++-- 19 files changed, 206 insertions(+), 214 deletions(-) rename gwt-event-compat-gwt2-tests/LICENSE.header => LICENSE.header (100%) delete mode 100644 gwt-event-gwt2-tests/LICENSE.header delete mode 100644 gwt-event-j2cl-tests/LICENSE.header delete mode 100644 gwt-event-logical-gwt2-tests/LICENSE.header delete mode 100644 gwt-event-logical-j2cl-tests/LICENSE.header diff --git a/.editorconfig b/.editorconfig index 0310803..db5a9ee 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,19 @@ +# +# Copyright © 2017 The GWT Project +# +# 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. +# See the License for the specific language governing permissions and +# limitations under the License. +# + root = true [*] diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fd3572e..36d08fa 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,3 +1,19 @@ +# +# Copyright © 2017 The GWT Project +# +# 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. +# See the License for the specific language governing permissions and +# limitations under the License. +# + name: CI on: [push, pull_request] @@ -5,19 +21,12 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - java_version: [ 8 ] steps: - uses: actions/checkout@v2 - - name: Set up ${{ matrix.java_version }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java_version }} # TODO: cache dependencies (taking into accounts: Maven plugins, snapshots, etc.) - name: Build with Maven - run: mvn -V -B -ntp -U -e verify + run: JAVA_HOME=$JAVA_HOME_8_X64 mvn -V -B -ntp -U -e verify diff --git a/.gitignore b/.gitignore index 000c450..1f39a6a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ target/ +.flattened-pom.xml diff --git a/gwt-event-compat-gwt2-tests/LICENSE.header b/LICENSE.header similarity index 100% rename from gwt-event-compat-gwt2-tests/LICENSE.header rename to LICENSE.header diff --git a/README.md b/README.md index 462c17b..9c8f0ae 100644 --- a/README.md +++ b/README.md @@ -183,9 +183,9 @@ and then refactor your code from `GwtEvent` to `Event`). To build gwt-event: -* run `mvn clean install` +* run `mvn clean verify` -on the parent directory. +on the parent directory. This will build the artifact and run tests against the JVM, J2CL, and GWT2. **Note: To build the module you need Maven 3.6.3 or newer** diff --git a/gwt-event-compat-gwt2-tests/pom.xml b/gwt-event-compat-gwt2-tests/pom.xml index 4563d48..3012bfe 100644 --- a/gwt-event-compat-gwt2-tests/pom.xml +++ b/gwt-event-compat-gwt2-tests/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -51,27 +68,6 @@ true - - com.mycila - license-maven-plugin - ${maven.license.plugin} - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} - - true - - diff --git a/gwt-event-compat/pom.xml b/gwt-event-compat/pom.xml index a3014b8..cd5afa4 100644 --- a/gwt-event-compat/pom.xml +++ b/gwt-event-compat/pom.xml @@ -46,7 +46,7 @@ - The GWT Authors + The GWT Project Authors https://github.com/gwtproject @@ -67,7 +67,7 @@ 3.8.1 3.0.0-M1 - 1.1.0 + 1.2.2 1.0.0 1.6 3.2.0 @@ -140,17 +140,12 @@ - org.apache.maven.plugins maven-deploy-plugin ${maven.deploy.plugin} - org.apache.maven.plugins maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - + ${maven.compiler.plugin} org.codehaus.mojo diff --git a/gwt-event-gwt2-tests/LICENSE.header b/gwt-event-gwt2-tests/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-gwt2-tests/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-gwt2-tests/pom.xml b/gwt-event-gwt2-tests/pom.xml index c9bf8e6..c950199 100644 --- a/gwt-event-gwt2-tests/pom.xml +++ b/gwt-event-gwt2-tests/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -14,11 +31,6 @@ Test cases for the GWT 2 tests - UTF-8 - - 1.8 - 1.8 - 1.0.0 @@ -48,26 +60,6 @@ true - - com.mycila - license-maven-plugin - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} - - true - - - + diff --git a/gwt-event-j2cl-tests/LICENSE.header b/gwt-event-j2cl-tests/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-j2cl-tests/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-j2cl-tests/pom.xml b/gwt-event-j2cl-tests/pom.xml index d6cdf8e..08bef49 100644 --- a/gwt-event-j2cl-tests/pom.xml +++ b/gwt-event-j2cl-tests/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -48,11 +65,6 @@ - - com.mycila - license-maven-plugin - ${maven.license.plugin} - com.vertispan.j2cl j2cl-maven-plugin @@ -78,22 +90,6 @@ true - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} - - true - - diff --git a/gwt-event-legacy/pom.xml b/gwt-event-legacy/pom.xml index f286235..7bd1d33 100644 --- a/gwt-event-legacy/pom.xml +++ b/gwt-event-legacy/pom.xml @@ -46,7 +46,7 @@ - The GWT Authors + The GWT Project Authors https://github.com/gwtproject @@ -67,7 +67,7 @@ 3.8.1 3.0.0-M1 - 1.1.0 + 1.2.2 1.0.0 1.6 3.2.0 @@ -85,6 +85,10 @@ + + org.apache.maven.plugins + maven-compiler-plugin + net.ltgt.gwt.maven gwt-maven-plugin @@ -127,17 +131,12 @@ - org.apache.maven.plugins maven-deploy-plugin ${maven.deploy.plugin} - org.apache.maven.plugins maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - + ${maven.compiler.plugin} org.codehaus.mojo diff --git a/gwt-event-logical-gwt2-tests/LICENSE.header b/gwt-event-logical-gwt2-tests/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-logical-gwt2-tests/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-logical-gwt2-tests/pom.xml b/gwt-event-logical-gwt2-tests/pom.xml index 9796b29..48074d8 100644 --- a/gwt-event-logical-gwt2-tests/pom.xml +++ b/gwt-event-logical-gwt2-tests/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -41,6 +58,10 @@ + + org.apache.maven.plugins + maven-compiler-plugin + net.ltgt.gwt.maven gwt-maven-plugin @@ -50,27 +71,6 @@ true - - com.mycila - license-maven-plugin - ${maven.license.plugin} - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} - - true - - diff --git a/gwt-event-logical-j2cl-tests/LICENSE.header b/gwt-event-logical-j2cl-tests/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-logical-j2cl-tests/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-logical-j2cl-tests/pom.xml b/gwt-event-logical-j2cl-tests/pom.xml index 7fbfe22..7b4b763 100644 --- a/gwt-event-logical-j2cl-tests/pom.xml +++ b/gwt-event-logical-j2cl-tests/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -55,11 +72,6 @@ - - com.mycila - license-maven-plugin - ${maven.license.plugin} - com.vertispan.j2cl j2cl-maven-plugin @@ -85,22 +97,6 @@ true - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} - - true - - diff --git a/gwt-event-logical/pom.xml b/gwt-event-logical/pom.xml index 7858365..0ea4595 100644 --- a/gwt-event-logical/pom.xml +++ b/gwt-event-logical/pom.xml @@ -46,7 +46,7 @@ - The GWT Authors + The GWT Project Authors https://github.com/gwtproject @@ -67,7 +67,7 @@ 3.8.1 3.0.0-M1 - 1.1.0 + 1.2.2 1.0.0 1.6 3.2.0 @@ -85,6 +85,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + net.ltgt.gwt.maven gwt-maven-plugin @@ -100,7 +108,6 @@ ${maven.license.plugin}
LICENSE.header
- ${project.build.sourceEncoding} true SLASHSTAR_STYLE @@ -127,18 +134,9 @@ - org.apache.maven.plugins maven-deploy-plugin ${maven.deploy.plugin} - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - org.codehaus.mojo flatten-maven-plugin diff --git a/gwt-event/pom.xml b/gwt-event/pom.xml index fb0f529..4f6bc6c 100644 --- a/gwt-event/pom.xml +++ b/gwt-event/pom.xml @@ -48,7 +48,7 @@ - The GWT Authors + The GWT Project Authors https://github.com/gwtproject @@ -69,7 +69,7 @@ 3.8.1 3.0.0-M1 - 1.1.0 + 1.2.2 1.0.0 1.6 3.2.0 @@ -79,6 +79,14 @@ + + + + + + + + net.ltgt.gwt.maven gwt-maven-plugin @@ -121,17 +129,12 @@ - org.apache.maven.plugins maven-deploy-plugin ${maven.deploy.plugin} - org.apache.maven.plugins maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - + ${maven.compiler.plugin} org.codehaus.mojo diff --git a/pom.xml b/pom.xml index a34fe2f..6089c69 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,21 @@ + 4.0.0 @@ -28,7 +45,7 @@ - The GWT Authors + The GWT Project Authors https://github.com/gwtproject @@ -61,7 +78,7 @@ 3.8.1 3.0.0-M1 - 1.1.0 + 1.2.2 2.9 3.0.0-M1 3.0 @@ -79,6 +96,10 @@ + + com.mycila + license-maven-plugin + com.coveo fmt-maven-plugin @@ -91,6 +112,14 @@ + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin} + + true + + org.apache.maven.plugins maven-deploy-plugin @@ -127,6 +156,15 @@ + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin} + + ${maven.compiler.source} + ${maven.compiler.target} + + com.mycila license-maven-plugin @@ -138,12 +176,17 @@ SLASHSTAR_STYLE - - src/test/java - + + **/README.md + **/LICENSE + **/LICENSE.header + **/AUTHORS + **/src/test/resources/** + **/src/main/resources/** + ${project.inceptionYear} - The GWT Authors + ${project.organization.name} From da64b2a07d8ae52087ac7229beb47365a470e5eb Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jun 2020 07:28:11 +0200 Subject: [PATCH 5/9] define central version using flatten-m-p --- .mvn/maven.config | 1 - README.md | 2 - gwt-event-compat-gwt2-tests/pom.xml | 14 +--- gwt-event-compat/LICENSE.header | 13 --- gwt-event-compat/pom.xml | 93 ++------------------- gwt-event-gwt2-tests/pom.xml | 33 +++++--- gwt-event-j2cl-tests/pom.xml | 18 ++--- gwt-event-legacy/LICENSE.header | 13 --- gwt-event-legacy/pom.xml | 95 ++-------------------- gwt-event-logical-gwt2-tests/pom.xml | 16 +++- gwt-event-logical-j2cl-tests/pom.xml | 18 ++--- gwt-event-logical/LICENSE.header | 13 --- gwt-event-logical/pom.xml | 94 ++------------------- gwt-event/LICENSE.header | 13 --- gwt-event/pom.xml | 95 ++-------------------- pom.xml | 117 +++++++++++++-------------- 16 files changed, 138 insertions(+), 510 deletions(-) delete mode 100644 .mvn/maven.config delete mode 100644 gwt-event-compat/LICENSE.header delete mode 100644 gwt-event-legacy/LICENSE.header delete mode 100644 gwt-event-logical/LICENSE.header delete mode 100644 gwt-event/LICENSE.header diff --git a/.mvn/maven.config b/.mvn/maven.config deleted file mode 100644 index 2597e5c..0000000 --- a/.mvn/maven.config +++ /dev/null @@ -1 +0,0 @@ --Drevision=HEAD-SNAPSHOT \ No newline at end of file diff --git a/README.md b/README.md index 9c8f0ae..fabe3f8 100644 --- a/README.md +++ b/README.md @@ -187,8 +187,6 @@ To build gwt-event: on the parent directory. This will build the artifact and run tests against the JVM, J2CL, and GWT2. -**Note: To build the module you need Maven 3.6.3 or newer** - ## System Requirements **GWT Event requires GWT 2.9.0 or newer!** diff --git a/gwt-event-compat-gwt2-tests/pom.xml b/gwt-event-compat-gwt2-tests/pom.xml index 3012bfe..21b3624 100644 --- a/gwt-event-compat-gwt2-tests/pom.xml +++ b/gwt-event-compat-gwt2-tests/pom.xml @@ -23,24 +23,14 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev gwt-event-compat-gwt2-tests + ${revision} GWT Compat Event GWT 2 Tests Test cases for the GWT 2 tests - - 1.0.0 - - - https://repo.vertispan.com/j2cl/ - https://oss.sonatype.org/content/repositories/google-snapshots/ - - 2.9.0 - 4.12 - - org.gwtproject.event diff --git a/gwt-event-compat/LICENSE.header b/gwt-event-compat/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-compat/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-compat/pom.xml b/gwt-event-compat/pom.xml index cd5afa4..999af32 100644 --- a/gwt-event-compat/pom.xml +++ b/gwt-event-compat/pom.xml @@ -21,7 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.gwtproject.event + + org.gwtproject.event + gwt-event-parent + dev + gwt-event-compat ${revision} gwt-lib @@ -59,24 +63,6 @@ 2017 - - UTF-8 - - 1.8 - 1.8 - - 3.8.1 - 3.0.0-M1 - 1.2.2 - 1.0.0 - 1.6 - 3.2.0 - 3.0 - 3.2.1 - - 2.9.0 - - com.google.gwt @@ -89,10 +75,10 @@ ${gwt.version} + - org.gwtproject.event + ${project.groupId} gwt-event - ${project.version} @@ -107,71 +93,6 @@ org.gwtproject.event.compat.EventCompat - - com.mycila - license-maven-plugin - ${maven.license.plugin} - -
LICENSE.header
- ${project.build.sourceEncoding} - true - - SLASHSTAR_STYLE - - - **/README.md - **/LICENSE - **/LICENSE.header - **/AUTHORS - src/test/resources/** - src/main/resources/** - - - ${project.inceptionYear} - ${project.organization.name} - - - - - - check - - - - - - maven-deploy-plugin - ${maven.deploy.plugin} - - - maven-compiler-plugin - ${maven.compiler.plugin} - - - org.codehaus.mojo - flatten-maven-plugin - ${maven.flatten.plugin} - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - diff --git a/gwt-event-gwt2-tests/pom.xml b/gwt-event-gwt2-tests/pom.xml index c950199..dd41883 100644 --- a/gwt-event-gwt2-tests/pom.xml +++ b/gwt-event-gwt2-tests/pom.xml @@ -23,30 +23,41 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev gwt-event-gwt2-tests + ${revision} GWT Event GWT 2 Tests Test cases for the GWT 2 tests - - 1.0.0 - - - https://repo.vertispan.com/j2cl/ - https://oss.sonatype.org/content/repositories/google-snapshots/ - - 4.12 - - + + com.google.gwt + gwt-user + ${gwt.version} + test + + + com.google.gwt + gwt-dev + ${gwt.version} + test + + junit junit ${junit.version} test + + + + ${project.groupId} + gwt-event + test + diff --git a/gwt-event-j2cl-tests/pom.xml b/gwt-event-j2cl-tests/pom.xml index 08bef49..e572c78 100644 --- a/gwt-event-j2cl-tests/pom.xml +++ b/gwt-event-j2cl-tests/pom.xml @@ -23,23 +23,15 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev gwt-event-j2cl-tests + ${revision} GWT Event J2CL Tests Test cases for the J2Cl tests https://github.com/gwtproject/gwt-event - - 0.15-SNAPSHOT - - - https://repo.vertispan.com/j2cl/ - - 0.7-SNAPSHOT - - @@ -61,6 +53,12 @@ ${j2cl.version} test + + + org.gwtproject.event + gwt-event + test + diff --git a/gwt-event-legacy/LICENSE.header b/gwt-event-legacy/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-legacy/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-legacy/pom.xml b/gwt-event-legacy/pom.xml index 7bd1d33..50e7fc9 100644 --- a/gwt-event-legacy/pom.xml +++ b/gwt-event-legacy/pom.xml @@ -21,7 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.gwtproject.event + + org.gwtproject.event + gwt-event-parent + dev + gwt-event-legacy ${revision} gwt-lib @@ -59,36 +63,16 @@ 2017 - - UTF-8 - - 1.8 - 1.8 - - 3.8.1 - 3.0.0-M1 - 1.2.2 - 1.0.0 - 1.6 - 3.2.0 - 3.0 - 3.2.1 - - + - org.gwtproject.event + ${project.groupId} gwt-event - ${project.version} - - org.apache.maven.plugins - maven-compiler-plugin - net.ltgt.gwt.maven gwt-maven-plugin @@ -98,71 +82,6 @@ org.gwtproject.event.legacy.EventLegacy - - com.mycila - license-maven-plugin - ${maven.license.plugin} - -
LICENSE.header
- ${project.build.sourceEncoding} - true - - SLASHSTAR_STYLE - - - **/README.md - **/LICENSE - **/LICENSE.header - **/AUTHORS - src/test/resources/** - src/main/resources/** - - - ${project.inceptionYear} - ${project.organization.name} - - - - - - check - - - - - - maven-deploy-plugin - ${maven.deploy.plugin} - - - maven-compiler-plugin - ${maven.compiler.plugin} - - - org.codehaus.mojo - flatten-maven-plugin - ${maven.flatten.plugin} - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - diff --git a/gwt-event-logical-gwt2-tests/pom.xml b/gwt-event-logical-gwt2-tests/pom.xml index 48074d8..a38e255 100644 --- a/gwt-event-logical-gwt2-tests/pom.xml +++ b/gwt-event-logical-gwt2-tests/pom.xml @@ -23,9 +23,10 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev gwt-event-logical-gwt2-tests + ${revision} GWT Logical Event GWT 2 Tests Test cases for the GWT 2 tests @@ -41,6 +42,19 @@ + + com.google.gwt + gwt-user + ${gwt.version} + test + + + com.google.gwt + gwt-dev + ${gwt.version} + test + + org.gwtproject.event gwt-event-logical diff --git a/gwt-event-logical-j2cl-tests/pom.xml b/gwt-event-logical-j2cl-tests/pom.xml index 7b4b763..d335a73 100644 --- a/gwt-event-logical-j2cl-tests/pom.xml +++ b/gwt-event-logical-j2cl-tests/pom.xml @@ -23,23 +23,15 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev gwt-event-logical-j2cl-tests + ${revision} GWT Logical Event J2CL Tests Test cases for the J2Cl tests https://github.com/gwtproject/gwt-event - - 0.15-SNAPSHOT - - - https://repo.vertispan.com/j2cl/ - - 0.7-SNAPSHOT - - org.gwtproject.event @@ -68,6 +60,12 @@ ${j2cl.version} test + + + org.gwtproject.event + gwt-event + test + diff --git a/gwt-event-logical/LICENSE.header b/gwt-event-logical/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event-logical/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event-logical/pom.xml b/gwt-event-logical/pom.xml index 0ea4595..bd9bd24 100644 --- a/gwt-event-logical/pom.xml +++ b/gwt-event-logical/pom.xml @@ -21,7 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.gwtproject.event + + org.gwtproject.event + gwt-event-parent + dev + gwt-event-logical ${revision} gwt-lib @@ -59,40 +63,16 @@ 2017 - - UTF-8 - - 1.8 - 1.8 - - 3.8.1 - 3.0.0-M1 - 1.2.2 - 1.0.0 - 1.6 - 3.2.0 - 3.0 - 3.2.1 - - + - org.gwtproject.event + ${project.groupId} gwt-event - ${project.version} - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - net.ltgt.gwt.maven gwt-maven-plugin @@ -102,66 +82,6 @@ org.gwtproject.event.logical.LogicalEvent - - com.mycila - license-maven-plugin - ${maven.license.plugin} - -
LICENSE.header
- true - - SLASHSTAR_STYLE - - - **/README.md - **/LICENSE - **/LICENSE.header - **/AUTHORS - src/test/resources/** - src/main/resources/** - - - ${project.inceptionYear} - ${project.organization.name} - - - - - - check - - - - - - maven-deploy-plugin - ${maven.deploy.plugin} - - - org.codehaus.mojo - flatten-maven-plugin - ${maven.flatten.plugin} - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - diff --git a/gwt-event/LICENSE.header b/gwt-event/LICENSE.header deleted file mode 100644 index 7614535..0000000 --- a/gwt-event/LICENSE.header +++ /dev/null @@ -1,13 +0,0 @@ -Copyright © ${year} ${name} - -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. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/gwt-event/pom.xml b/gwt-event/pom.xml index 4f6bc6c..b2187ed 100644 --- a/gwt-event/pom.xml +++ b/gwt-event/pom.xml @@ -21,7 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.gwtproject.event + + org.gwtproject.event + gwt-event-parent + dev + gwt-event ${revision} gwt-lib @@ -61,32 +65,8 @@ 2017 - - UTF-8 - - 1.8 - 1.8 - - 3.8.1 - 3.0.0-M1 - 1.2.2 - 1.0.0 - 1.6 - 3.2.0 - 3.0 - 3.2.1 - - - - - - - - - - net.ltgt.gwt.maven gwt-maven-plugin @@ -96,71 +76,6 @@ org.gwtproject.event.Event - - com.mycila - license-maven-plugin - ${maven.license.plugin} - -
LICENSE.header
- ${project.build.sourceEncoding} - true - - SLASHSTAR_STYLE - - - **/README.md - **/LICENSE - **/LICENSE.header - **/AUTHORS - src/test/resources/** - src/main/resources/** - - - ${project.inceptionYear} - ${project.organization.name} - - - - - - check - - - - - - maven-deploy-plugin - ${maven.deploy.plugin} - - - maven-compiler-plugin - ${maven.compiler.plugin} - - - org.codehaus.mojo - flatten-maven-plugin - ${maven.flatten.plugin} - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - diff --git a/pom.xml b/pom.xml index 6089c69..c540e76 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.gwtproject.event gwt-event-parent - ${revision} + dev pom @@ -71,35 +71,36 @@ + HEAD-SNAPSHOT + UTF-8 1.8 1.8 + + https://repo.vertispan.com/j2cl/ + 3.8.1 3.0.0-M1 1.2.2 2.9 + 1.6 + 1.0.0 + 3.2.0 + 0.15-SNAPSHOT 3.0.0-M1 3.0 + 3.2.1 3.0.0-M1 - - - - org.gwtproject.event - gwt-event - ${project.version} - test - - + 2.9.0 + 4.12 + 0.7-SNAPSHOT + - - com.mycila - license-maven-plugin - com.coveo fmt-maven-plugin @@ -113,28 +114,45 @@ - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin} - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin} + com.mycila + license-maven-plugin + ${maven.license.plugin} - true +
LICENSE.header
+ ${project.build.sourceEncoding} + true + + SLASHSTAR_STYLE + + + **/README.md + **/LICENSE + **/LICENSE.header + **/AUTHORS + **/src/test/resources/** + **/src/main/resources/** + **/war + **/gwt-unitcache + + + ${project.inceptionYear} + ${project.organization.name} + + + + + check + + + org.codehaus.mojo flatten-maven-plugin ${maven.flatten.plugin} - true - resolveCiFriendliesOnly + oss @@ -165,39 +183,18 @@ ${maven.compiler.target} - - com.mycila - license-maven-plugin - ${maven.license.plugin} - -
LICENSE.header
- ${project.build.sourceEncoding} - true - - SLASHSTAR_STYLE - - - **/README.md - **/LICENSE - **/LICENSE.header - **/AUTHORS - **/src/test/resources/** - **/src/main/resources/** - - - ${project.inceptionYear} - ${project.organization.name} - - - - - - check - - - - + + + + + + ${project.groupId} + gwt-event + ${revision} + + + From ee43b628028e51034d2a9fde1056cbef703a8b6f Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jun 2020 07:29:44 +0200 Subject: [PATCH 6/9] rename organization --- gwt-event-compat/pom.xml | 2 +- gwt-event-legacy/pom.xml | 2 +- gwt-event-logical/pom.xml | 2 +- gwt-event/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gwt-event-compat/pom.xml b/gwt-event-compat/pom.xml index 999af32..b1d3119 100644 --- a/gwt-event-compat/pom.xml +++ b/gwt-event-compat/pom.xml @@ -37,7 +37,7 @@ https://github.com/gwtproject/gwt-event - The GWT Project + The GWT Project Authors https://github.com/gwtproject diff --git a/gwt-event-legacy/pom.xml b/gwt-event-legacy/pom.xml index 50e7fc9..c25f49e 100644 --- a/gwt-event-legacy/pom.xml +++ b/gwt-event-legacy/pom.xml @@ -37,7 +37,7 @@ https://github.com/gwtproject/gwt-event - The GWT Project + The GWT Project Authors https://github.com/gwtproject diff --git a/gwt-event-logical/pom.xml b/gwt-event-logical/pom.xml index bd9bd24..e749f75 100644 --- a/gwt-event-logical/pom.xml +++ b/gwt-event-logical/pom.xml @@ -37,7 +37,7 @@ https://github.com/gwtproject/gwt-event - The GWT Project + The GWT Project Authors https://github.com/gwtproject diff --git a/gwt-event/pom.xml b/gwt-event/pom.xml index b2187ed..04c16ca 100644 --- a/gwt-event/pom.xml +++ b/gwt-event/pom.xml @@ -39,7 +39,7 @@ https://github.com/gwtproject/gwt-event - The GWT Project + The GWT Project Authors https://github.com/gwtproject diff --git a/pom.xml b/pom.xml index c540e76..8f2497f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ https://github.com/gwtproject/gwt-timer - The GWT Project + The GWT Project Authors https://github.com/gwtproject From 86c44a9d4a59ec3e0316226b36dd0566307a30e0 Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jun 2020 09:43:05 +0200 Subject: [PATCH 7/9] move distribution management to parent pom --- gwt-event-compat/pom.xml | 11 ----------- gwt-event-legacy/pom.xml | 11 ----------- gwt-event-logical/pom.xml | 11 ----------- gwt-event/pom.xml | 11 ----------- pom.xml | 11 +++++++++++ 5 files changed, 11 insertions(+), 44 deletions(-) diff --git a/gwt-event-compat/pom.xml b/gwt-event-compat/pom.xml index b1d3119..21762f3 100644 --- a/gwt-event-compat/pom.xml +++ b/gwt-event-compat/pom.xml @@ -96,17 +96,6 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - diff --git a/gwt-event-legacy/pom.xml b/gwt-event-legacy/pom.xml index c25f49e..87197fe 100644 --- a/gwt-event-legacy/pom.xml +++ b/gwt-event-legacy/pom.xml @@ -85,17 +85,6 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - diff --git a/gwt-event-logical/pom.xml b/gwt-event-logical/pom.xml index e749f75..2ed7341 100644 --- a/gwt-event-logical/pom.xml +++ b/gwt-event-logical/pom.xml @@ -85,17 +85,6 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - diff --git a/gwt-event/pom.xml b/gwt-event/pom.xml index 04c16ca..43e7ee7 100644 --- a/gwt-event/pom.xml +++ b/gwt-event/pom.xml @@ -79,17 +79,6 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - diff --git a/pom.xml b/pom.xml index 8f2497f..14ccf28 100644 --- a/pom.xml +++ b/pom.xml @@ -197,4 +197,15 @@ + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + From c65187c48f8efa6a479875244f588ec071eee24e Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jun 2020 09:46:17 +0200 Subject: [PATCH 8/9] avoid deploy of test modules --- gwt-event-compat-gwt2-tests/pom.xml | 8 ++++++++ gwt-event-gwt2-tests/pom.xml | 10 +++++++++- gwt-event-j2cl-tests/pom.xml | 8 ++++++++ gwt-event-logical-gwt2-tests/pom.xml | 8 ++++++++ gwt-event-logical-j2cl-tests/pom.xml | 8 ++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/gwt-event-compat-gwt2-tests/pom.xml b/gwt-event-compat-gwt2-tests/pom.xml index 21b3624..458ab16 100644 --- a/gwt-event-compat-gwt2-tests/pom.xml +++ b/gwt-event-compat-gwt2-tests/pom.xml @@ -58,6 +58,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-gwt2-tests/pom.xml b/gwt-event-gwt2-tests/pom.xml index dd41883..a1667cd 100644 --- a/gwt-event-gwt2-tests/pom.xml +++ b/gwt-event-gwt2-tests/pom.xml @@ -71,6 +71,14 @@ true - + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + + diff --git a/gwt-event-j2cl-tests/pom.xml b/gwt-event-j2cl-tests/pom.xml index e572c78..32ea8b3 100644 --- a/gwt-event-j2cl-tests/pom.xml +++ b/gwt-event-j2cl-tests/pom.xml @@ -88,6 +88,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-logical-gwt2-tests/pom.xml b/gwt-event-logical-gwt2-tests/pom.xml index a38e255..c0283db 100644 --- a/gwt-event-logical-gwt2-tests/pom.xml +++ b/gwt-event-logical-gwt2-tests/pom.xml @@ -85,6 +85,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + diff --git a/gwt-event-logical-j2cl-tests/pom.xml b/gwt-event-logical-j2cl-tests/pom.xml index d335a73..29143ae 100644 --- a/gwt-event-logical-j2cl-tests/pom.xml +++ b/gwt-event-logical-j2cl-tests/pom.xml @@ -95,6 +95,14 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + From 8c640ac7f2305457c151b50b079b02f80242d51a Mon Sep 17 00:00:00 2001 From: Frank Hossfeld Date: Wed, 10 Jun 2020 11:13:48 +0200 Subject: [PATCH 9/9] remove maven.install.version --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14ccf28..37cff5a 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,6 @@ 1.0.0 3.2.0 0.15-SNAPSHOT - 3.0.0-M1 3.0 3.2.1 3.0.0-M1