Repository: maven-archetype Updated Branches: refs/heads/master 2e5611a2d -> 0b48393e5
Fix licenses for ITs Exclude goal.txt, which may only contain 1 line with goals Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/0b48393e Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/0b48393e Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/0b48393e Branch: refs/heads/master Commit: 0b48393e54de95503283b6ec38f3fd36ddd32254 Parents: 2e5611a Author: rfscholte <rfscho...@apache.org> Authored: Wed Feb 8 13:01:19 2017 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Wed Feb 8 13:01:19 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/Test-__projectName__.java | 28 +++++++++++++++++++- .../invoker.properties | 17 ++++++++++++ .../resources/projects/archetype.pom.properties | 17 ++++++++++++ .../resources/projects/archetype.properties | 17 ++++++++++++ .../projects/basic/archetype.properties | 17 ++++++++++++ .../test/resources/projects/basic/verify.groovy | 19 +++++++++++++ .../invoker.properties | 17 ++++++++++++ .../__package__.properties | 17 ++++++++++++ .../resources/test-__artifactId__.properties | 17 ++++++++++++ .../src/site/apt/__artifactId__.apt | 17 ++++++++++++ .../projects/basic/archetype.properties | 17 ++++++++++++ .../build/archetype/build.archetype.properties | 17 ++++++++++++ .../src/main/resources/test-basic.properties | 17 ++++++++++++ .../src/site/build/archetype/apt/basic.apt | 2 +- .../test/resources/projects/basic/verify.groovy | 19 +++++++++++++ .../src/it/build-archetype/invoker.properties | 17 ++++++++++++ .../__package__.properties | 17 ++++++++++++ .../resources/test-__artifactId__.properties | 17 ++++++++++++ .../src/site/apt/__artifactId__.apt | 17 ++++++++++++ .../projects/basic/archetype.properties | 17 ++++++++++++ .../build/archetype/build.archetype.properties | 17 ++++++++++++ .../src/main/resources/test-basic.properties | 17 ++++++++++++ .../src/site/build/archetype/apt/basic.apt | 17 ++++++++++++ .../test/resources/projects/basic/verify.groovy | 19 +++++++++++++ .../archetype.properties | 17 ++++++++++++ .../invoker.properties | 17 ++++++++++++ .../src/main/resources/file.txt | 16 +++++++++++ .../src/main/resources/file.xml | 18 +++++++++++++ .../src/main/resources/toexclude/file.txt | 16 +++++++++++ .../src/main/resources/toexclude/file.xml | 18 +++++++++++++ .../src/main/toexclude/file.txt | 16 +++++++++++ .../src/main/toexclude/file.xml | 18 +++++++++++++ .../src/toexclude/file.txt | 16 +++++++++++ .../src/toexclude/file.xml | 18 +++++++++++++ .../toexclude/file.txt | 16 +++++++++++ .../toexclude/file.xml | 18 +++++++++++++ .../it/create-from-project/archetype.properties | 17 ++++++++++++ .../it/create-from-project/invoker.properties | 17 ++++++++++++ .../src/it/generate-basic/invoker.properties | 17 ++++++++++++ .../it/property-setting-cli/invoker.properties | 16 +++++++++++ .../projects/basic/archetype.properties | 17 ++++++++++++ pom.xml | 2 +- 42 files changed, 697 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/ARCHETYPE-241_filter-directory/archetype/src/main/resources/archetype-resources/__projectName__-test2/src/main/java/Test-__projectName__.java ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/ARCHETYPE-241_filter-directory/archetype/src/main/resources/archetype-resources/__projectName__-test2/src/main/java/Test-__projectName__.java b/maven-archetype-plugin/src/it/ARCHETYPE-241_filter-directory/archetype/src/main/resources/archetype-resources/__projectName__-test2/src/main/java/Test-__projectName__.java index 5f9fc75..fb9c4b5 100644 --- a/maven-archetype-plugin/src/it/ARCHETYPE-241_filter-directory/archetype/src/main/resources/archetype-resources/__projectName__-test2/src/main/java/Test-__projectName__.java +++ b/maven-archetype-plugin/src/it/ARCHETYPE-241_filter-directory/archetype/src/main/resources/archetype-resources/__projectName__-test2/src/main/java/Test-__projectName__.java @@ -1 +1,27 @@ -"This is ${projectName}!" +/* + * 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. + */ + +public class Test${projectName} +{ + public static void main( String[] args ) + { + System.out.println( "This is ${projectName}!" ); + } +} + http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/invoker.properties b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/invoker.properties index 3802c4a..963ca6c 100644 --- a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/invoker.properties +++ b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/invoker.properties @@ -1 +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.goals = clean integration-test http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties index 0dfcb2b..627146f 100644 --- a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties +++ b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.pom.properties @@ -1,3 +1,20 @@ +# 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. + # https://github.com/mojohaus/pom-root, creates simple pom with packaging pom groupId=org.codehaus.mojo.archetypes artifactId=pom-root http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties index 3fbeda5..75a95e1 100644 --- a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/archetype.properties @@ -1,3 +1,20 @@ +# 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. + groupId=com.company artifactId=project version=1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties index 2607200..3560bb4 100644 --- a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# 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 http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy index b8e0729..5825797 100644 --- a/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy +++ b/maven-archetype-plugin/src/it/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/verify.groovy @@ -1 +1,20 @@ +/* + * 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. + */ + System.out.println("Yeah Baby, it rocks!") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/invoker.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/invoker.properties index 5dae7a5..7c3a612 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/invoker.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/invoker.properties @@ -1,3 +1,20 @@ +# 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.1 = clean integration-test invoker.buildResult.1 = failure http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties index 657705f..cf96eed 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __packageInPathFormat__ in file directory was replaced with "${packageInPathFormat}" # __package__ in filename was replaced with "${package}" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties index 498f14e..100ffba 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __artifactId__ in filename was replaced with "${artifactId}" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt index 33b5828..aaa6104 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt @@ -1,3 +1,20 @@ +~~ 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. + test: - non-filtered: ${artifactId} stays intact (not replaced by Velocity) - packaged: package directory will be added http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties index 64f9a9a..01013f2 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# 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 http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties index 860a34a..f996e64 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __packageInPathFormat__ in file directory was replaced with "build/archetype" # __package__ in filename was replaced with "build.archetype" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties index 25fe251..bc7e8cd 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __artifactId__ in filename was replaced with "basic" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt index e5e3c9c..0845f59 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt @@ -1 +1 @@ -test: - non-filtered: ${artifactId} stays intact (not replaced by Velocity) - packaged: package directory will be added - __artifactId__ is replaced (even if non-filtered) \ No newline at end of file +~~ 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. test: - non-filtered: ${artifactId} stays intact (not replaced by Velocity) - packaged: package directory will be added - __artifactId__ is replaced (even if non-filtered) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy index 1fef9cc..cd3ba2b 100644 --- a/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy +++ b/maven-archetype-plugin/src/it/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/verify.groovy @@ -1,3 +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. + */ + System.out.println(" Yeah Baby it rocks!") System.out.println("basedir:"+basedir) assert new File(basedir,"reference/src/main/resources/empty-directory").exists(); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/invoker.properties b/maven-archetype-plugin/src/it/build-archetype/invoker.properties index 3802c4a..963ca6c 100644 --- a/maven-archetype-plugin/src/it/build-archetype/invoker.properties +++ b/maven-archetype-plugin/src/it/build-archetype/invoker.properties @@ -1 +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.goals = clean integration-test http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties index 657705f..cf96eed 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties +++ b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __packageInPathFormat__ in file directory was replaced with "${packageInPathFormat}" # __package__ in filename was replaced with "${package}" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties index 498f14e..100ffba 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties +++ b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __artifactId__ in filename was replaced with "${artifactId}" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt index 33b5828..aaa6104 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt +++ b/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/site/apt/__artifactId__.apt @@ -1,3 +1,20 @@ +~~ 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. + test: - non-filtered: ${artifactId} stays intact (not replaced by Velocity) - packaged: package directory will be added http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/archetype.properties index 64f9a9a..01013f2 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# 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 http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties index 860a34a..f996e64 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties +++ b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/build/archetype/build.archetype.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __packageInPathFormat__ in file directory was replaced with "build/archetype" # __package__ in filename was replaced with "build.archetype" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties index 25fe251..bc7e8cd 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties +++ b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/main/resources/test-basic.properties @@ -1,3 +1,20 @@ +# 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. + # test file path __propertyName__ replacement with its value # __artifactId__ in filename was replaced with "basic" http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt index 33b5828..aaa6104 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt +++ b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/reference/src/site/build/archetype/apt/basic.apt @@ -1,3 +1,20 @@ +~~ 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. + test: - non-filtered: ${artifactId} stays intact (not replaced by Velocity) - packaged: package directory will be added http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/verify.groovy ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/verify.groovy index 1fef9cc..cd3ba2b 100644 --- a/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/verify.groovy +++ b/maven-archetype-plugin/src/it/build-archetype/src/test/resources/projects/basic/verify.groovy @@ -1,3 +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. + */ + System.out.println(" Yeah Baby it rocks!") System.out.println("basedir:"+basedir) assert new File(basedir,"reference/src/main/resources/empty-directory").exists(); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/archetype.properties b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/archetype.properties index 19f85bb..0d3bce8 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/archetype.properties +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/archetype.properties @@ -1 +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. + excludePatterns=**/toexclude/** \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/invoker.properties b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/invoker.properties index dac2cd9..27ec90f 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/invoker.properties +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/invoker.properties @@ -1 +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.goals = clean org.apache.maven.plugins:maven-archetype-plugin:${project.version}:create-from-project -Darchetype.properties=archetype.properties http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt index e69de29..238820c 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt @@ -0,0 +1,16 @@ +~~ 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml index e69de29..f133f0e 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml @@ -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. +--> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt index e69de29..238820c 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt @@ -0,0 +1,16 @@ +~~ 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml index e69de29..f133f0e 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml @@ -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. +--> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt index e69de29..238820c 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt @@ -0,0 +1,16 @@ +~~ 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml index e69de29..f133f0e 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml @@ -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. +--> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt index e69de29..238820c 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt @@ -0,0 +1,16 @@ +~~ 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml index e69de29..f133f0e 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml @@ -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. +--> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.txt ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.txt b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.txt index e69de29..238820c 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.txt +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.txt @@ -0,0 +1,16 @@ +~~ 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.xml b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.xml index e69de29..f133f0e 100644 --- a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.xml +++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/toexclude/file.xml @@ -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. +--> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project/archetype.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project/archetype.properties b/maven-archetype-plugin/src/it/create-from-project/archetype.properties index 0aa486a..8fb65f9 100644 --- a/maven-archetype-plugin/src/it/create-from-project/archetype.properties +++ b/maven-archetype-plugin/src/it/create-from-project/archetype.properties @@ -1 +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. + AppName App \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/create-from-project/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/create-from-project/invoker.properties b/maven-archetype-plugin/src/it/create-from-project/invoker.properties index dac2cd9..27ec90f 100644 --- a/maven-archetype-plugin/src/it/create-from-project/invoker.properties +++ b/maven-archetype-plugin/src/it/create-from-project/invoker.properties @@ -1 +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.goals = clean org.apache.maven.plugins:maven-archetype-plugin:${project.version}:create-from-project -Darchetype.properties=archetype.properties http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/maven-archetype-plugin/src/it/generate-basic/invoker.properties ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/generate-basic/invoker.properties b/maven-archetype-plugin/src/it/generate-basic/invoker.properties index 64745bb..2637cc8 100644 --- a/maven-archetype-plugin/src/it/generate-basic/invoker.properties +++ b/maven-archetype-plugin/src/it/generate-basic/invoker.properties @@ -1 +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.goals = org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.1 -DgroupId=com.company -DartifactId=project -Dversion=1.0-SNAPSHOT -Dpackage=com.company.project http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/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 index 3802c4a..a8853a6 100644 --- a/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties +++ b/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties @@ -1 +1,17 @@ +# 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/0b48393e/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 index 49e3c16..c4298cb 100644 --- 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 @@ -1,3 +1,20 @@ +~~ 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 http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/0b48393e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6401427..87c9c47 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ <exclude>**/XMLOutputter.java</exclude> <!-- disable test directories --> <exclude>src/test/**</exclude> - <exclude>src/it/**</exclude> + <exclude>src/it/**/goal.txt</exclude> <exclude>.repository/**</exclude><!-- for CI --> <!-- Used by JEnv --> <exclude>.java-version</exclude>
