Skip to content

Commit

Permalink
Local site generation with CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Hug committed Jul 10, 2011
1 parent e618ce5 commit 0370baa
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 25 deletions.
4 changes: 4 additions & 0 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<prerequisites>
<maven>3.0</maven>
</prerequisites>

<properties>
<project.parent.url>${project.artifactId}</project.parent.url>
</properties>

<dependencies>

Expand Down
11 changes: 0 additions & 11 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,34 +41,23 @@
<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-impl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-reference-guide</artifactId>
<version>${project.version}</version>
<type>war</type>
<optional>true</optional>
</dependency>

</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>com.ctp.cdi.query</groupId>
<groupId>${project.parent.groupId}</groupId>
<artifactId>cdi-query-reference-guide</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<packaging>jdocbook</packaging>
<name>CDI Query Reference Guide</name>

Expand Down
5 changes: 2 additions & 3 deletions impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

<properties>
<version.maven.compiler>2.3.1</version.maven.compiler>
<version.maven.site>3.0-beta-2</version.maven.site>
<version.maven.jxr>2.2</version.maven.jxr>
<version.maven.surefire>2.8.1</version.maven.surefire>
<version.maven.checkstyle>2.7-SNAPSHOT</version.maven.checkstyle>
Expand All @@ -31,6 +30,7 @@
<version.maven.cobertura>2.5</version.maven.cobertura>
<jdk.source>1.6</jdk.source>
<jdk.target>1.6</jdk.target>
<project.parent.url>${project.artifactId}</project.parent.url>
</properties>

<build>
Expand All @@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven.compiler}</version>
<configuration>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
Expand Down Expand Up @@ -149,7 +148,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>${version.maven.site}</version>
<configuration>
<reportPlugins>
<reportPlugins combine.children="append">
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
Expand Down
85 changes: 76 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,35 @@
<seam.version>3.0.0.Final</seam.version>
<emma.version>2.0.5312</emma.version>
<arquillian.version>1.0.0.Alpha5</arquillian.version>
<version.maven.site>3.0-beta-3</version.maven.site>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${version.maven.site}</version>
<configuration>
<reportPlugins combine.children="append">
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>

Expand All @@ -50,10 +77,31 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-api</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-impl</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.ctp.cdi.query</groupId>
<artifactId>cdi-query-impl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>

<dependency>
Expand All @@ -67,7 +115,7 @@
<artifactId>weld-core</artifactId>
<version>1.1.0.Final</version>
</dependency>

<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
Expand All @@ -82,56 +130,56 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-jbossas-managed-6</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-server-manager</artifactId>
<version>1.0.3.GA</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
<version>6.0.0.Final</version>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-embedded-3</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
Expand Down Expand Up @@ -267,6 +315,24 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>bamboo</id>
<distributionManagement>
<site>
<id>bamboo-local</id>
<url>file:///${bamboo.build.working.directory}/target/deployed-site</url>
</site>
</distributionManagement>
</profile>
<profile>
<id>jenkins</id>
<distributionManagement>
<site>
<id>local-jenkins</id>
<url>file:///${env.WORKSPACE}/target/deployed-site</url>
</site>
</distributionManagement>
</profile>
</profiles>

<developers>
Expand All @@ -289,5 +355,6 @@
<developerConnection>scm:git:[email protected]:ctpconsulting/query.git</developerConnection>
<url>http://github.com/ctpconsulting/query</url>
</scm>

</project>

0 comments on commit 0370baa

Please sign in to comment.