Skip to content

Commit

Permalink
* Fixed the warnings for Maven-3.0.3
Browse files Browse the repository at this point in the history 
* Added the common-deploy.properties for the filter of web.xml file.
* Upgraded errai to 1.2.2.Final to try to fix the 'Reflection-Error' issue in windows.
  • Loading branch information
@jeffyu
jeffyu committed Jun 16, 2011
1 parent 58beeaa commit 61ed7a3
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -4,3 +4,4 @@ target
.classpath
.project
.settings
.DS_Store
18 changes: 11 additions & 7 deletions gui/war/pom.xml
View file
Expand Up @@ -89,6 +89,7 @@
<groupId>org.jboss.bpm</groupId>
<artifactId>activity-monitor-ui-lib</artifactId>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -129,13 +130,13 @@
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-rpc</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-rpc</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -392,7 +393,7 @@
<configuration>
<tasks>
<ant antfile="scripts/antrun-version.xml" inheritAll="false" inheritRefs="false">
<property name="version" value="${version}" />
<property name="version" value="${project.version}" />
<property name="src.dir" value="${project.build.directory}/generated-sources/antrun" />
</ant>
</tasks>
Expand Down Expand Up @@ -429,7 +430,7 @@
<configuration>
<artifactItems>
<artifactItem>
<version>${version}</version>
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**/*</includes>
Expand Down Expand Up @@ -502,7 +503,7 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-profile-jbpm</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -524,6 +525,7 @@
<outputDirectory>${jbpm.war.output}</outputDirectory>
<filters>
<filter>${project.basedir}/src/main/properties/jbpm.properties</filter>
<filter>${project.basedir}/src/main/properties/common-deploy.properties</filter>
</filters>
</configuration>
</execution>
Expand Down Expand Up @@ -626,7 +628,7 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-profile-drools</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -648,6 +650,7 @@
<outputDirectory>${drools.war.output}</outputDirectory>
<filters>
<filter>${project.basedir}/src/main/properties/drools.properties</filter>
<filter>${project.basedir}/src/main/properties/common-deploy.properties</filter>
</filters>
</configuration>
</execution>
Expand Down Expand Up @@ -747,7 +750,7 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-profile-riftsaw</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -769,6 +772,7 @@
<outputDirectory>${riftsaw.war.output}</outputDirectory>
<filters>
<filter>${project.basedir}/src/main/properties/riftsaw.properties</filter>
<filter>${project.basedir}/src/main/properties/common-deploy.properties</filter>
</filters>
</configuration>
</execution>
Expand Down
18 changes: 16 additions & 2 deletions pom.xml
View file
Expand Up @@ -35,6 +35,16 @@
</roles>
<timezone>+1</timezone>
</developer>
<developer>
<name>Jeff Yu</name>
<id>jeff.yuchang</id>
<email>cyu@redhat.com</email>
<organization>Red Hat</organization>
<roles>
<role>Developer</role>
</roles>
<timezone>+10</timezone>
</developer>
</developers>

<!-- IssueManagement -->
Expand Down Expand Up @@ -73,12 +83,12 @@
<stax-api.version>1.0-2</stax-api.version>
<report.server.version>1.3.0</report.server.version>

<errai.version>1.1-Final</errai.version>
<errai.version>1.2.2.Final</errai.version>
<mvel.version>2.0.18-RC4</mvel.version>
<guice.version>2.0</guice.version>
<slf4j.version>1.5.2</slf4j.version>

<activity.monitor.version>1.0.0.CR1</activity.monitor.version>
<activity.monitor.version>1.0.0-SNAPSHOT</activity.monitor.version>
</properties>

<modules>
Expand Down Expand Up @@ -299,6 +309,7 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -346,6 +357,7 @@

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version>
<configuration>
<skipTests>true</skipTests>
<failIfNoTests>false</failIfNoTests>
Expand Down Expand Up @@ -422,6 +434,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.7.2</version>
</plugin>
</plugins>
</reporting>
Expand All @@ -435,6 +448,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version>
<configuration>
<skipTests>false</skipTests>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion server/integration/pom.xml
View file
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-rpc</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion server/war/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>gwt-console-server-integration</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit 61ed7a3

Please sign in to comment.