You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/28 23:01:50 UTC
[maven-archetype] 03/03: Revert "Archetype ITs should exclude
copying unnecessary file build.log (open file with ongoing writes),
otherwise the copy fails with IOException."
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch buildfix
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 400dfc6cf9a2d01a8bdc8b1232d1090c13f17c6f
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Jul 29 01:01:18 2019 +0200
Revert "Archetype ITs should exclude copying unnecessary file build.log (open file with ongoing writes), otherwise the copy fails with IOException."
This reverts commit 9d45acab
---
.../archetype.properties | 18 ------------------
.../ARCHETYPE-517_failing-goals/archetype.properties | 18 ------------------
.../projects/ARCHETYPE-520_mirror/archetype.properties | 18 ------------------
.../ARCHETYPE-521_archetype-repo/archetype.properties | 18 ------------------
.../ARCHETYPE-536_groovy-grape/archetype.properties | 18 ------------------
.../it/projects/build-and-run-its/archetype.properties | 18 ------------------
.../it/projects/build-archetype/archetype.properties | 18 ------------------
.../it/projects/build-ignore-eol/archetype.properties | 18 ------------------
.../change-file-with-property/archetype.properties | 1 -
.../src/it/projects/create-1/archetype.properties | 3 +--
.../src/it/projects/create-2/archetype.properties | 3 +--
.../src/it/projects/create-3/archetype.properties | 2 --
.../src/it/projects/create-4/archetype.properties | 3 +--
.../src/it/projects/create-5/archetype.properties | 1 -
.../src/it/projects/create-6/archetype.properties | 1 -
.../archetype.properties | 2 +-
.../projects/create-from-project/archetype.properties | 3 +--
.../projects/exclude-patterns-2/archetype.properties | 2 +-
.../it/projects/exclude-patterns/archetype.properties | 2 +-
.../it/projects/generate-basic/archetype.properties | 18 ------------------
.../archetype.properties | 1 -
.../included-system-properties/archetype.properties | 1 -
.../projects/property-setting-cli/archetype.properties | 18 ------------------
23 files changed, 7 insertions(+), 198 deletions(-)
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-241_filter-directory/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-517_failing-goals/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-521_archetype-repo/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-521_archetype-repo/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-521_archetype-repo/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-536_groovy-grape/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-536_groovy-grape/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-536_groovy-grape/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/build-and-run-its/archetype.properties b/maven-archetype-plugin/src/it/projects/build-and-run-its/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/build-and-run-its/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/archetype.properties b/maven-archetype-plugin/src/it/projects/build-archetype/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/build-archetype/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/build-ignore-eol/archetype.properties b/maven-archetype-plugin/src/it/projects/build-ignore-eol/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/build-ignore-eol/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/change-file-with-property/archetype.properties b/maven-archetype-plugin/src/it/projects/change-file-with-property/archetype.properties
index 10d8aa3..e6a512a 100644
--- a/maven-archetype-plugin/src/it/projects/change-file-with-property/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/change-file-with-property/archetype.properties
@@ -23,4 +23,3 @@ artifactId=change-file-with-property
version=1.0-SNAPSHOT
package=archetype
someProperty=App
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/create-1/archetype.properties b/maven-archetype-plugin/src/it/projects/create-1/archetype.properties
index 01c0b39..49f78bd 100644
--- a/maven-archetype-plugin/src/it/projects/create-1/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-1/archetype.properties
@@ -24,5 +24,4 @@ groupId=org.apache.maven.archetype.test
artifactId=test-create-1
version=1.0-SNAPSHOT
package=archetype
-someProperty=A String to search for
-excludePatterns=build.log,invoker.properties,verify.groovy
\ No newline at end of file
+someProperty=A String to search for
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/create-2/archetype.properties b/maven-archetype-plugin/src/it/projects/create-2/archetype.properties
index 3161a07..d9b47cb 100644
--- a/maven-archetype-plugin/src/it/projects/create-2/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-2/archetype.properties
@@ -22,5 +22,4 @@ groupId=org.apache.maven.archetype.test
artifactId=test-create-2
version=1.0-SNAPSHOT
package=org.apache.maven.archetype
-someProperty=A String to search for
-excludePatterns=build.log,invoker.properties,verify.groovy
\ No newline at end of file
+someProperty=A String to search for
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/create-3/archetype.properties b/maven-archetype-plugin/src/it/projects/create-3/archetype.properties
index 1816e9d..dd8d660 100644
--- a/maven-archetype-plugin/src/it/projects/create-3/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-3/archetype.properties
@@ -27,5 +27,3 @@ version=1.0-SNAPSHOT
package=org.apache.maven.archetype
someProperty=A String to search for
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/create-4/archetype.properties b/maven-archetype-plugin/src/it/projects/create-4/archetype.properties
index d412c8c..c7c4a75 100644
--- a/maven-archetype-plugin/src/it/projects/create-4/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-4/archetype.properties
@@ -21,5 +21,4 @@ groupId=org.apache.maven.archetype.test
artifactId=test-create-4
version=1.0-SNAPSHOT
package=org.apache.maven.archetype
-someProperty=A String to search for
-excludePatterns=build.log,invoker.properties,verify.groovy
+someProperty=A String to search for
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/create-5/archetype.properties b/maven-archetype-plugin/src/it/projects/create-5/archetype.properties
index 60ec7ef..639397f 100644
--- a/maven-archetype-plugin/src/it/projects/create-5/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-5/archetype.properties
@@ -16,4 +16,3 @@
# under the License.
archetype.groupId=archetypes
archetype.version=1.0
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/create-6/archetype.properties b/maven-archetype-plugin/src/it/projects/create-6/archetype.properties
index 5d01555..3bce41a 100644
--- a/maven-archetype-plugin/src/it/projects/create-6/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-6/archetype.properties
@@ -18,4 +18,3 @@ groupId=com.test
artifactId=create-6
archetype.groupId=archetypes
archetype.version=1.0
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/archetype.properties b/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/archetype.properties
index 81cd307..0d3bce8 100644
--- a/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-from-project-exclude-patterns/archetype.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-excludePatterns=**/toexclude/**,build.log,invoker.properties,verify.groovy
\ No newline at end of file
+excludePatterns=**/toexclude/**
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/create-from-project/archetype.properties b/maven-archetype-plugin/src/it/projects/create-from-project/archetype.properties
index 46053d1..8fb65f9 100644
--- a/maven-archetype-plugin/src/it/projects/create-from-project/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/create-from-project/archetype.properties
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-AppName App
-excludePatterns=build.log,invoker.properties,verify.groovy
\ No newline at end of file
+AppName App
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/exclude-patterns-2/archetype.properties b/maven-archetype-plugin/src/it/projects/exclude-patterns-2/archetype.properties
index 92a5214..c617e8d 100644
--- a/maven-archetype-plugin/src/it/projects/exclude-patterns-2/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/exclude-patterns-2/archetype.properties
@@ -23,4 +23,4 @@ artifactId=change-file-with-property
version=1.0-SNAPSHOT
package=archetype
someProperty=App
-excludePatterns=**/.sonar/**,build.log,invoker.properties,verify.groovy
+excludePatterns=**/.sonar/**
diff --git a/maven-archetype-plugin/src/it/projects/exclude-patterns/archetype.properties b/maven-archetype-plugin/src/it/projects/exclude-patterns/archetype.properties
index 3145c8d..9b8de3a 100644
--- a/maven-archetype-plugin/src/it/projects/exclude-patterns/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/exclude-patterns/archetype.properties
@@ -22,4 +22,4 @@ artifactId=change-file-with-property
version=1.0-SNAPSHOT
package=archetype
someProperty=App
-excludePatterns=.toexclude/**,build.log,invoker.properties,verify.groovy
+excludePatterns=.toexclude/**
diff --git a/maven-archetype-plugin/src/it/projects/generate-basic/archetype.properties b/maven-archetype-plugin/src/it/projects/generate-basic/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/generate-basic/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/include-file-with-no-extension/archetype.properties b/maven-archetype-plugin/src/it/projects/include-file-with-no-extension/archetype.properties
index 48b74ab..ba4c986 100644
--- a/maven-archetype-plugin/src/it/projects/include-file-with-no-extension/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/include-file-with-no-extension/archetype.properties
@@ -23,4 +23,3 @@ groupId=org.apache.maven.archetype.test
artifactId=test
version=1.0-SNAPSHOT
package=archetype
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/included-system-properties/archetype.properties b/maven-archetype-plugin/src/it/projects/included-system-properties/archetype.properties
index fd7f570..0b139a1 100644
--- a/maven-archetype-plugin/src/it/projects/included-system-properties/archetype.properties
+++ b/maven-archetype-plugin/src/it/projects/included-system-properties/archetype.properties
@@ -23,4 +23,3 @@ groupId=org.apache.maven.archetype.test
artifactId=test
version=1.0-SNAPSHOT
package=archetype
-excludePatterns=build.log,invoker.properties,verify.groovy
diff --git a/maven-archetype-plugin/src/it/projects/property-setting-cli/archetype.properties b/maven-archetype-plugin/src/it/projects/property-setting-cli/archetype.properties
deleted file mode 100644
index 74cf9cb..0000000
--- a/maven-archetype-plugin/src/it/projects/property-setting-cli/archetype.properties
+++ /dev/null
@@ -1,18 +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.
-
-excludePatterns=build.log,invoker.properties,verify.groovy