Skip to content

Commit a943fba

Browse files
Deactivate wro4j on GH Actions builds, it seems to activate the MBean Server which in turn seems to not be available under some JDKs
1 parent debe0df commit a943fba

5 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
distribution: 'temurin'
6060
java-version: ${{ matrix.java }}
6161
- name: Build with Maven
62-
run: mvn clean package -T 1C -V -B -Pintegration-tests "-Dplugin.surefire.junit5-tree-reporter.enable-console=true"
62+
run: mvn clean package -T 1C -V -B -Pintegration-tests "-Dplugin.surefire.junit5-tree-reporter.enable-console=true -Dplugin.wro4j.default-phase=none"
6363
# - name: Dependency scan
6464
# run: mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:LATEST:audit
6565
# token required

jspwiki-main/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
<executions>
328328
<execution>
329329
<id>buildPlainEditorSyntaxJS</id>
330-
<phase>prepare-package</phase>
330+
<phase>${plugin.wro4j.default-phase}</phase>
331331
<goals>
332332
<goal>run</goal>
333333
</goals>

jspwiki-markdown/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<executions>
153153
<execution>
154154
<id>buildPlainEditorSyntaxJS</id>
155-
<phase>prepare-package</phase>
155+
<phase>${plugin.wro4j.default-phase}</phase>
156156
<goals>
157157
<goal>run</goal>
158158
</goals>

jspwiki-war/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<executions>
137137
<execution>
138138
<id>buildDefaultJsAndCss</id>
139-
<phase>prepare-package</phase>
139+
<phase>${plugin.wro4j.default-phase}</phase>
140140
<goals>
141141
<goal>run</goal>
142142
<!--<goal>jshint</goal>-->

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<plugin.sonar.version>5.3.0.6276</plugin.sonar.version>
124124
<plugin.sonar-report.version>0.1</plugin.sonar-report.version>
125125
<plugin.wro4j.version>2.1.1</plugin.wro4j.version>
126+
<plugin.wro4j.default-phase>prepare-package</plugin.wro4j.default-phase>
126127
<plugin.eclipse-lifecycle-mapping.version>1.0.0</plugin.eclipse-lifecycle-mapping.version>
127128
<maven.compiler.source>${jdk.version}</maven.compiler.source> <!-- override values from parent pom -->
128129
<maven.compiler.target>${jdk.version}</maven.compiler.target>

0 commit comments

Comments
 (0)