jglick commented on code in PR #129: URL: https://github.com/apache/maven-shade-plugin/pull/129#discussion_r843869980
########## src/it/projects/MSHADE-323-compatible-with-flatten-pom/pom.xml: ########## @@ -0,0 +1,84 @@ +<?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> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.shade.flatten</groupId> + <artifactId>test</artifactId> + <version>1.0</version> + + <name>MSHADE-323</name> + <description> + Test that integration of shade and flatten plugins. Review Comment: ```suggestion Test the integration of Shade and Flatten plugins. ``` ########## src/it/projects/MSHADE-323-compatible-with-flatten-pom/verify.groovy: ########## @@ -0,0 +1,26 @@ +/* + * 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. + */ + +File pomFile = new File( basedir, "target/dependency-reduced-pom.xml" ); +assert pomFile.isFile() + +def ns = new groovy.xml.Namespace("http://maven.apache.org/POM/4.0.0";) Review Comment: ```suggestion def ns = new groovy.xml.Namespace( "http://maven.apache.org/POM/4.0.0"; ) ``` for consistency ########## src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java: ########## @@ -1090,7 +1092,10 @@ private void createDependencyReducedPom( Set<String> artifactsToRemove ) origDeps = transitiveDeps; } - Model model = project.getOriginalModel(); + final Model model = project.getFile() == null + ? project.getOriginalModel().clone() + : new MavenXpp3Reader().read( new FileInputStream( project.getFile() ) ); Review Comment: Possible resource leak? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
