Skip to content

Commit

Permalink
Merge branch 'release/3.1.0.Beta1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@jharting
jharting committed Aug 25, 2011
2 parents fafb14b + 62cbef5 commit b3fda27
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 27 deletions.
4 changes: 2 additions & 2 deletions api/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<parent>
<artifactId>seam-rest-parent</artifactId>
<groupId>org.jboss.seam.rest</groupId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>seam-rest-api</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>

<packaging>jar</packaging>
<name>Seam REST Module API</name>
Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 2 additions & 0 deletions dist/src/main/assembly/assembly.xml
View file
@@ -1,6 +1,8 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

<id>distribution</id>

<formats>
<format>zip</format>
</formats>
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/pom.xml 100755 → 100644
View file
Expand Up @@ -4,15 +4,15 @@

<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-reference-guide</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Seam REST Reference Guide</name>
<url>http://seamframework.org/Seam3/RESTModule</url>

<parent>
<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/main/docbook/en-US/version_info.xml
View file
@@ -1 +1 @@
<releaseinfo>3.0.1-SNAPSHOT</releaseinfo>
<releaseinfo>3.1.0.Beta1</releaseinfo>
4 changes: 2 additions & 2 deletions examples/client/pom.xml
View file
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-example-client</artifactId>
<packaging>war</packaging>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Seam REST Client Example</name>
<url>http://seamframework.org/Seam3/RESTModule</url>

Expand Down
6 changes: 3 additions & 3 deletions examples/client/src/main/assembly/assembly.xml
View file
@@ -1,6 +1,6 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>distribution</id>
<formats>
<format>zip</format>
</formats>
Expand Down
7 changes: 3 additions & 4 deletions examples/exceptions/pom.xml
View file
@@ -1,19 +1,18 @@
<?xml version="1.0"?>
<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">
<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.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-example-exceptions</artifactId>
<packaging>war</packaging>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Seam REST Exceptions Example</name>
<url>http://seamframework.org/Seam3/RESTModule</url>

Expand Down
6 changes: 3 additions & 3 deletions examples/exceptions/src/main/assembly/assembly.xml
View file
@@ -1,6 +1,6 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>distribution</id>
<formats>
<format>zip</format>
</formats>
Expand Down
7 changes: 3 additions & 4 deletions examples/tasks/pom.xml
View file
@@ -1,19 +1,18 @@
<?xml version="1.0"?>
<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">
<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.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-example-tasks</artifactId>
<packaging>war</packaging>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Seam REST Tasks Example</name>
<url>http://seamframework.org/Seam3/RESTModule</url>

Expand Down
1 change: 1 addition & 0 deletions examples/tasks/src/main/assembly/assembly.xml
View file
@@ -1,6 +1,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>distribution</id>
<formats>
<format>zip</format>
</formats>
Expand Down
8 changes: 4 additions & 4 deletions impl/pom.xml
View file
@@ -1,16 +1,15 @@
<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">
<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>
<artifactId>seam-rest-parent</artifactId>
<groupId>org.jboss.seam.rest</groupId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>seam-rest</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>

<packaging>jar</packaging>
<name>Seam REST Module Implementation</name>
Expand Down Expand Up @@ -86,6 +85,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -11,7 +11,7 @@
<groupId>org.jboss.seam.rest</groupId>
<artifactId>seam-rest-parent</artifactId>
<name>Seam REST Parent</name>
<version>3.0.1-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down

0 comments on commit b3fda27

Please sign in to comment.