Skip to content

Commit d6ee6f7

Browse files
axeluhlaxeluhl
committed
Merge branch 'master' into 2.12.2
2 parents c07970e + 96e7ff6 commit d6ee6f7

5 files changed

Lines changed: 83 additions & 17 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
3+
name: Java CI with Maven
4+
5+
on:
6+
push:
7+
branches: [ "master" ]
8+
pull_request:
9+
branches: [ "master" ]
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v4
20+
with:
21+
java-version: '17'
22+
distribution: 'temurin'
23+
cache: maven
24+
- name: Build with Maven
25+
run: mvn -B verify --file pom.xml
26+
27+
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
28+
- name: Update dependency graph
29+
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

‎generated-archetype/some-artifact/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<!-- Convenience property to set the GWT version -->
16-
<gwt.version>2.10.0</gwt.version>
16+
<gwt.version>2.12.0</gwt.version>
1717

1818
<!-- GWT 2.9 support 8, 9 and 11 -->
1919
<maven.compiler.source>1.8</maven.compiler.source>
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>org.codehaus.mojo</groupId>
7070
<artifactId>gwt-maven-plugin</artifactId>
71-
<version>2.10.0</version>
71+
<version>2.12.0</version>
7272
<executions>
7373
<execution>
7474
<goals>

‎pom.xml‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<version>50</version>
2626
</parent>
2727
<artifactId>gwt-maven-plugin</artifactId>
28-
<version>2.11.1</version>
28+
<version>2.12.2</version>
2929
<packaging>maven-plugin</packaging>
3030
<name>Mojo's Maven Plugin for GWT</name>
3131
<description>
@@ -121,11 +121,11 @@
121121
<maven.compiler.source>1.8</maven.compiler.source>
122122
<maven.compiler.target>1.8</maven.compiler.target>
123123
<!-- This property is used in a filtered resources to check the version compatibility -->
124-
<gwt.version>2.11.1</gwt.version>
125-
<mavenVersion>3.0.5</mavenVersion>
126-
<mavenPluginPluginVersion>3.5</mavenPluginPluginVersion>
124+
<gwt.version>2.12.2</gwt.version>
125+
<mavenVersion>3.8.8</mavenVersion>
126+
<mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
127127
<mojo.java.target>1.8</mojo.java.target>
128-
<doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion>
128+
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
129129
<!-- to be able on powerfull ci machine to change it tru the cli :-) -->
130130
<it.localWorkers>-1</it.localWorkers>
131131
<stagingSiteRepositoryId>github-ssh</stagingSiteRepositoryId>
@@ -148,31 +148,55 @@
148148
<groupId>org.apache.maven</groupId>
149149
<artifactId>maven-compat</artifactId>
150150
<version>${mavenVersion}</version>
151+
<scope>provided</scope>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.apache.maven</groupId>
155+
<artifactId>maven-settings</artifactId>
156+
<version>${mavenVersion}</version>
157+
<scope>provided</scope>
158+
</dependency>
159+
<dependency>
160+
<groupId>org.apache.maven</groupId>
161+
<artifactId>maven-repository-metadata</artifactId>
162+
<version>${mavenVersion}</version>
163+
<scope>provided</scope>
151164
</dependency>
152165
<dependency>
153166
<groupId>org.apache.maven</groupId>
154167
<artifactId>maven-core</artifactId>
155168
<version>${mavenVersion}</version>
169+
<scope>provided</scope>
156170
</dependency>
157171
<dependency>
158172
<groupId>org.apache.maven</groupId>
159173
<artifactId>maven-model</artifactId>
160174
<version>${mavenVersion}</version>
175+
<scope>provided</scope>
161176
</dependency>
162177
<dependency>
163178
<groupId>org.apache.maven</groupId>
164179
<artifactId>maven-artifact</artifactId>
165180
<version>${mavenVersion}</version>
181+
<scope>provided</scope>
166182
</dependency>
167183
<dependency>
168184
<groupId>org.apache.maven</groupId>
169185
<artifactId>maven-plugin-api</artifactId>
170186
<version>${mavenVersion}</version>
187+
<scope>provided</scope>
188+
</dependency>
189+
<dependency>
190+
<groupId>org.apache.maven</groupId>
191+
<artifactId>maven-project</artifactId>
192+
<version>2.2.1</version>
193+
<scope>provided</scope>
171194
</dependency>
172195
<dependency>
173196
<groupId>org.apache.maven.reporting</groupId>
174197
<artifactId>maven-reporting-api</artifactId>
175-
<version>3.0</version>
198+
<version>3.1.1</version>
199+
<scope>provided</scope>
176200
</dependency>
177201
<dependency>
178202
<groupId>org.apache.maven.reporting</groupId>
@@ -213,7 +237,7 @@
213237
<dependency>
214238
<groupId>org.springframework</groupId>
215239
<artifactId>spring-core</artifactId>
216-
<version>5.2.22.RELEASE</version>
240+
<version>5.2.24.RELEASE</version>
217241
</dependency>
218242

