Fix: plugin ignores its own POM configuration due to wrong coordinates; re-enable integration tests (#114)

Author: Copilot

changes.xml

@@ -31,6 +31,9 @@
       <action type="update" dev="sseifert">
         Update dependencies.
       </action>
+      <action type="fix" dev="sseifert" issue="114">
+        Fix: Plugin ignores its own POM configuration due to wrong coordinates.
+      </action>
     </release>
 
     <release version="3.2.0" date="2022-09-29">

pom.xml

@@ -98,9 +98,6 @@ under the License.
     <distribution.snapshotRepositoryUrl>https://central.sonatype.com/repository/maven-snapshots</distribution.snapshotRepositoryUrl>
     <distribution.releaseRepositoryId>sonatype-central</distribution.releaseRepositoryId>
     <distribution.releaseRepositoryUrl>https://central.sonatype.com</distribution.releaseRepositoryUrl>
-
-    <!-- Skip integration tests by default -->
-    <skipITs>true</skipITs>
   </properties>
 
   <dependencies>
@@ -179,7 +176,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.24</version>
+      <version>3.2.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -341,6 +338,12 @@ under the License.
               <version>${surefire.version}</version>
             </dependency>
           </dependencies>
+          <configuration>
+            <systemPropertyVariables>
+              <maven.home>${maven.home}</maven.home>
+            </systemPropertyVariables>
+            <argLine>${maven.test.jvmargs}</argLine>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
@@ -549,12 +552,6 @@ under the License.
                   <goal>integration-test</goal>
                   <goal>verify</goal>
                 </goals>
-                <configuration>
-                <systemPropertyVariables>
-                   <maven.home>${maven.home}</maven.home>
-                 </systemPropertyVariables>
-                 <argLine>${maven.test.jvmargs}</argLine>
-                </configuration>
               </execution>
             </executions>
           </plugin>

src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

@@ -2048,7 +2048,7 @@ private String getProjectNameTemplateForMavenProject( MavenProject mavenProject
         Build build = mavenProject.getBuild();
         if ( build != null )
         {
-            String eclipsePlugin = "org.apache.maven.plugins:maven-eclipse-plugin";
+            String eclipsePlugin = "io.wcm.devops.maven.plugins:eclipse-maven-plugin";
             Plugin plugin = (Plugin) build.getPluginsAsMap().get( eclipsePlugin );
             if ( plugin == null && build.getPluginManagement() != null )
             {

src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java

@@ -81,7 +81,7 @@ public void write()
     {
 
         // check if it's necessary to create project specific settings
-        Properties ajdtSettings = new Properties();
+        Properties ajdtSettings = new SortedProperties();
 
         IdeDependency[] deps = config.getDeps();
         int ajdtDepCount = 0;
@@ -118,10 +118,11 @@ public void write()
                 {
                     oldAjdtSettingsFile = ajdtSettingsFile;
 
-                    Properties oldsettings = new Properties();
+                    Properties oldsettings = new SortedProperties();
                     oldsettings.load( new FileInputStream( oldAjdtSettingsFile ) );
 
-                    Properties newsettings = (Properties) oldsettings.clone();
+                    Properties newsettings = new SortedProperties();
+                    newsettings.putAll( oldsettings );
                     newsettings.putAll( ajdtSettings );
 
                     if ( !oldsettings.equals( newsettings ) )

src/main/java/org/apache/maven/plugin/eclipse/writers/SortedProperties.java

@@ -0,0 +1,69 @@
+package org.apache.maven.plugin.eclipse.writers;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+/**
+ * A {@link Properties} subclass that writes its entries in sorted (alphabetical) key order.
+ * <p>
+ * The standard {@link Properties#store} method iterates over keys in hash-table order, which
+ * is non-deterministic and differs between JVM versions. Using this class ensures that generated
+ * {@code .prefs} files have a stable, predictable layout regardless of the JVM used.
+ * </p>
+ * <p>
+ * Both {@link #keys()} (used by Java 8's {@code store}) and {@link #entrySet()} (used by Java 11+
+ * {@code store}) are overridden to enforce alphabetical ordering.
+ * </p>
+ */
+public class SortedProperties
+    extends Properties
+{
+
+    private static final long serialVersionUID = 1L;
+
+    /** Overridden for Java 8 compatibility: {@code Properties.store} used {@code keys()} there. */
+    @Override
+    public synchronized Enumeration<Object> keys()
+    {
+        return Collections.enumeration( new TreeSet<>( super.keySet() ) );
+    }
+
+    /**
+     * Overridden for Java 11+: {@code Properties.store} iterates via {@code entrySet()} in those
+     * versions and would bypass the {@link #keys()} override.
+     */
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet()
+    {
+        TreeMap<Object, Object> sorted = new TreeMap<>();
+        for ( Map.Entry<Object, Object> e : super.entrySet() )
+        {
+            sorted.put( e.getKey(), e.getValue() );
+        }
+        return sorted.entrySet();
+    }
+}

src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java

@@ -31,6 +31,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.Messages;
 import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+import org.apache.maven.plugin.eclipse.writers.SortedProperties;
 import org.apache.maven.plugin.ide.IdeUtils;
 
 /**
@@ -61,7 +62,7 @@ public void write()
     {
 
         // check if it's necessary to create project specific settings
-        Properties coreSettings = new Properties();
+        Properties coreSettings = new SortedProperties();
 
         String source = IdeUtils.getCompilerSourceVersion( config.getProject() );
         String encoding = IdeUtils.getCompilerSourceEncoding( config.getProject() );
@@ -144,10 +145,11 @@ public void write()
                 {
                     oldCoreSettingsFile = coreSettingsFile;
 
-                    Properties oldsettings = new Properties();
+                    Properties oldsettings = new SortedProperties();
                     oldsettings.load( new FileInputStream( oldCoreSettingsFile ) );
 
-                    Properties newsettings = (Properties) oldsettings.clone();
+                    Properties newsettings = new SortedProperties();
+                    newsettings.putAll( oldsettings );
                     newsettings.putAll( coreSettings );
 
                     if ( !oldsettings.equals( newsettings ) )