Skip to content

Commit 021c194

Browse files
FrankHossfeldFrankHossfeld
committed
define central version using flatten-m-p
1 parent 9340c35 commit 021c194

File tree

13 files changed

+220
-239
lines changed

13 files changed

+220
-239
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright © 2019 The GWT Project Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
117
# This workflow will build a Java project with Maven
218
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
319

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
# Those patterns should go in a global gitignore or repository-specific excludes.
33
# See http://www.gwtproject.org/makinggwtbetter.html#global_gitignore
44

5-
target/
5+
*/target/*
6+
.flattened-pom.xml
67

8+
# gwt caches and compiled units #
9+
war/gwt_bree/
10+
gwt-unitCache/

‎.mvn/maven.config‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gwt-core-gwt2-tests/LICENSE.header‎ renamed to ‎LICENSE.header‎

File renamed without changes.

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,17 @@ This project is not yet complete, there are doubtlessly better ways to handle so
4040
3. Change the `import`s in your Java source files:
4141

4242
```java
43-
import org.gwtproject.core.*;
43+
import org.gwtproject.core.client.GWT;
4444
```
4545

4646
## Instructions
4747

4848
To build gwt-core:
4949

50-
* run `mvn clean install`
50+
* run `mvn clean verify`
5151

5252
on the parent directory. This will build the artifact and run tests against the JVM, J2CL, and GWT2.
5353

54-
55-
**Note: To build the module you need Maven 3.6.3 or newer**
56-
5754
## System Requirements
5855

5956
**GWT Core requires GWT 2.9.0 or newer!**

‎gwt-core-gwt2-tests/pom.xml‎

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright © 2019 The GWT Project Authors
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
219
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
320
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
421
<modelVersion>4.0.0</modelVersion>
522

623
<parent>
724
<groupId>org.gwtproject.core</groupId>
825
<artifactId>gwt-core-parent</artifactId>
9-
<version>${revision}</version>
26+
<version>dev</version>
1027
</parent>
1128
<artifactId>gwt-core-gwt2-tests</artifactId>
29+
<version>${revision}</version>
1230
<packaging>gwt-lib</packaging>
1331

1432
<name>GWT Core - GWT 2 Tests</name>
1533
<description>Test cases for the GWT 2 tests</description>
1634
<url>https://github.com/gwtproject/gwt-core</url>
1735

1836
<organization>
19-
<name>The GWT Authors</name>
37+
<name>The GWT Project Authors</name>
2038
<url>https://github.com/gwtproject</url>
2139
</organization>
2240

@@ -29,7 +47,7 @@
2947

3048
<developers>
3149
<developer>
32-
<name>The GWT Authors</name>
50+
<name>The GWT Project Authors</name>
3351
<organization>The GWT Project Authors</organization>
3452
<url>https://github.com/gwtproject</url>
3553
</developer>
@@ -44,21 +62,9 @@
4462
<inceptionYear>2019</inceptionYear>
4563

4664
<properties>
47-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48-
49-
<maven.compiler.source>1.8</maven.compiler.source>
50-
<maven.compiler.target>1.8</maven.compiler.target>
51-
52-
<maven.compiler.plugin>3.7.0</maven.compiler.plugin>
53-
<maven.deploy.plugin>3.0.0-M1</maven.deploy.plugin>
5465
<maven.gwt.plugin>1.0.0</maven.gwt.plugin>
55-
<maven.install.plugin>3.0.0-M1</maven.install.plugin>
56-
<maven.jar.plugin>3.1.2</maven.jar.plugin>
57-
<maven.license.plugin>3.0</maven.license.plugin>
58-
<maven.source.plugin>3.1.0</maven.source.plugin>
5966

6067
<gwt.version>2.9.0</gwt.version>
61-
<junit.version>4.12</junit.version>
6268
</properties>
6369

6470
<dependencies>
@@ -74,12 +80,19 @@
7480
<version>${gwt.version}</version>
7581
<scope>test</scope>
7682
</dependency>
83+
7784
<dependency>
7885
<groupId>junit</groupId>
7986
<artifactId>junit</artifactId>
8087
<version>${junit.version}</version>
8188
<scope>test</scope>
8289
</dependency>
90+
91+
<dependency>
92+
<groupId>org.gwtproject.core</groupId>
93+
<artifactId>gwt-core</artifactId>
94+
<scope>test</scope>
95+
</dependency>
8396
</dependencies>
8497

8598
<build>
@@ -94,34 +107,6 @@
94107
<moduleName>org.gwtproject.core.CoreSuite</moduleName>
95108
</configuration>
96109
</plugin>
97-
<plugin>
98-
<groupId>com.mycila</groupId>
99-
<artifactId>license-maven-plugin</artifactId>
100-
</plugin>
101-
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-install-plugin</artifactId>
104-
<version>${maven.install.plugin}</version>
105-
<configuration>
106-
<skip>true</skip>
107-
</configuration>
108-
</plugin>
109-
<plugin>
110-
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-deploy-plugin</artifactId>
112-
<version>${maven.deploy.plugin}</version>
113-
<configuration>
114-
<skip>true</skip>
115-
</configuration>
116-
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-install-plugin</artifactId>
120-
<version>${maven.install.plugin}</version>
121-
<configuration>
122-
<skip>true</skip>
123-
</configuration>
124-
</plugin>
125110
<plugin>
126111
<groupId>org.apache.maven.plugins</groupId>
127112
<artifactId>maven-deploy-plugin</artifactId>

‎gwt-core-gwt2-tests/src/test/java/org/gwtproject/core/client/GWTTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright © 2019 The GWT Project Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.gwtproject.core.client;
217

318
import com.google.gwt.junit.client.GWTTestCase;

‎gwt-core-j2cl-tests/LICENSE.header‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎gwt-core-j2cl-tests/pom.xml‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright © 2019 The GWT Project Authors
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
219
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
320
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
421
<modelVersion>4.0.0</modelVersion>
522

623
<parent>
724
<groupId>org.gwtproject.core</groupId>
825
<artifactId>gwt-core-parent</artifactId>
9-
<version>${revision}</version>
26+
<version>dev</version>
1027
</parent>
1128
<artifactId>gwt-core-j2cl-tests</artifactId>
29+
<version>${revision}</version>
1230

1331
<name>GWT Core - J2CL Tests</name>
1432
<description>Test cases for the J2Cl tests</description>
1533
<url>https://github.com/gwtproject/gwt-core</url>
1634

1735
<organization>
18-
<name>The GWT Authors</name>
36+
<name>The GWT Project Authors</name>
1937
<url>https://github.com/gwtproject</url>
2038
</organization>
2139

@@ -28,7 +46,7 @@
2846

2947
<developers>
3048
<developer>
31-
<name>The GWT Authors</name>
49+
<name>The GWT Project Authors</name>
3250
<organization>The GWT Project Authors</organization>
3351
<url>https://github.com/gwtproject</url>
3452
</developer>
@@ -43,26 +61,13 @@
4361
<inceptionYear>2019</inceptionYear>
4462

4563
<properties>
46-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
47-
48-
<maven.compiler.source>1.8</maven.compiler.source>
49-
<maven.compiler.target>1.8</maven.compiler.target>
50-
51-
<maven.compiler.plugin>3.7.0</maven.compiler.plugin>
52-
<maven.deploy.plugin>3.0.0-M1</maven.deploy.plugin>
53-
<maven.findbugs.plugin>3.0.5</maven.findbugs.plugin>
54-
<maven.install.plugin>3.0.0-M1</maven.install.plugin>
55-
<maven.jar.plugin>3.1.2</maven.jar.plugin>
56-
<maven.j2cl.plugin>0.13-SNAPSHOT</maven.j2cl.plugin>
57-
<maven.license.plugin>3.0</maven.license.plugin>
58-
<maven.surfire.plugin>3.0.0-M1</maven.surfire.plugin>
64+
<maven.j2cl.plugin>0.15-SNAPSHOT</maven.j2cl.plugin>
65+
<maven.resource.plugin>3.1.0</maven.resource.plugin>
5966

6067
<!-- CI -->
6168
<vertispan.j2cl.repo.url>https://repo.vertispan.com/j2cl/</vertispan.j2cl.repo.url>
62-
<google.snapshot.repo.url>https://oss.sonatype.org/content/repositories/google-snapshots/</google.snapshot.repo.url>
6369

6470
<j2cl.version>0.7-SNAPSHOT</j2cl.version>
65-
<slf4j.version>1.7.5</slf4j.version>
6671
</properties>
6772

6873
<dependencies>
@@ -85,13 +90,19 @@
8590
<version>${j2cl.version}</version>
8691
<scope>test</scope>
8792
</dependency>
93+
94+
<dependency>
95+
<groupId>org.gwtproject.core</groupId>
96+
<artifactId>gwt-core</artifactId>
97+
<scope>test</scope>
98+
</dependency>
8899
</dependencies>
89100

90101
<build>
91102
<plugins>
92103
<plugin>
93104
<artifactId>maven-resources-plugin</artifactId>
94-
<version>3.1.0</version>
105+
<version>${maven.resource.plugin}</version>
95106
<executions>
96107
<!-- Copy static test resources to web test folder. -->
97108
<execution>
@@ -113,10 +124,6 @@
113124
</execution>
114125
</executions>
115126
</plugin>
116-
<plugin>
117-
<groupId>com.mycila</groupId>
118-
<artifactId>license-maven-plugin</artifactId>
119-
</plugin>
120127
<plugin>
121128
<groupId>com.vertispan.j2cl</groupId>
122129
<artifactId>j2cl-maven-plugin</artifactId>
@@ -143,14 +150,6 @@
143150
<skipTests>true</skipTests>
144151
</configuration>
145152
</plugin>
146-
<plugin>
147-
<groupId>org.apache.maven.plugins</groupId>
148-
<artifactId>maven-install-plugin</artifactId>
149-
<version>${maven.install.plugin}</version>
150-
<configuration>
151-
<skip>true</skip>
152-
</configuration>
153-
</plugin>
154153
<plugin>
155154
<groupId>org.apache.maven.plugins</groupId>
156155
<artifactId>maven-deploy-plugin</artifactId>

‎gwt-core-j2cl-tests/src/test/java/org/gwtproject/core/client/GWTTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright © 2019 The GWT Project Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.gwtproject.core.client;
217

318
import static org.junit.Assert.assertTrue;

0 commit comments

Comments
 (0)