219243
<dependency>
@@ -246,13 +270,14 @@
246270
<!-- used to unpack gwt native libs -->
247271
<groupId>org.codehaus.plexus</groupId>
248272
<artifactId>plexus-archiver</artifactId>
249-
<version>3.5</version>
273+
<version>4.8.0</version>
250274
</dependency>
251275
<dependency>
252276
<!-- used for GwtSourcesJarMojo -->
253277
<groupId>org.apache.maven</groupId>
254278
<artifactId>maven-archiver</artifactId>
255279
<version>3.2.0</version>
280+
<scope>provided</scope>
256281
</dependency>
257282
<dependency>
258283
<groupId>junit</groupId>
@@ -274,7 +299,7 @@
274299
<dependency>
275300
<groupId>commons-io</groupId>
276301
<artifactId>commons-io</artifactId>
277-
<version>2.7</version>
302+
<version>2.14.0</version>
278303
</dependency>
279304
<dependency>
280305
<groupId>commons-lang</groupId>
@@ -322,7 +347,7 @@
322347
<dependency>
323348
<groupId>org.apache.maven.plugin-testing</groupId>
324349
<artifactId>maven-plugin-testing-harness</artifactId>
325-
<version>2.1</version>
350+
<version>3.3.0</version>
326351
<scope>test</scope>
327352
</dependency>
328353
<dependency>
@@ -468,17 +493,17 @@
468493
<plugin>
469494
<groupId>org.codehaus.mojo</groupId>
470495
<artifactId>animal-sniffer-maven-plugin</artifactId>
471-
<version>1.18</version>
496+
<version>1.24</version>
472497
<configuration>
473498
<signature>
474499
<groupId>org.codehaus.mojo.signature</groupId>
475-
<artifactId>java16</artifactId>
476-
<version>1.1</version>
500+
<artifactId>java18</artifactId>
501+
<version>1.0</version>
477502
</signature>
478503
</configuration>
479504
<executions>
480505
<execution>
481-
<id>check-java-1.6-compat</id>
506+
<id>check-java-1.8-compat</id>
482507
<phase>process-classes</phase>
483508
<goals>
484509
<goal>check</goal>

‎src/it/reactor/war/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-war-plugin</artifactId>
78-
<version>2.1</version>
78+
<version>3.4.0</version>
7979
<configuration>
8080
<warSourceDirectory>war</warSourceDirectory>
8181
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>

‎src/main/java/org/codehaus/mojo/gwt/shell/TestMojo.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919
* under the License.
2020
*/
2121

22+
import java.util.List;
2223
import org.apache.maven.artifact.Artifact;
24+
import org.apache.maven.model.Dependency;
2325
import org.apache.maven.plugin.MojoExecutionException;
2426
import org.apache.maven.plugin.MojoFailureException;
27+
import org.apache.maven.plugin.descriptor.PluginDescriptor;
2528
import org.apache.maven.plugins.annotations.LifecyclePhase;
2629
import org.apache.maven.plugins.annotations.Mojo;
2730
import org.apache.maven.plugins.annotations.Parameter;
@@ -455,6 +458,15 @@ private void forkToRunTest( String test )
455458

456459
addCompileSourceArtifacts( cmd );
457460

461+
// Adding explicitly defined plugin-dependencies to classpath
462+
List<Dependency> dependencies = ((PluginDescriptor) this.getPluginContext().get("pluginDescriptor")).getPlugin().getDependencies();
463+
getLog().info("Adding explicitly defined plugin-dependencies to classpath: " + dependencies.toString());
464+
for (Dependency dependency : dependencies)
465+
{
466+
Collection<File> jarFiles = getJarFiles(dependency.getGroupId() + ":" + dependency.getArtifactId(), false);
467+
cmd.addToClasspath(jarFiles);
468+
}
469+
458470
cmd.arg( test );
459471
cmd.systemProperty( "surefire.reports", reportsDirectory.getAbsolutePath() );
460472
cmd.systemProperty( "gwt.args", StringUtils.escape(getGwtArgs()) );

0 commit comments

Comments
 (0)