Skip to content

Commit 258d666

Browse files
hboutemyhboutemy
committed
MSOURCES-122 make output independant from OS newline
- remove Maven descriptors - remove newlines from resource files that will go into the jar
1 parent 5b4e02f commit 258d666

File tree

17 files changed

+31
-260
lines changed

17 files changed

+31
-260
lines changed

‎pom.xml

+14-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ under the License.
105105
<groupId>org.apache.maven.plugin-tools</groupId>
106106
<artifactId>maven-plugin-annotations</artifactId>
107107
<scope>provided</scope>
108-
</dependency>
108+
</dependency>
109109

110110
<dependency>
111111
<groupId>org.apache.maven</groupId>
@@ -143,7 +143,19 @@ under the License.
143143
</dependency>
144144
</dependencies>
145145

146-
146+
<build>
147+
<plugins>
148+
<plugin>
149+
<groupId>org.apache.rat</groupId>
150+
<artifactId>apache-rat-plugin</artifactId>
151+
<configuration>
152+
<excludes combine.children="append">
153+
<exclude>src/it/reproducible/src/main/resources/**/*.txt</exclude>
154+
</excludes>
155+
</configuration>
156+
</plugin>
157+
</plugins>
158+
</build>
147159

148160
<profiles>
149161
<profile>

‎src/it/reproducible/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
<artifactId>maven-source-plugin</artifactId>
4646
<configuration>
4747
<archive>
48+
<!-- remove Maven descriptor pom.xml and pom.properties since they vary given platform line ending -->
49+
<addMavenDescriptor>false</addMavenDescriptor>
4850
<manifest>
4951
<!-- remove default entries since it contains "Created-By: Maven Source Plugin <current plugin version>"
5052
which varies over time in this IT -->

‎src/it/reproducible/src/main/resources/Uppercase.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
Uppercase

‎src/it/reproducible/src/main/resources/dir-A/A2.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
A2

‎src/it/reproducible/src/main/resources/dir-A/A4.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
A4

‎src/it/reproducible/src/main/resources/dir-A/a1.txt

+1-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
18-
# Licensed to the Apache Software Foundation (ASF) under one
19-
# or more contributor license agreements. See the NOTICE file
20-
# distributed with this work for additional information
21-
# regarding copyright ownership. The ASF licenses this file
22-
# to you under the Apache License, Version 2.0 (the
23-
# "License"); you may not use this file except in compliance
24-
# with the License. You may obtain a copy of the License at
25-
#
26-
# http://www.apache.org/licenses/LICENSE-2.0
27-
#
28-
# Unless required by applicable law or agreed to in writing,
29-
# software distributed under the License is distributed on an
30-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
31-
# KIND, either express or implied. See the License for the
32-
# specific language governing permissions and limitations
33-
# under the License.
34-
1+
a1

‎src/it/reproducible/src/main/resources/dir-A/a3.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
a3

‎src/it/reproducible/src/main/resources/dir-C/C.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
C

‎src/it/reproducible/src/main/resources/dir-b/B2/B2.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
B2

‎src/it/reproducible/src/main/resources/dir-b/B4/B4.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
B4

‎src/it/reproducible/src/main/resources/dir-b/b.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
b

‎src/it/reproducible/src/main/resources/dir-b/b1/b1.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
b1

‎src/it/reproducible/src/main/resources/dir-b/b3/b3.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
b3

‎src/it/reproducible/src/main/resources/dir-d/d.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
d

‎src/it/reproducible/src/main/resources/executable.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
executable

‎src/it/reproducible/src/main/resources/lowercase.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
1+
lowercase

‎src/it/reproducible/verify.groovy

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,4 @@ zipFile.close();
7272
String buf = r.toString()
7373
println buf
7474

75-
String expectedSha1 = System.properties['os.name'].toLowerCase().contains( 'windows' ) ? '3fd3c6db6774db82e78bffc645930a186266e209' : 'bc56380204897bf99dea7849853a7d52f470e7d6'
76-
77-
assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = $expectedSha1" )
75+
assert buf.startsWith( "reproducible-1.0-sources.jar sha1 = c505d059e036128fae3fcdd265fa51e14d7ae241" )

0 commit comments

Comments
 (0)