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/05/31 21:17:24 UTC

(jspwiki) branch master updated (3568bc616 -> 6c9e4d721)

This is an automated email from the ASF dual-hosted git repository.

juanpablo-santos pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


    from 3568bc616 Better, remove cobertura plugin as it is not used by the build
     new 756a1b336 lifecycle-mapping plugin is moved to a dedicated m2e-only profile
     new 6c9e4d721 lifecycle-mapping plugin is moved to a dedicated m2e-only profile

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog.md |   2 +
 pom.xml      | 149 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 85 insertions(+), 66 deletions(-)


(jspwiki) 01/02: lifecycle-mapping plugin is moved to a dedicated m2e-only profile

Posted by ju...@apache.org.
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

commit 756a1b33623944aa9ae85342aad5e782cbc78e09
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sun May 31 23:16:28 2026 +0200

    lifecycle-mapping plugin is moved to a dedicated m2e-only profile
---
 pom.xml | 149 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 83 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac786c4ab..8945a72ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -930,72 +930,6 @@
           <version>${plugin.sonar-report.version}</version>
         </plugin>
 
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>${plugin.eclipse-lifecycle-mapping.version}</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>io.leonard.maven.plugins</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <versionRange>[2.4.6,)</versionRange>
-                    <goals><goal>compile</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>net.alchim31.maven</groupId>
-                    <artifactId>yuicompressor-maven-plugin</artifactId>
-                    <versionRange>[1.3.2,)</versionRange>
-                    <goals><goal>compress</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <versionRange>[1.7,)</versionRange>
-                    <goals><goal>run</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jslint-maven-plugin</artifactId>
-                    <versionRange>[1.0.1,)</versionRange>
-                    <goals><goal>jslint</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>ro.isdc.wro4j</groupId>
-                    <artifactId>wro4j-maven-plugin</artifactId>
-                    <versionRange>[1.7.2,)</versionRange>
-                    <goals><goal>run</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.1,)</versionRange>
-                    <goals><goal>unpack</goal></goals>
-                  </pluginExecutionFilter>
-                  <action><ignore /></action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
         <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
@@ -1136,6 +1070,89 @@
         </plugins>
       </build>
     </profile>
+	
+	<profile>
+	  <id>m2e</id>
+      <!-- This profile is only active when the property "m2e.version"
+        is set, which is the case when building in Eclipse with m2e. -->
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+	  
+	  <build>
+	    <pluginManagement>
+		  <plugins>
+		    <plugin>
+              <groupId>org.eclipse.m2e</groupId>
+              <artifactId>lifecycle-mapping</artifactId>
+              <version>${plugin.eclipse-lifecycle-mapping.version}</version>
+              <configuration>
+                <lifecycleMappingMetadata>
+                  <pluginExecutions>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>io.leonard.maven.plugins</groupId>
+                        <artifactId>jspc-maven-plugin</artifactId>
+                        <versionRange>[2.4.6,)</versionRange>
+                        <goals><goal>compile</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>yuicompressor-maven-plugin</artifactId>
+                        <versionRange>[1.3.2,)</versionRange>
+                        <goals><goal>compress</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <versionRange>[1.7,)</versionRange>
+                        <goals><goal>run</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>jslint-maven-plugin</artifactId>
+                        <versionRange>[1.0.1,)</versionRange>
+                        <goals><goal>jslint</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>ro.isdc.wro4j</groupId>
+                        <artifactId>wro4j-maven-plugin</artifactId>
+                        <versionRange>[1.7.2,)</versionRange>
+                        <goals><goal>run</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                    <pluginExecution>
+                      <pluginExecutionFilter>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <versionRange>[2.1,)</versionRange>
+                        <goals><goal>unpack</goal></goals>
+                      </pluginExecutionFilter>
+                      <action><ignore /></action>
+                    </pluginExecution>
+                  </pluginExecutions>
+                </lifecycleMappingMetadata>
+              </configuration>
+            </plugin>
+		  </plugins>
+		</pluginManagement>
+	  </build>
+	</profile>
   </profiles>
 
   <organization>


(jspwiki) 02/02: lifecycle-mapping plugin is moved to a dedicated m2e-only profile

Posted by ju...@apache.org.
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

commit 6c9e4d7212ea170c571f735b6c872c983308ce08
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sun May 31 23:16:59 2026 +0200

    lifecycle-mapping plugin is moved to a dedicated m2e-only profile
---
 ChangeLog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 0362980e9..566935aed 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -43,6 +43,8 @@ under the License.
     * https://github.com/mojohaus/cobertura-maven-plugin/issues/67
 	* https://stackoverflow.com/a/64700109
 
+* In the same vein, lifecycle-mapping is moved to a m2e environment dedicated profile, to allow Docker builds to proceed.
+
 **2025-12-16 Alex O'Ree (alexoree AT apache DOT org)**
 
 * _3.0.0-git-22_