File tree Expand file tree Collapse file tree 15 files changed +42
-34
lines changed Expand file tree Collapse file tree 15 files changed +42
-34
lines changed Original file line number Diff line number Diff line change @@ -114,7 +114,13 @@ jobs:
114114 runs-on : ubuntu-latest
115115 strategy :
116116 matrix :
117- gwt : [ "2.8.2", "HEAD-SNAPSHOT" ]
117+ # groupId depends on GWT version, so no need to use it in cache keys and other identifiers
118+ include :
119+ - gwt : " 2.9.0"
120+ groupId : " com.google.gwt"
121+ - gwt : " HEAD-SNAPSHOT"
122+ # TODO: move to org.gwtproject once they're deployed
123+ groupId : " com.google.gwt"
118124 steps :
119125 - uses : actions/checkout@v3
120126
@@ -135,7 +141,7 @@ jobs:
135141
136142 - name : Build with Maven
137143 id : maven-build
138- run : mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }}
144+ run : mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }} -DgwtGroupId=${{ matrix.groupId }}
139145
140146 - name : Store reports
141147 if : steps.maven-build.outcome == 'success' || steps.maven-build.outcome == 'failure'
Original file line number Diff line number Diff line change 5252
5353 <repositories >
5454 <repository >
55+ <!-- TODO: move to ossrh once org.gwtproject snapshots are deployed there -->
5556 <id >google-snapshots</id >
5657 <url >https://oss.sonatype.org/content/repositories/google-snapshots/</url >
5758 <releases >
7172 <project .build.outputEncoding>UTF-8</project .build.outputEncoding>
7273 <project .reporting.outputEncoding>UTF-8</project .reporting.outputEncoding>
7374
74- <gwtVersion >2.9.0</gwtVersion >
75+ <gwtGroupId >org.gwtproject</gwtGroupId >
76+ <gwtVersion >2.10.0</gwtVersion >
7577 </properties >
7678
7779 <dependencies >
147149 <!-- Some artifacts used by invoker tests, declared here so they're resolved early -->
148150 <!-- Actually because invoker plugin cannot install snapshots through extraArtifacts -->
149151 <dependency >
150- <groupId >com.google.gwt </groupId >
152+ <groupId >${gwtGroupId} </groupId >
151153 <artifactId >gwt-user</artifactId >
152154 <version >${gwtVersion} </version >
153155 <scope >test</scope >
154156 </dependency >
155157 <dependency >
156- <groupId >com.google.gwt </groupId >
158+ <groupId >${gwtGroupId} </groupId >
157159 <artifactId >gwt-dev</artifactId >
158160 <version >${gwtVersion} </version >
159161 <scope >test</scope >
160162 </dependency >
161163 <dependency >
162- <groupId >com.google.gwt </groupId >
164+ <groupId >${gwtGroupId} </groupId >
163165 <artifactId >gwt-servlet</artifactId >
164166 <version >${gwtVersion} </version >
165167 <scope >test</scope >
Original file line number Diff line number Diff line change 2020 <type >gwt-lib</type >
2121 </dependency >
2222 <dependency >
23- <groupId >com.google.gwt </groupId >
23+ <groupId >@gwtGroupId@ </groupId >
2424 <artifactId >gwt-user</artifactId >
2525 </dependency >
2626 <dependency >
27- <groupId >com.google.gwt </groupId >
27+ <groupId >@gwtGroupId@ </groupId >
2828 <artifactId >gwt-dev</artifactId >
2929 </dependency >
3030 <dependency >
Original file line number Diff line number Diff line change 1212
1313 <dependencies >
1414 <dependency >
15- <groupId >com.google.gwt </groupId >
15+ <groupId >@gwtGroupId@ </groupId >
1616 <artifactId >gwt-servlet</artifactId >
1717 <!-- Needed for the CustomFieldSerializer; can be provided by gwt-servlet or gwt-user -->
1818 <scope >provided</scope >
Original file line number Diff line number Diff line change 2626 <scope >runtime</scope >
2727 </dependency >
2828 <dependency >
29- <groupId >com.google.gwt </groupId >
29+ <groupId >@gwtGroupId@ </groupId >
3030 <artifactId >gwt-servlet</artifactId >
3131 </dependency >
3232 <dependency >
Original file line number Diff line number Diff line change 3131 <type >gwt-lib</type >
3232 </dependency >
3333 <dependency >
34- <groupId >com.google.gwt </groupId >
34+ <groupId >@gwtGroupId@ </groupId >
3535 <artifactId >gwt-servlet</artifactId >
3636 <scope >provided</scope >
3737 </dependency >
Original file line number Diff line number Diff line change 1717 <version >${project.version} </version >
1818 </dependency >
1919 <dependency >
20- <groupId >com.google.gwt </groupId >
20+ <groupId >@gwtGroupId@ </groupId >
2121 <artifactId >gwt-servlet</artifactId >
2222 <scope >provided</scope >
2323 </dependency >
Original file line number Diff line number Diff line change 1414 <dependencyManagement >
1515 <dependencies >
1616 <dependency >
17- <groupId >com.google.gwt </groupId >
17+ <groupId >@gwtGroupId@ </groupId >
1818 <artifactId >gwt</artifactId >
1919 <version >@gwtVersion@</version >
2020 <type >pom</type >
Original file line number Diff line number Diff line change 1010 <dependencyManagement >
1111 <dependencies >
1212 <dependency >
13- <groupId >com.google.gwt </groupId >
13+ <groupId >@gwtGroupId@ </groupId >
1414 <artifactId >gwt</artifactId >
1515 <version >@gwtVersion@</version >
1616 <type >pom</type >
2020 </dependencyManagement >
2121 <dependencies >
2222 <dependency >
23- <groupId >com.google.gwt </groupId >
23+ <groupId >@gwtGroupId@ </groupId >
2424 <artifactId >gwt-user</artifactId >
2525 </dependency >
2626 <dependency >
27- <groupId >com.google.gwt </groupId >
27+ <groupId >@gwtGroupId@ </groupId >
2828 <artifactId >gwt-dev</artifactId >
2929 </dependency >
3030 </dependencies >
Original file line number Diff line number Diff line change 1010 <dependencyManagement >
1111 <dependencies >
1212 <dependency >
13- <groupId >com.google.gwt </groupId >
13+ <groupId >@gwtGroupId@ </groupId >
1414 <artifactId >gwt</artifactId >
1515 <version >@gwtVersion@</version >
1616 <type >pom</type >
2020 </dependencyManagement >
2121 <dependencies >
2222 <dependency >
23- <groupId >com.google.gwt </groupId >
23+ <groupId >@gwtGroupId@ </groupId >
2424 <artifactId >gwt-user</artifactId >
2525 </dependency >
2626 <dependency >
27- <groupId >com.google.gwt </groupId >
27+ <groupId >@gwtGroupId@ </groupId >
2828 <artifactId >gwt-dev</artifactId >
2929 </dependency >
3030 <dependency >
You can’t perform that action at this time.
0 commit comments