cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/3] cxf git commit: CXF-7305: replaced prerequisites as this is only intended for maven-plugin projects but not for non maven-plugin projects. see also MNG-6092 This closes #250
Date Thu, 30 Mar 2017 16:05:25 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c83919aa2 -> 64786b8ec


CXF-7305: replaced prerequisites as this is only intended for maven-plugin projects but not
for non maven-plugin projects. see also MNG-6092
This closes #250

# Conflicts:
#	pom.xml

# Conflicts:
#	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ac5ba54
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ac5ba54
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ac5ba54

Branch: refs/heads/3.0.x-fixes
Commit: 8ac5ba54e3c4829a09f2918a043f6cb1f4b138f7
Parents: c83919a
Author: Dennis Kieselhorst <deki@apache.org>
Authored: Thu Mar 30 09:18:14 2017 +0200
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Mar 30 12:04:42 2017 -0400

----------------------------------------------------------------------
 pom.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8ac5ba54/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10f825f..b365e1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
         <system>jira</system>
         <url>https://issues.apache.org/jira/browse/CXF</url>
     </issueManagement>
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
     <properties>
         <cxf.compiler.fork>false</cxf.compiler.fork>
         <cxf.build-utils.version>3.0.0</cxf.build-utils.version>
@@ -640,8 +637,65 @@
                         </dependency>
                     </dependencies>
                 </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>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            maven-plugin-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [3.4,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>descriptor</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.4.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.1</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
     <reporting>
         <plugins>


Mime
View raw message