Repository: cayenne Updated Branches: refs/heads/master 75d49a95c -> 26e22a3fd
ensure single version of maven-plugin-plugin and that eclipse ignores it Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/26e22a3f Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/26e22a3f Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/26e22a3f Branch: refs/heads/master Commit: 26e22a3fddfd9278e04c66cdd25df6107e1edeb1 Parents: 75d49a9 Author: Andrus Adamchik <aadamc...@apache.org> Authored: Fri Dec 12 14:36:25 2014 +0300 Committer: Andrus Adamchik <aadamc...@apache.org> Committed: Fri Dec 12 14:36:25 2014 +0300 ---------------------------------------------------------------------- plugins/maven-cayenne-plugin/pom.xml | 1 - plugins/pom.xml | 62 ++++++++++++++----------------- pom.xml | 18 +++++++++ 3 files changed, 45 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/26e22a3f/plugins/maven-cayenne-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/pom.xml b/plugins/maven-cayenne-plugin/pom.xml index 394ef7d..026f1aa 100644 --- a/plugins/maven-cayenne-plugin/pom.xml +++ b/plugins/maven-cayenne-plugin/pom.xml @@ -150,7 +150,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> </plugin> </plugins> </reporting> http://git-wip-us.apache.org/repos/asf/cayenne/blob/26e22a3f/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 5445e67..6d29668 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -1,23 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<!-- 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. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cayenne</groupId> @@ -96,22 +89,21 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.3</version> - <configuration> - <goalPrefix>signature</goalPrefix> - </configuration> - <executions> - <execution> - <goals> - <goal>descriptor</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>signature</goalPrefix> + </configuration> + <executions> + <execution> + <goals> + <goal>descriptor</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/cayenne/blob/26e22a3f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f543fc2..f01cc56 100644 --- a/pom.xml +++ b/pom.xml @@ -702,10 +702,28 @@ <ignore /> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>descriptor</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.3</version> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.4.3</version>
