Skip to content

Commit b230a6f

Browse files
garydgregorygarydgregory
committed
Move the assembly folder to its standard location.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1697091 13f79535-47bb-0310-9956-ffa450edef68
1 parent c666612 commit b230a6f

3 files changed

Lines changed: 99 additions & 99 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ CSV files of various types.
165165
<artifactId>maven-assembly-plugin</artifactId>
166166
<configuration>
167167
<descriptors>
168-
<descriptor>src/main/assembly/bin.xml</descriptor>
169-
<descriptor>src/main/assembly/src.xml</descriptor>
168+
<descriptor>src/assembly/bin.xml</descriptor>
169+
<descriptor>src/assembly/src.xml</descriptor>
170170
</descriptors>
171171
<tarLongFileMode>gnu</tarLongFileMode>
172172
</configuration>

src/main/assembly/bin.xml renamed to src/assembly/bin.xml

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one or more
3-
contributor license agreements. See the NOTICE file distributed with
4-
this work for additional information regarding copyright ownership.
5-
The ASF licenses this file to You under the Apache License, Version 2.0
6-
(the "License"); you may not use this file except in compliance with
7-
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, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
16-
-->
17-
<assembly>
18-
<id>bin</id>
19-
<formats>
20-
<format>tar.gz</format>
21-
<format>zip</format>
22-
</formats>
23-
<fileSets>
24-
<fileSet>
25-
<includes>
26-
<include>LICENSE.txt</include>
27-
<include>NOTICE.txt</include>
28-
<include>RELEASE-NOTES.txt</include>
29-
</includes>
30-
</fileSet>
31-
<fileSet>
32-
<directory>target</directory>
33-
<outputDirectory></outputDirectory>
34-
<includes>
35-
<include>${artifactId}-${version}.jar</include>
36-
</includes>
37-
</fileSet>
38-
<fileSet>
39-
<directory>target/site/apidocs</directory>
40-
<outputDirectory>apidocs</outputDirectory>
41-
<includes>
42-
<include>**/*</include>
43-
</includes>
44-
</fileSet>
45-
<!-- Include sources jar for IDEs -->
46-
<fileSet>
47-
<directory>target</directory>
48-
<outputDirectory></outputDirectory>
49-
<includes>
50-
<include>${artifactId}-${version}-sources.jar</include>
51-
</includes>
52-
</fileSet>
53-
</fileSets>
54-
</assembly>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
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, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<assembly>
18+
<id>bin</id>
19+
<formats>
20+
<format>tar.gz</format>
21+
<format>zip</format>
22+
</formats>
23+
<fileSets>
24+
<fileSet>
25+
<includes>
26+
<include>LICENSE.txt</include>
27+
<include>NOTICE.txt</include>
28+
<include>RELEASE-NOTES.txt</include>
29+
</includes>
30+
</fileSet>
31+
<fileSet>
32+
<directory>target</directory>
33+
<outputDirectory></outputDirectory>
34+
<includes>
35+
<include>${artifactId}-${version}.jar</include>
36+
</includes>
37+
</fileSet>
38+
<fileSet>
39+
<directory>target/site/apidocs</directory>
40+
<outputDirectory>apidocs</outputDirectory>
41+
<includes>
42+
<include>**/*</include>
43+
</includes>
44+
</fileSet>
45+
<!-- Include sources jar for IDEs -->
46+
<fileSet>
47+
<directory>target</directory>
48+
<outputDirectory></outputDirectory>
49+
<includes>
50+
<include>${artifactId}-${version}-sources.jar</include>
51+
</includes>
52+
</fileSet>
53+
</fileSets>
54+
</assembly>

src/main/assembly/src.xml renamed to src/assembly/src.xml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one or more
3-
contributor license agreements. See the NOTICE file distributed with
4-
this work for additional information regarding copyright ownership.
5-
The ASF licenses this file to You under the Apache License, Version 2.0
6-
(the "License"); you may not use this file except in compliance with
7-
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, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
16-
-->
17-
<assembly>
18-
<id>src</id>
19-
<formats>
20-
<format>tar.gz</format>
21-
<format>zip</format>
22-
</formats>
23-
<baseDirectory>${artifactId}-${version}-src</baseDirectory>
24-
<fileSets>
25-
<fileSet>
26-
<includes>
27-
<include>LICENSE*</include>
28-
<include>NOTICE*</include>
29-
<include>RELEASE-NOTES.txt</include>
30-
<include>pom.xml</include>
31-
<include>findbugs-exclude-filter.xml</include>
32-
<include>checkstyle*.xml</include>
33-
</includes>
34-
</fileSet>
35-
<fileSet>
36-
<directory>src</directory>
37-
<excludes>
38-
<exclude>**/*Benchmark.java</exclude>
39-
</excludes>
40-
</fileSet>
41-
</fileSets>
42-
</assembly>
43-
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
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, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<assembly>
18+
<id>src</id>
19+
<formats>
20+
<format>tar.gz</format>
21+
<format>zip</format>
22+
</formats>
23+
<baseDirectory>${artifactId}-${version}-src</baseDirectory>
24+
<fileSets>
25+
<fileSet>
26+
<includes>
27+
<include>LICENSE*</include>
28+
<include>NOTICE*</include>
29+
<include>RELEASE-NOTES.txt</include>
30+
<include>pom.xml</include>
31+
<include>findbugs-exclude-filter.xml</include>
32+
<include>checkstyle*.xml</include>
33+
</includes>
34+
</fileSet>
35+
<fileSet>
36+
<directory>src</directory>
37+
<excludes>
38+
<exclude>**/*Benchmark.java</exclude>
39+
</excludes>
40+
</fileSet>
41+
</fileSets>
42+
</assembly>
43+

0 commit comments

Comments
 (0)