Skip to content

Commit 64f6ebe

Browse files
kwinkwin
committed
[MSITE-911] Add goal to archive and install/deploy site resources along
with the project Consider those site-resource archives when setting up the site context
1 parent 8e9f3ea commit 64f6ebe

14 files changed

Lines changed: 845 additions & 0 deletions

File tree

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,12 @@ under the License.
547547
</plugin>
548548
</plugins>
549549
</pluginManagement>
550+
<plugins>
551+
<plugin>
552+
<groupId>org.eclipse.sisu</groupId>
553+
<artifactId>sisu-maven-plugin</artifactId>
554+
</plugin>
555+
</plugins>
550556
</build>
551557

552558
<profiles>

‎src/it/projects/site-attach-resources/child/pom.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<modelVersion>4.0.0</modelVersion>
26+
27+
<parent>
28+
<groupId>org.apache.maven.plugins.site.its</groupId>
29+
<artifactId>site-attach-resources</artifactId>
30+
<version>1.0-SNAPSHOT</version>
31+
</parent>
32+
33+
<artifactId>jar-site-attach-resources</artifactId>
34+
<packaging>jar</packaging>
35+
36+
<name>site-attach-resources IT for jar</name>
37+
<description>the site resources should not be attached: only when packaging = pom, see https://issues.apache.org/jira/browse/MSITE-597</description>
38+
</project>

‎src/it/projects/site-attach-resources/child/src/site/site.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
24+
name="${project.name}">
25+
<skin>
26+
<groupId>org.apache.maven.skins</groupId>
27+
<artifactId>maven-fluido-skin</artifactId>
28+
<version>${fluidoSkinVersion}</version>
29+
</skin>
30+
</site>

‎src/it/projects/site-attach-resources/child/src/site/xdoc/index.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<document>
23+
<body>
24+
<section name="Overview">
25+
<p>MSITE-265.</p>
26+
</section>
27+
</body>
28+
</document>

‎src/it/projects/site-attach-resources/invoker.properties‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
invoker.goals=clean deploy

‎src/it/projects/site-attach-resources/no-site-resources/pom.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<modelVersion>4.0.0</modelVersion>
26+
27+
<parent>
28+
<groupId>org.apache.maven.plugins.site.its</groupId>
29+
<artifactId>site-attach-resources</artifactId>
30+
<version>1.0-SNAPSHOT</version>
31+
</parent>
32+
33+
<artifactId>no-site-resources-attach-descriptor</artifactId>
34+
<packaging>pom</packaging>
35+
36+
<name>site-attach-resources IT for no source/site directory</name>
37+
<description>No site descriptor to attach: must not fail, just explain.</description>
38+
</project>

‎src/it/projects/site-attach-resources/pom.xml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
25+
<modelVersion>4.0.0</modelVersion>
26+
27+
<groupId>org.apache.maven.plugins.site.its</groupId>
28+
<artifactId>site-attach-resources</artifactId>
29+
<version>1.0-SNAPSHOT</version>
30+
<packaging>pom</packaging>
31+
32+
<name>site-attach-resources IT</name>
33+
34+
<modules>
35+
<module>child</module>
36+
<module>no-site-resources</module>
37+
</modules>
38+
39+
<properties>
40+
<currentVersion>@mavenVersion@</currentVersion>
41+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42+
<fluidoSkinVersion>@fluidoSkinVersion@</fluidoSkinVersion>
43+
</properties>
44+
45+
<distributionManagement>
46+
<snapshotRepository>
47+
<uniqueVersion>false</uniqueVersion>
48+
<id>site-deploy</id>
49+
<name>Example company web server</name>
50+
<url>file://@project.build.directory@/it/site-attach-resources/target/snapshot-repo/</url>
51+
</snapshotRepository>
52+
</distributionManagement>
53+
54+
<build>
55+
<pluginManagement>
56+
<plugins>
57+
<plugin>
58+
<artifactId>maven-site-plugin</artifactId>
59+
<version>@project.version@</version>
60+
</plugin>
61+
<plugin>
62+
<artifactId>maven-deploy-plugin</artifactId>
63+
<version>3.1.3</version>
64+
</plugin>
65+
</plugins>
66+
</pluginManagement>
67+
<plugins>
68+
<plugin>
69+
<artifactId>maven-site-plugin</artifactId>
70+
<version>@project.version@</version>
71+
<configuration>
72+
<locales>default,en,sv</locales>
73+
</configuration>
74+
<executions>
75+
<execution>
76+
<id>attach-resources</id>
77+
<goals>
78+
<goal>attach-resources</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
86+
<reporting>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-project-info-reports-plugin</artifactId>
91+
<version>@projectInfoReportsPluginVersion@</version>
92+
<reportSets>
93+
<reportSet>
94+
<reports>
95+
<report>index</report>
96+
</reports>
97+
</reportSet>
98+
</reportSets>
99+
</plugin>
100+
</plugins>
101+
</reporting>
102+
</project>

‎src/it/projects/site-attach-resources/src/site/site.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
24+
name="${project.name}">
25+
<publishDate format="dd MMM yyyy HH:mm"/>
26+
<version position="left"/>
27+
<skin>
28+
<groupId>org.apache.maven.skins</groupId>
29+
<artifactId>maven-fluido-skin</artifactId>
30+
<version>${fluidoSkinVersion}</version>
31+
</skin>
32+
<body>
33+
<breadcrumbs>
34+
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
35+
</breadcrumbs>
36+
<menu name="Releases TODO">
37+
<item name="release1.6" href="releases/release1.6.html"/>
38+
<item name="release1.6.3" href="releases/release1.6.3.html"/>
39+
</menu>
40+
<menu ref="parent"/>
41+
<menu ref="reports"/>
42+
<menu ref="modules"/>
43+
</body>
44+
</site>

‎src/it/projects/site-attach-resources/src/site/site_sv.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
24+
name="${project.name}">
25+
<publishDate format="dd MMM yyyy HH:mm"/>
26+
<version position="left"/>
27+
<skin>
28+
<groupId>org.apache.maven.skins</groupId>
29+
<artifactId>maven-fluido-skin</artifactId>
30+
<version>${fluidoSkinVersion}</version>
31+
</skin>
32+
<body>
33+
<breadcrumbs>
34+
<item name="Maven" href="http://maven.apache.org/${currentVersion}"/>
35+
</breadcrumbs>
36+
<menu name="Releaser att göra">
37+
<item name="release1.6" href="releases/release1.6.html"/>
38+
<item name="release1.6.3" href="releases/release1.6.3.html"/>
39+
</menu>
40+
<menu ref="parent"/>
41+
<menu ref="reports"/>
42+
<menu ref="modules"/>
43+
</body>
44+
</site>

‎src/it/projects/site-attach-resources/src/site/xdoc/index.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<document>
23+
<body>
24+
<section name="Overview">
25+
<p>MSITE-265.</p>
26+
</section>
27+
</body>
28+
</document>

0 commit comments

Comments
 (0)