You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2026/06/08 15:38:30 UTC
(jspwiki) branch master updated: Instead of deactivating wro plugin, provided jmxEnabled=false to wro.properties, this should allow GH Actions build for JDK-18 to proceed
This is an automated email from the ASF dual-hosted git repository.
juanpablo-santos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 7ebdf5468 Instead of deactivating wro plugin, provided jmxEnabled=false to wro.properties, this should allow GH Actions build for JDK-18 to proceed
7ebdf5468 is described below
commit 7ebdf5468e8168705bde246ebacbb199da76ca0a
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Mon Jun 8 17:38:08 2026 +0200
Instead of deactivating wro plugin, provided jmxEnabled=false to wro.properties, this should allow GH Actions build for JDK-18 to proceed
---
.github/workflows/maven.yml | 2 +-
jspwiki-main/pom.xml | 2 +-
jspwiki-main/src/main/javascript/wro.properties | 2 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-markdown/src/main/javascript/wro.properties | 1 +
jspwiki-war/pom.xml | 4 ++--
jspwiki-war/src/main/config/wro/wro.properties | 1 +
pom.xml | 1 -
8 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6cddaf51f..a86733297 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -59,7 +59,7 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn clean package -T 1C -V -B -Pintegration-tests "-Dplugin.surefire.junit5-tree-reporter.enable-console=true" "-Dplugin.wro4j.default-phase=none"
+ run: mvn clean package -T 1C -V -B -Pintegration-tests "-Dplugin.surefire.junit5-tree-reporter.enable-console=true"
# - name: Dependency scan
# run: mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:LATEST:audit
# token required
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 9b707e553..bf334e554 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -327,7 +327,7 @@
<executions>
<execution>
<id>buildPlainEditorSyntaxJS</id>
- <phase>${plugin.wro4j.default-phase}</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
diff --git a/jspwiki-main/src/main/javascript/wro.properties b/jspwiki-main/src/main/javascript/wro.properties
index 0a5b33b4d..c5dceeb7b 100644
--- a/jspwiki-main/src/main/javascript/wro.properties
+++ b/jspwiki-main/src/main/javascript/wro.properties
@@ -17,7 +17,7 @@
#minimizeEnabled=false
debug=true
-
+jmxEnabled=false
preProcessors=semicolonAppender
postProcessors=uglifyJs
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 81f3702e4..bb73d8b23 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -152,7 +152,7 @@
<executions>
<execution>
<id>buildPlainEditorSyntaxJS</id>
- <phase>${plugin.wro4j.default-phase}</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
diff --git a/jspwiki-markdown/src/main/javascript/wro.properties b/jspwiki-markdown/src/main/javascript/wro.properties
index 0a5b33b4d..45a05f85b 100644
--- a/jspwiki-markdown/src/main/javascript/wro.properties
+++ b/jspwiki-markdown/src/main/javascript/wro.properties
@@ -17,6 +17,7 @@
#minimizeEnabled=false
debug=true
+jmxEnabled=false
preProcessors=semicolonAppender
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 8c1b3f84e..a882be852 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -136,7 +136,7 @@
<executions>
<execution>
<id>buildDefaultJsAndCss</id>
- <phase>${plugin.wro4j.default-phase}</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
<!--<goal>jshint</goal>-->
@@ -158,7 +158,7 @@
<!-- HADDOCK template -->
<execution>
<id>buildHaddockJsAndCss</id>
- <phase>${plugin.wro4j.default-phase}</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
diff --git a/jspwiki-war/src/main/config/wro/wro.properties b/jspwiki-war/src/main/config/wro/wro.properties
index fdf5c5af4..d47f552ce 100644
--- a/jspwiki-war/src/main/config/wro/wro.properties
+++ b/jspwiki-war/src/main/config/wro/wro.properties
@@ -17,6 +17,7 @@
#minimizeEnabled=false
debug=true
+jmxEnabled=false
#preProcessors=cssUrlRewriting,cssImport,semicolonAppender
diff --git a/pom.xml b/pom.xml
index 6a1489844..f86c16721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,6 @@
<plugin.sonar.version>5.3.0.6276</plugin.sonar.version>
<plugin.sonar-report.version>0.1</plugin.sonar-report.version>
<plugin.wro4j.version>2.1.1</plugin.wro4j.version>
- <plugin.wro4j.default-phase>prepare-package</plugin.wro4j.default-phase>
<plugin.eclipse-lifecycle-mapping.version>1.0.0</plugin.eclipse-lifecycle-mapping.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source> <!-- override values from parent pom -->
<maven.compiler.target>${jdk.version}</maven.compiler.target>