From 258d666ee76782c5211519313803fad9a8b408e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 3 Nov 2019 14:42:45 +0100 Subject: [PATCH] MSOURCES-122 make output independant from OS newline - remove Maven descriptors - remove newlines from resource files that will go into the jar --- pom.xml | 16 +++++++-- src/it/reproducible/pom.xml | 2 ++ .../src/main/resources/Uppercase.txt | 18 +--------- .../src/main/resources/dir-A/A2.txt | 18 +--------- .../src/main/resources/dir-A/A4.txt | 18 +--------- .../src/main/resources/dir-A/a1.txt | 35 +------------------ .../src/main/resources/dir-A/a3.txt | 18 +--------- .../src/main/resources/dir-C/C.txt | 18 +--------- .../src/main/resources/dir-b/B2/B2.txt | 18 +--------- .../src/main/resources/dir-b/B4/B4.txt | 18 +--------- .../src/main/resources/dir-b/b.txt | 18 +--------- .../src/main/resources/dir-b/b1/b1.txt | 18 +--------- .../src/main/resources/dir-b/b3/b3.txt | 18 +--------- .../src/main/resources/dir-d/d.txt | 18 +--------- .../src/main/resources/executable.txt | 18 +--------- .../src/main/resources/lowercase.txt | 18 +--------- src/it/reproducible/verify.groovy | 4 +-- 17 files changed, 31 insertions(+), 260 deletions(-) diff --git a/pom.xml b/pom.xml index e88b0c3..014e775 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ under the License. org.apache.maven.plugin-tools maven-plugin-annotations provided - + org.apache.maven @@ -143,7 +143,19 @@ under the License. - + + + + org.apache.rat + apache-rat-plugin + + + src/it/reproducible/src/main/resources/**/*.txt + + + + + diff --git a/src/it/reproducible/pom.xml b/src/it/reproducible/pom.xml index e080fd5..214ea5e 100644 --- a/src/it/reproducible/pom.xml +++ b/src/it/reproducible/pom.xml @@ -45,6 +45,8 @@ maven-source-plugin + + false diff --git a/src/it/reproducible/src/main/resources/Uppercase.txt b/src/it/reproducible/src/main/resources/Uppercase.txt index 00ae6c0..f6a87c0 100644 --- a/src/it/reproducible/src/main/resources/Uppercase.txt +++ b/src/it/reproducible/src/main/resources/Uppercase.txt @@ -1,17 +1 @@ -# 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. - +Uppercase \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-A/A2.txt b/src/it/reproducible/src/main/resources/dir-A/A2.txt index 00ae6c0..143e8fd 100644 --- a/src/it/reproducible/src/main/resources/dir-A/A2.txt +++ b/src/it/reproducible/src/main/resources/dir-A/A2.txt @@ -1,17 +1 @@ -# 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. - +A2 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-A/A4.txt b/src/it/reproducible/src/main/resources/dir-A/A4.txt index 00ae6c0..739b7df 100644 --- a/src/it/reproducible/src/main/resources/dir-A/A4.txt +++ b/src/it/reproducible/src/main/resources/dir-A/A4.txt @@ -1,17 +1 @@ -# 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. - +A4 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-A/a1.txt b/src/it/reproducible/src/main/resources/dir-A/a1.txt index ca0e172..59ef8d1 100644 --- a/src/it/reproducible/src/main/resources/dir-A/a1.txt +++ b/src/it/reproducible/src/main/resources/dir-A/a1.txt @@ -1,34 +1 @@ -# 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. - -# 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. - +a1 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-A/a3.txt b/src/it/reproducible/src/main/resources/dir-A/a3.txt index 00ae6c0..650b777 100644 --- a/src/it/reproducible/src/main/resources/dir-A/a3.txt +++ b/src/it/reproducible/src/main/resources/dir-A/a3.txt @@ -1,17 +1 @@ -# 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. - +a3 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-C/C.txt b/src/it/reproducible/src/main/resources/dir-C/C.txt index 00ae6c0..96d80cd 100644 --- a/src/it/reproducible/src/main/resources/dir-C/C.txt +++ b/src/it/reproducible/src/main/resources/dir-C/C.txt @@ -1,17 +1 @@ -# 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. - +C \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-b/B2/B2.txt b/src/it/reproducible/src/main/resources/dir-b/B2/B2.txt index 00ae6c0..42fbb5a 100644 --- a/src/it/reproducible/src/main/resources/dir-b/B2/B2.txt +++ b/src/it/reproducible/src/main/resources/dir-b/B2/B2.txt @@ -1,17 +1 @@ -# 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. - +B2 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-b/B4/B4.txt b/src/it/reproducible/src/main/resources/dir-b/B4/B4.txt index 00ae6c0..51bad54 100644 --- a/src/it/reproducible/src/main/resources/dir-b/B4/B4.txt +++ b/src/it/reproducible/src/main/resources/dir-b/B4/B4.txt @@ -1,17 +1 @@ -# 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. - +B4 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-b/b.txt b/src/it/reproducible/src/main/resources/dir-b/b.txt index 00ae6c0..63d8dbd 100644 --- a/src/it/reproducible/src/main/resources/dir-b/b.txt +++ b/src/it/reproducible/src/main/resources/dir-b/b.txt @@ -1,17 +1 @@ -# 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. - +b \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-b/b1/b1.txt b/src/it/reproducible/src/main/resources/dir-b/b1/b1.txt index 00ae6c0..611d987 100644 --- a/src/it/reproducible/src/main/resources/dir-b/b1/b1.txt +++ b/src/it/reproducible/src/main/resources/dir-b/b1/b1.txt @@ -1,17 +1 @@ -# 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. - +b1 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-b/b3/b3.txt b/src/it/reproducible/src/main/resources/dir-b/b3/b3.txt index 00ae6c0..2a7d289 100644 --- a/src/it/reproducible/src/main/resources/dir-b/b3/b3.txt +++ b/src/it/reproducible/src/main/resources/dir-b/b3/b3.txt @@ -1,17 +1 @@ -# 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. - +b3 \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/dir-d/d.txt b/src/it/reproducible/src/main/resources/dir-d/d.txt index 00ae6c0..c59d9b6 100644 --- a/src/it/reproducible/src/main/resources/dir-d/d.txt +++ b/src/it/reproducible/src/main/resources/dir-d/d.txt @@ -1,17 +1 @@ -# 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. - +d \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/executable.txt b/src/it/reproducible/src/main/resources/executable.txt index 00ae6c0..9268d74 100755 --- a/src/it/reproducible/src/main/resources/executable.txt +++ b/src/it/reproducible/src/main/resources/executable.txt @@ -1,17 +1 @@ -# 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. - +executable \ No newline at end of file diff --git a/src/it/reproducible/src/main/resources/lowercase.txt b/src/it/reproducible/src/main/resources/lowercase.txt index 00ae6c0..98dbf49 100644 --- a/src/it/reproducible/src/main/resources/lowercase.txt +++ b/src/it/reproducible/src/main/resources/lowercase.txt @@ -1,17 +1 @@ -# 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. - +lowercase \ No newline at end of file diff --git a/src/it/reproducible/verify.groovy b/src/it/reproducible/verify.groovy index a8261c2..bd8aa47 100644 --- a/src/it/reproducible/verify.groovy +++ b/src/it/reproducible/verify.groovy @@ -72,6 +72,4 @@ zipFile.close(); String buf = r.toString() println buf -String expectedSha1 = System.properties['os.name'].toLowerCase().contains( 'windows' ) ? '3fd3c6db6774db82e78bffc645930a186266e209' : 'bc56380204897bf99dea7849853a7d52f470e7d6' - -assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = $expectedSha1" ) +assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = c505d059e036128fae3fcdd265fa51e14d7ae241" )