Remove all traces of the old web site. The site for Apache Resource Bundles is now a part of the main Maven site.
git-svn-id: https://svn.apache.org/repos/asf/maven/resources/trunk@1585610 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/apache-incubator-disclaimer-resource-bundle/pom.xml b/apache-incubator-disclaimer-resource-bundle/pom.xml
index 088ed04..f69539c 100644
--- a/apache-incubator-disclaimer-resource-bundle/pom.xml
+++ b/apache-incubator-disclaimer-resource-bundle/pom.xml
@@ -37,18 +37,6 @@
An archive which contains the standard Apache Incubator disclaimer.
</description>
- <url>${siteUrl}</url>
- <properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-incubator-disclaimer-resource-bundle</siteDeployUrl>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-incubator-disclaimer-resource-bundle</siteUrl>
- </properties>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/resources/trunk/apache-incubator-disclaimer-resource-bundle</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/trunk/apache-incubator-disclaimer-resource-bundle</developerConnection>
diff --git a/apache-jar-resource-bundle/pom.xml b/apache-jar-resource-bundle/pom.xml
index b01939e..ac8d751 100644
--- a/apache-jar-resource-bundle/pom.xml
+++ b/apache-jar-resource-bundle/pom.xml
@@ -43,16 +43,4 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/resources/trunk/apache-jar-resource-bundle</url>
</scm>
- <url>${siteUrl}</url>
- <properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-jar-resource-bundle</siteDeployUrl>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-jar-resource-bundle</siteUrl>
- </properties>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
</project>
diff --git a/apache-jar-txt-resource-bundle/pom.xml b/apache-jar-txt-resource-bundle/pom.xml
index 7598301..fcacc8d 100644
--- a/apache-jar-txt-resource-bundle/pom.xml
+++ b/apache-jar-txt-resource-bundle/pom.xml
@@ -44,16 +44,4 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/resources/trunk/apache-jar-txt-resource-bundle</url>
</scm>
- <url>${siteUrl}</url>
- <properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-jar-txt-resource-bundle</siteDeployUrl>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-jar-txt-resource-bundle</siteUrl>
- </properties>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
</project>
diff --git a/apache-license-header-resource-bundle/pom.xml b/apache-license-header-resource-bundle/pom.xml
index 4ec1c6f..6c97876 100644
--- a/apache-license-header-resource-bundle/pom.xml
+++ b/apache-license-header-resource-bundle/pom.xml
@@ -43,16 +43,4 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/resources/trunk/apache-license-header-resource-bundle</url>
</scm>
- <url>${siteUrl}</url>
- <properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-license-header-resource-bundle</siteDeployUrl>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-license-header-resource-bundle</siteUrl>
- </properties>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
</project>
diff --git a/apache-resource-bundles/pom.xml b/apache-resource-bundles/pom.xml
index c5eabeb..3ffeab4 100644
--- a/apache-resource-bundles/pom.xml
+++ b/apache-resource-bundles/pom.xml
@@ -37,30 +37,23 @@
<name>Apache Resource Bundles</name>
<inceptionYear>2006</inceptionYear>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/resources/trunk/apache-resource-bundles</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/trunk/apache-resource-bundles</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/resources/trunk/apache-resource-bundles</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/MASFRES</url>
+ </issueManagement>
+
<ciManagement>
<url>https://builds.apache.org/job/maven-project-resources/</url>
<system>Jenkins</system>
</ciManagement>
- <url>${siteUrl}</url>
- <properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-resource-bundles</siteDeployUrl>
- <siteDeployId>apache.website</siteDeployId>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-resource-bundles</siteUrl>
- </properties>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
+ <!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
<build>
<pluginManagement>
diff --git a/apache-source-release-assembly-descriptor/pom.xml b/apache-source-release-assembly-descriptor/pom.xml
index c08239b..e20052c 100644
--- a/apache-source-release-assembly-descriptor/pom.xml
+++ b/apache-source-release-assembly-descriptor/pom.xml
@@ -44,19 +44,9 @@
<url>http://svn.apache.org/viewcvs.cgi/maven/resources/trunk/apache-source-release-assembly-descriptor</url>
</scm>
- <url>${siteUrl}</url>
- <distributionManagement>
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
<!-- NOTE: Configuration below this line is for integration tests. -->
<properties>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles/apache-source-release-assembly-descriptor</siteDeployUrl>
- <siteUrl>http://maven.apache.org/apache-resource-bundles/apache-source-release-assembly-descriptor</siteUrl>
<!-- The original Maven distribution to test. -->
<mavenHome>${maven.home}</mavenHome>
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
diff --git a/pom.xml b/pom.xml
index 6a4bc73..28567ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,27 +31,10 @@
<artifactId>apache-resource-bundles-aggregator</artifactId>
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
- <url>${siteUrl}</url>
- <name>Apache Maven Resource Bundles</name>
+ <name>Apache Resource Bundles Aggregator</name>
<inceptionYear>2012</inceptionYear>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/MASFRES</url>
- </issueManagement>
-
- <properties>
- <apache-jar-resource-bundle-version>1.5-SNAPSHOT</apache-jar-resource-bundle-version>
- <apache-jar-txt-resource-bundle-version>1.5-SNAPSHOT</apache-jar-txt-resource-bundle-version>
- <apache-incubator-disclaimer-resource-bundle-version>1.2-SNAPSHOT</apache-incubator-disclaimer-resource-bundle-version>
- <apache-source-release-assembly-descriptor-version>1.0.5-SNAPSHOT</apache-source-release-assembly-descriptor-version>
- <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/apache-resource-bundles</siteDeployUrl>
- <siteDeployId>apache.website</siteDeployId>
- <siteUrl>http://maven.apache.org/apache-resource-bundles</siteUrl>
- </properties>
-
-
<modules>
<module>apache-resource-bundles</module>
<module>apache-jar-resource-bundle</module>
@@ -62,14 +45,6 @@
<module>resources-bundles-sample</module>
</modules>
- <distributionManagement>
- <!-- @todo Convert to svnpubsub for site deployment -->
- <site>
- <id>${siteDeployId}</id>
- <url>${siteDeployUrl}</url>
- </site>
- </distributionManagement>
-
<build>
<plugins>
<plugin>
diff --git a/resources-bundles-sample/pom.xml b/resources-bundles-sample/pom.xml
index 8b4a12e..a118faf 100644
--- a/resources-bundles-sample/pom.xml
+++ b/resources-bundles-sample/pom.xml
@@ -33,9 +33,12 @@
<version>1.0-SNAPSHOT</version>
<name>resources-bundles-sample</name>
- <url>http://maven.apache.org</url>
<properties>
+ <apache-jar-resource-bundle-version>1.5-SNAPSHOT</apache-jar-resource-bundle-version>
+ <apache-jar-txt-resource-bundle-version>1.5-SNAPSHOT</apache-jar-txt-resource-bundle-version>
+ <apache-incubator-disclaimer-resource-bundle-version>1.2-SNAPSHOT</apache-incubator-disclaimer-resource-bundle-version>
+ <apache-source-release-assembly-descriptor-version>1.0.5-SNAPSHOT</apache-source-release-assembly-descriptor-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index 14f3ba8..0000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
- name="Apache Maven Resource Bundles">
-
- <version position="none"/>
-
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maventxt_logo_200.gif</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.2.1</version>
- </skin>
-
- <custom>
- <fluidoSkin>
- <topBarEnabled>true</topBarEnabled>
- <sideBarEnabled>false</sideBarEnabled>
- </fluidoSkin>
- </custom>
-
-</project>
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
deleted file mode 100644
index 0703965..0000000
--- a/src/site/xdoc/index.xml.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ 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.
- -->
-<document>
- <properties>
- <title>Introduction</title>
- <author>Olivier Lamy</author>
- </properties>
-
- <body>
- <section name="Apache Maven Resource Bundles">
- <p>This project is a set of resources to help you building Java resources compliant with Apache rules.</p>
-
- <section name="JAR Resource Bundle and Incubator Disclaimer Resource Bundle">
- <p>
- To generate in your jar:
- <ul>
- <li><code>META-INF/DEPENDENCIES</code></li>
- <li><code>META-INF/LICENSE</code></li>
- <li><code>META-INF/NOTICE</code></li>
- <li><code>META-INF/DISCLAIMER</code></li>
- </ul>
- <source><![CDATA[ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE -->
- <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:${apache-jar-resource-bundle-version}</resourceBundle>
- <!-- Will generate META-INF/DEPENDENCIES.txt META-INF/LICENSE.txt META-INF/NOTICE.txt -->
- <resourceBundle>org.apache.apache.resources:apache-jar-txt-resource-bundle:${apache-jar-txt-resource-bundle-version}</resourceBundle>
- <!-- Will generate META-INF/DISCLAIMER -->
- <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:${apache-incubator-disclaimer-resource-bundle-version}</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>]]></source>
- </p>
- </section>
-
- <section name="Source Release Assembly Descriptor">
- <p>Create a source-release artifact that contains the fully buildable project directory source structure.
- This is the artifact which is the official subject of any release vote.
- <source><![CDATA[ <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>${apache-source-release-assembly-descriptor-version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <!--
- use this flag to generate source release assembly from the top of a multi modules
- maven project.
-
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- -->
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>]]></source>
- </p>
- </section>
- </section>
- </body>
-</document>
\ No newline at end of file
