Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/3.1.0.Beta1' into develop
- Loading branch information
Showing
5 changed files
with
145 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,141 +1,141 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-parent</artifactId> | ||
| <version>3.1.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>seam-reports-distribution</artifactId> | ||
| <name>Seam Reports Distribution</name> | ||
| <description>Builds a Seam reports release distribution</description> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <properties> | ||
| <maven.deploy.skip>true</maven.deploy.skip> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <!-- API --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Jasper --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Pentaho --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- XDocReport --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Reference guide --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-reference-guide</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>war</type> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <finalName>seam-reports</finalName> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <repositories> | ||
| <repository> | ||
| <id>pentaho</id> | ||
| <name>Pentaho Public Repository</name> | ||
| <url>http://repo.pentaho.org/artifactory/pentaho/</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-parent</artifactId> | ||
| <version>3.1.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>seam-reports-distribution</artifactId> | ||
| <name>Seam Reports Distribution</name> | ||
| <description>Builds a Seam reports release distribution</description> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <properties> | ||
| <maven.deploy.skip>true</maven.deploy.skip> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <!-- API --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-api</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Jasper --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-jasper</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Pentaho --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-pentaho</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- XDocReport --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>sources</classifier> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-xdocreport</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>javadoc</classifier> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| <!-- Reference guide --> | ||
| <dependency> | ||
| <groupId>org.jboss.seam.reports</groupId> | ||
| <artifactId>seam-reports-reference-guide</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>war</type> | ||
| <optional>true</optional> | ||
| </dependency> | ||
|
|
||
| </dependencies> | ||
|
|
||
| <build> | ||
| <finalName>seam-reports</finalName> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <repositories> | ||
| <repository> | ||
| <id>pentaho</id> | ||
| <name>Pentaho Public Repository</name> | ||
| <url>http://repo.pentaho.org/artifactory/pentaho/</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters