Repository: maven-archetype Updated Branches: refs/heads/master 9e828c304 -> 2ac48e1c1
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml new file mode 100644 index 0000000..62120c4 --- /dev/null +++ b/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml @@ -0,0 +1,34 @@ +<?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>archetype.it</groupId> + <artifactId>basic</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <foo>bar</foo><!-- foo is an archetypes' required property --> + </properties> +</project> + http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/verify.groovy ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/verify.groovy new file mode 100644 index 0000000..2d64980 --- /dev/null +++ b/maven-archetype-plugin/src/it/projects/property-setting-cli/src/test/resources/projects/basic/verify.groovy @@ -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. + */ + +assert new File(context.projectDir, 'pom.xml').exists(); +content = new File(context.projectDir, 'pom.xml').text; +assert content.contains( '<foo>bar</foo>' ); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties b/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties deleted file mode 100644 index a8853a6..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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.goals = clean integration-test http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/pom.xml b/maven-archetype-plugin/src/it/property-setting-cli/pom.xml deleted file mode 100644 index 42fec0c..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?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.archetype.its</groupId> - <artifactId>property-setting-cli</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - - <name>property-setting-cli</name> - <description>ARCHETYPE-349: checks that a CLI property overrides a required property default, even when the default value contains a property reference</description> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>@project.version@</version> - </extension> - </extensions> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>@project.version@</version> - <configuration> - <ignoreEOLStyle>true</ignoreEOLStyle> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index a1170a4..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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. ---> - -<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; - name="archetype1"> - <requiredProperties> - <requiredProperty key="foo"> - <defaultValue>${some.name}</defaultValue> - </requiredProperty> - </requiredProperties> -</archetype-descriptor> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 423aade..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>1.0-SNAPSHOT</version> - - <properties> - <foo>${foo}</foo><!-- foo is an archetypes' required property --> - </properties> -</project> - http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index c4298cb..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,23 +0,0 @@ -~~ 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. - -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -package=build.archetype -# should override default archetype value (even if it contains an inner property ${...}: ARCHETYPE-349 -foo=bar \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/goal.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/goal.txt b/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml deleted file mode 100644 index 62120c4..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/reference/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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>archetype.it</groupId> - <artifactId>basic</artifactId> - <version>1.0-SNAPSHOT</version> - - <properties> - <foo>bar</foo><!-- foo is an archetypes' required property --> - </properties> -</project> - http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/verify.groovy ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/verify.groovy deleted file mode 100644 index 2d64980..0000000 --- a/maven-archetype-plugin/src/it/property-setting-cli/src/test/resources/projects/basic/verify.groovy +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ - -assert new File(context.projectDir, 'pom.xml').exists(); -content = new File(context.projectDir, 'pom.xml').text; -assert content.contains( '<foo>bar</foo>' ); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2ac48e1c/maven-archetype-plugin/src/it/settings.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/settings.xml b/maven-archetype-plugin/src/it/settings.xml deleted file mode 100644 index c8f77f0..0000000 --- a/maven-archetype-plugin/src/it/settings.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?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. ---> - -<settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>@localRepositoryUrl@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> -</settings>
