Author: stephenc Date: Thu Jun 15 13:18:19 2017 New Revision: 1798831 URL: http://svn.apache.org/viewvc?rev=1798831&view=rev Log: [MENFORCER-273] Adding RequireUpperBoundDeps.excludes option.
Amends r1798819 with integration tests Submitted by Jesse Glick (jglick at apache dot org) Curses on Subversion for not adding untracked files introduced by a patch from GitHub Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/verify.groovy Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml?rev=1798831&view=auto ============================================================================== --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml (added) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml Thu Jun 15 13:18:19 2017 @@ -0,0 +1,30 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>test</groupId> + <artifactId>TestParent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>TestModule</artifactId> + <version>1.1-SNAPSHOT</version> +</project> Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml?rev=1798831&view=auto ============================================================================== --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml (added) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml Thu Jun 15 13:18:19 2017 @@ -0,0 +1,66 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128_api</artifactId> + <version>1.4.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128_classic</artifactId> + <version>0.9.9</version> + <!-- Depends on org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0 --> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>@project.version@</version> + <executions> + <execution> + <id>enforce</id> + <configuration> + <rules> + <requireUpperBoundDeps> + <excludes> + <exclude>org.apache.maven.plugins.enforcer.its:menforcer128_api</exclude> + </excludes> + </requireUpperBoundDeps> + </rules> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/verify.groovy URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/verify.groovy?rev=1798831&view=auto ============================================================================== --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/verify.groovy (added) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/verify.groovy Thu Jun 15 13:18:19 2017 @@ -0,0 +1,22 @@ +/* + * 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. + */ +def LS = System.getProperty( "line.separator" ) +File buildLog = new File( basedir, 'build.log' ) + +assert buildLog.text.contains( 'Ignoring requireUpperBoundDeps in org.apache.maven.plugins.enforcer.its:menforcer128_api' )