Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jclouds/jclouds 

* 'master' of github.com:jclouds/jclouds:
  [issue 531] Fixed some broken module site links with <site> overrides and switched to the latest maven-site-plugin
  [issue 531] Archetypes now inherit from jclouds-project, which fixes the site structure
This commit is contained in:
Adrian Cole 2011-05-06 00:37:18 -07:00
parent a925d704f4 1cde0e54be
commit c8869ef964
3 changed files with 81 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
archetypes/compute-service-archetype/pom.xml
View File

@ -22,37 +22,38 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-archetypes</artifactId> <artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> <relativePath>../../project/pom.xml</relativePath>
<artifactId>jclouds-compute-service-archetype</artifactId> </parent>
<name>jclouds Compute service archetype</name> <artifactId>jclouds-compute-service-archetype</artifactId>
<description>Maven archetype for a provider of a Compute service</description> <name>jclouds Compute service archetype</name>
<packaging>maven-archetype</packaging> <description>Maven archetype for a provider of a Compute service</description>
<packaging>maven-archetype</packaging>
<build>
<plugins> <build>
<plugin> <plugins>
<artifactId>maven-archetype-plugin</artifactId> <plugin>
<version>2.0-alpha-4</version> <artifactId>maven-archetype-plugin</artifactId>
<extensions>true</extensions> <version>2.0-alpha-4</version>
</plugin> <extensions>true</extensions>
<plugin> </plugin>
<artifactId>maven-resources-plugin</artifactId> <plugin>
<configuration> <artifactId>maven-resources-plugin</artifactId>
<encoding>UTF-8</encoding> <configuration>
</configuration> <encoding>UTF-8</encoding>
</plugin> </configuration>
</plugins> </plugin>
<extensions> </plugins>
<extension> <extensions>
<groupId>org.apache.maven.archetype</groupId> <extension>
<artifactId>archetype-packaging</artifactId> <groupId>org.apache.maven.archetype</groupId>
<version>2.0-alpha-4</version> <artifactId>archetype-packaging</artifactId>
</extension> <version>2.0-alpha-4</version>
</extensions> </extension>
</build> </extensions>
</build>
</project> </project>

65
archetypes/rest-client-archetype/pom.xml
View File

@ -22,37 +22,38 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-archetypes</artifactId> <artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> <relativePath>../../project/pom.xml</relativePath>
<artifactId>jclouds-rest-client-archetype</artifactId> </parent>
<name>jclouds rest client archetype</name> <artifactId>jclouds-rest-client-archetype</artifactId>
<description>Maven archetype for a provider of a rest-speaking service</description> <name>jclouds rest client archetype</name>
<packaging>maven-archetype</packaging> <description>Maven archetype for a provider of a rest-speaking service</description>
<packaging>maven-archetype</packaging>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-archetype-plugin</artifactId> <artifactId>maven-archetype-plugin</artifactId>
<version>2.0-alpha-4</version> <version>2.0-alpha-4</version>
<extensions>true</extensions> <extensions>true</extensions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<extensions> <extensions>
<extension> <extension>
<groupId>org.apache.maven.archetype</groupId> <groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId> <artifactId>archetype-packaging</artifactId>
<version>2.0-alpha-4</version> <version>2.0-alpha-4</version>
</extension> </extension>
</extensions> </extensions>
</build> </build>
</project> </project>

18
project/pom.xml
View File

@ -101,7 +101,7 @@
</snapshotRepository> </snapshotRepository>
<site> <site>
<id>jclouds-googlecode-site</id> <id>jclouds-googlecode-site</id>
<url>dav+https://jclouds.googlecode.com/svn/maven-sites/${project.version}</url> <url>${maven.site.url.base}/${project.version}</url>
</site> </site>
</distributionManagement> </distributionManagement>
@ -179,6 +179,7 @@
<maven.compile.target>1.6</maven.compile.target> <maven.compile.target>1.6</maven.compile.target>
<maven.compile.optimize>true</maven.compile.optimize> <maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation> <maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>davs://jclouds.googlecode.com/svn/maven-sites</maven.site.url.base>
<http.proxyHost /> <http.proxyHost />
<http.proxyPort /> <http.proxyPort />
<jclouds.blobstore.httpstream.url>http://mirror.cloudera.com/apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2</jclouds.blobstore.httpstream.url> <jclouds.blobstore.httpstream.url>http://mirror.cloudera.com/apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2</jclouds.blobstore.httpstream.url>
@ -731,7 +732,7 @@ pageTracker._trackPageview();
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version> <version>2.7</version>
<configuration> <configuration>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
@ -789,7 +790,7 @@ pageTracker._trackPageview();
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.0-beta-3</version> <version>3.0-beta-4-SNAPSHOT</version>
<configuration> <configuration>
<reportPlugins> <reportPlugins>
<plugin> <plugin>
@ -814,6 +815,7 @@ pageTracker._trackPageview();
<configuration> <configuration>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
<additionalJOption>-J-Xmx256m</additionalJOption>
</configuration> </configuration>
<reportSets> <reportSets>
<reportSet> <reportSet>
@ -874,7 +876,15 @@ pageTracker._trackPageview();
<!-- only in the jclouds-project module --> <!-- only in the jclouds-project module -->
<exists>src/etc/header.txt</exists> <exists>src/etc/header.txt</exists>
</file> </file>
</activation> </activation>
<!-- Maven generates incorrect links without the <site> declaration here -->
<distributionManagement>
<site>
<id>jclouds-googlecode-site</id>
<url>${maven.site.url.base}/${project.version}/${project.artifactId}</url>
</site>
</distributionManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>