Author: pete.muir(a)jboss.org Date: 2009-10-11 18:23:56 -0400 (Sun, 11 Oct 2009) New Revision: 3937 Modified: api/trunk/bom/pom.xml api/trunk/parent/pom.xml Log: excludes, cleanup, force UTF-8 Modified: api/trunk/bom/pom.xml =================================================================== --- api/trunk/bom/pom.xml 2009-10-11 19:30:00 UTC (rev 3936) +++ api/trunk/bom/pom.xml 2009-10-11 22:23:56 UTC (rev 3937) @@ -167,6 +167,18 @@ <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <version>${ejb.api.version}</version> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jbossws</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-jaxrpc</artifactId> + <groupId>jboss.jbossws</groupId> + </exclusion> </dependency> <!-- TODO replace with javax.interceptor:interceptor-api:3.1 once the JCP/Sun publish this --> Modified: api/trunk/parent/pom.xml =================================================================== --- api/trunk/parent/pom.xml 2009-10-11 19:30:00 UTC (rev 3936) +++ api/trunk/parent/pom.xml 2009-10-11 22:23:56 UTC (rev 3937) @@ -18,7 +18,7 @@ <url>http://www.seamframework.org/Weld</url> <description> - The reference implementation of JSR 299: Weld + APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE </description> <ciManagement> @@ -69,6 +69,11 @@ <name>Nicklas Karlsson</name> </developer> </developers> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> <!-- Configure non-API dependencies (e.g. testing)--> <dependencyManagement> @@ -292,37 +297,4 @@ </pluginManagement> </build> - <!-- The release profile --> - <profiles> - <profile> - <id>release</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> - - <!-- Configure the SCM connection --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/parent... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/... - <url>http://fisheye.jboss.org/browse/Weld/ri</url> - </scm> - </project>