Skip to content

Commit

Permalink
Merge pull request #666 from ArcBees/mmc_1.4
Browse files Browse the repository at this point in the history
Released 1.4
  • Loading branch information
meriouma committed Jan 21, 2015
2 parents bc6088b + e5b17c7 commit 1c8f8a5
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-all</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-clients-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-clients-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-crawler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-crawler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-common-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-common-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-common-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-common-shared</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions gwtp-core/gwtp-dispatch-rest-shared/pom.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rest-shared</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-server-guice</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-server-spring</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-shared</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-dispatch-rpc-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-dispatch-rpc-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-mvp-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-mvp-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-mvp-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-mvp-shared</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-processors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-processors</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/gwtp-tester/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-tester</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gwtp-crawler-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.gwtplatform</groupId>
<artifactId>gwtp</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>

<artifactId>gwtp-crawler-service</artifactId>
Expand Down
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<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>
Expand All @@ -10,7 +9,7 @@

<groupId>com.gwtplatform</groupId>
<artifactId>gwtp</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GWT-Platform</name>
<inceptionYear>2010</inceptionYear>
Expand Down Expand Up @@ -242,6 +241,7 @@
<maven-site-plugin.version>3.4</maven-site-plugin.version>
<jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
<versions-maven-plugin.version>2.1</versions-maven-plugin.version>
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>

<!-- Client -->
<gwt.version>2.7.0</gwt.version>
Expand Down Expand Up @@ -276,6 +276,8 @@
<gpg.passphrase>SetAsParam</gpg.passphrase>
<github.username>SetAsParam</github.username>
<github.password>SetAsParam</github.password>

<release.fast>-Dcheckstyle.skip -DskipTests -Dmaven.test.skip</release.fast>
</properties>

<build>
Expand Down Expand Up @@ -437,12 +439,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<arguments>-Psonatype-oss-release -Prelease -Dgpg.passphrase=${gpg.passphrase} -Dcheckstyle.skip
-DskipTests
<arguments>
-Psonatype-oss-release -Prelease -Dgpg.passphrase=${gpg.passphrase} ${release.fast}
</arguments>
</configuration>
</plugin>
Expand Down

0 comments on commit 1c8f8a5

Please sign in to comment.