This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MENFORCER-195 in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 3a5e3d21dc2ef5cd3a510176aa9f339e1b4f11c3 Author: Ray Tsang <saturn...@gmail.com> AuthorDate: Thu Jul 18 19:51:22 2019 +0300 Added tests to validate wildcard support for DependencyConvergence and RequireUpperBound with MNG-6713 Signed-off-by: rfscholte <rfscho...@apache.org> --- .../menforcer269_project-higher-1.0.0.pom | 33 ++++++++++ .../menforcer269_project-lower-1.0.0.pom | 33 ++++++++++ .../menforcer269_project-middle-1.0.0.pom | 33 ++++++++++ .../invoker.properties | 18 ++++++ .../dependencies_converge_exclude_wildcard/pom.xml | 67 ++++++++++++++++++++ .../invoker.properties | 18 ++++++ .../require-upper-bound-exclude_wildcard/pom.xml | 72 ++++++++++++++++++++++ 7 files changed, 274 insertions(+) diff --git a/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-higher-1.0.0.pom b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-higher-1.0.0.pom new file mode 100644 index 0000000..2a52e73 --- /dev/null +++ b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-higher-1.0.0.pom @@ -0,0 +1,33 @@ +<?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>menforcer269_project-higher</artifactId> + <version>1.0.0</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128_api</artifactId> + <version>1.6.0</version> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-lower-1.0.0.pom b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-lower-1.0.0.pom new file mode 100644 index 0000000..1b9b3b1 --- /dev/null +++ b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-lower-1.0.0.pom @@ -0,0 +1,33 @@ +<?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>menforcer269_project-lower</artifactId> + <version>1.0.0</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128_api</artifactId> + <version>1.4.0</version> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-middle-1.0.0.pom b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-middle-1.0.0.pom new file mode 100644 index 0000000..c133899 --- /dev/null +++ b/maven-enforcer-plugin/src/it/mrm/repository/menforcer269_project-middle-1.0.0.pom @@ -0,0 +1,33 @@ +<?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>menforcer269_project-middle</artifactId> + <version>1.0.0</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer128_api</artifactId> + <version>1.5.0</version> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/invoker.properties b/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/invoker.properties new file mode 100644 index 0000000..c4dc6a1 --- /dev/null +++ b/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/invoker.properties @@ -0,0 +1,18 @@ +# 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. + +invoker.maven.version = 3.6.2+ diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/pom.xml new file mode 100644 index 0000000..5240198 --- /dev/null +++ b/maven-enforcer-plugin/src/it/projects/dependencies_converge_exclude_wildcard/pom.xml @@ -0,0 +1,67 @@ +<?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>test</groupId> + <artifactId>TestParent</artifactId> + <version>1.0</version> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer269_project-middle</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer269_project-higher</artifactId> + <version>1.0.0</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </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> + <DependencyConvergence/> + </rules> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/invoker.properties b/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/invoker.properties new file mode 100644 index 0000000..c4dc6a1 --- /dev/null +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/invoker.properties @@ -0,0 +1,18 @@ +# 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. + +invoker.maven.version = 3.6.2+ diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/pom.xml new file mode 100644 index 0000000..be90caa --- /dev/null +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-exclude_wildcard/pom.xml @@ -0,0 +1,72 @@ +<?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>test</groupId> + <artifactId>TestParent</artifactId> + <version>1.0</version> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer269_project-middle</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer269_project-lower</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins.enforcer.its</groupId> + <artifactId>menforcer269_project-higher</artifactId> + <version>1.0.0</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </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/> + </rules> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file