Skip to content

Commit 0f6c7e6

Browse files
committed
Update to Elemental2, and change version to HEAD-SNAPSHOT
1 parent 34c45e3 commit 0f6c7e6

File tree

6 files changed

+60
-6
lines changed

6 files changed

+60
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,5 @@ fabric.properties
227227
war/
228228

229229
# target folder
230-
*/target/*
230+
*/target/*
231+
.flattened-pom.xml

.mvn/maven.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Drevision=HEAD-SNAPSHOT

gwt-core-gwt2-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.gwtproject.core</groupId>
88
<artifactId>gwt-core-parent</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>gwt-core-gwt2-tests</artifactId>
1212
<packaging>gwt-lib</packaging>

gwt-core-j2cl-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.gwtproject.core</groupId>
88
<artifactId>gwt-core-parent</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>gwt-core-j2cl-tests</artifactId>
1212

gwt-core/pom.xml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.gwtproject.core</groupId>
66
<artifactId>gwt-core</artifactId>
7-
<version>1.0-SNAPSHOT</version>
7+
<version>${revision}</version>
88
<packaging>gwt-lib</packaging>
99

1010
<name>GWT Core</name>
@@ -51,6 +51,7 @@
5151
<maven.licence.plugin>3.0</maven.licence.plugin>
5252
<maven.source.plugin>3.2.1</maven.source.plugin>
5353
<maven.deploy.plugin>3.0.0-M1</maven.deploy.plugin>
54+
<maven.flatten.plugin>1.1.0</maven.flatten.plugin>
5455

5556
<elemental2.version>1.0.0</elemental2.version>
5657
</properties>
@@ -137,6 +138,31 @@
137138
<artifactId>maven-deploy-plugin</artifactId>
138139
<version>${maven.deploy.plugin}</version>
139140
</plugin>
141+
<plugin>
142+
<groupId>org.codehaus.mojo</groupId>
143+
<artifactId>flatten-maven-plugin</artifactId>
144+
<version>${maven.flatten.plugin}</version>
145+
<configuration>
146+
<updatePomFile>true</updatePomFile>
147+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
148+
</configuration>
149+
<executions>
150+
<execution>
151+
<id>flatten</id>
152+
<phase>process-resources</phase>
153+
<goals>
154+
<goal>flatten</goal>
155+
</goals>
156+
</execution>
157+
<execution>
158+
<id>flatten.clean</id>
159+
<phase>clean</phase>
160+
<goals>
161+
<goal>clean</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
140166
</plugins>
141167
</build>
142168

pom.xml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.gwtproject.core</groupId>
77
<artifactId>gwt-core-parent</artifactId>
88

9-
<version>1.0-SNAPSHOT</version>
9+
<version>${revision}</version>
1010

1111
<packaging>pom</packaging>
1212

@@ -54,13 +54,14 @@
5454
<maven.deploy.plugin>3.0.0-M1</maven.deploy.plugin>
5555
<maven.fmt.plugin>2.5.1</maven.fmt.plugin>
5656
<maven.licence.plugin>3.0</maven.licence.plugin>
57+
<maven.flatten.plugin>1.1.0</maven.flatten.plugin>
5758
</properties>
5859

5960
<dependencies>
6061
<dependency>
6162
<groupId>org.gwtproject.core</groupId>
6263
<artifactId>gwt-core</artifactId>
63-
<version>1.0-SNAPSHOT</version>
64+
<version>${project.version}</version>
6465
<scope>test</scope>
6566
</dependency>
6667
</dependencies>
@@ -87,6 +88,31 @@
8788
<skip>true</skip>
8889
</configuration>
8990
</plugin>
91+
<plugin>
92+
<groupId>org.codehaus.mojo</groupId>
93+
<artifactId>flatten-maven-plugin</artifactId>
94+
<version>${maven.flatten.plugin}</version>
95+
<configuration>
96+
<updatePomFile>true</updatePomFile>
97+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
98+
</configuration>
99+
<executions>
100+
<execution>
101+
<id>flatten</id>
102+
<phase>process-resources</phase>
103+
<goals>
104+
<goal>flatten</goal>
105+
</goals>
106+
</execution>
107+
<execution>
108+
<id>flatten.clean</id>
109+
<phase>clean</phase>
110+
<goals>
111+
<goal>clean</goal>
112+
</goals>
113+
</execution>
114+
</executions>
115+
</plugin>
90116
</plugins>
91117
<pluginManagement>
92118
<plugins>

0 commit comments

Comments
 (0)