[jboss-remoting-commits] JBoss Remoting SVN: r5916 - in remoting3/trunk: jboss-remoting and 2 other directories.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Thu Jul 8 17:47:20 EDT 2010
Author: david.lloyd at jboss.com
Date: 2010-07-08 17:47:19 -0400 (Thu, 08 Jul 2010)
New Revision: 5916
Modified:
remoting3/trunk/jboss-remoting/pom.xml
remoting3/trunk/pom.xml
remoting3/trunk/samples/pom.xml
remoting3/trunk/taglet/pom.xml
Log:
Fix the poms so that deployment works again. The aggregator is not a parent.
Modified: remoting3/trunk/jboss-remoting/pom.xml
===================================================================
--- remoting3/trunk/jboss-remoting/pom.xml 2010-07-08 21:17:02 UTC (rev 5915)
+++ remoting3/trunk/jboss-remoting/pom.xml 2010-07-08 21:47:19 UTC (rev 5916)
@@ -29,40 +29,61 @@
<name>JBoss Remoting 3</name>
<description>JBoss Remoting 3</description>
- <parent>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting-parent</artifactId>
- <version>3.1.0.Beta3-SNAPSHOT</version>
- </parent>
-
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <xnio.version>2.1.0.CR2</xnio.version>
+ <jbmar.version>1.3.0.CR3</jbmar.version>
+ </properties>
+
+ <groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
+ <version>3.1.0.Beta3-SNAPSHOT</version>
+
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
+ <version>${xnio.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
+ <version>${xnio.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling</artifactId>
+ <version>${jbmar.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-river</artifactId>
+ <version>${jbmar.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <version>5.8</version>
<classifier>jdk15</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
+ <version>1.1.1.GA</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -102,7 +123,7 @@
<configuration>
<bytecodeInjections>
<bytecodeInjection>
- <expression>${version}</expression>
+ <expression>${project.version}</expression>
<targetMembers>
<methodBodyReturn>
<className>org.jboss.remoting3.Version</className>
@@ -142,7 +163,7 @@
<tagletArtifact>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting-taglet</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</tagletArtifact>
<doclet>net.gleamynode.apiviz.APIviz</doclet>
<docletArtifact>
@@ -150,9 +171,9 @@
<artifactId>apiviz</artifactId>
<version>1.3.0.GA</version>
</docletArtifact>
- <doctitle><![CDATA[JBoss Remoting ]]>${version}</doctitle>
- <header><![CDATA[JBoss Remoting ]]>${version}</header>
- <footer><![CDATA[JBoss Remoting ]]>${version}</footer>
+ <doctitle><![CDATA[JBoss Remoting ]]>${project.version}</doctitle>
+ <header><![CDATA[JBoss Remoting ]]>${project.version}</header>
+ <footer><![CDATA[JBoss Remoting ]]>${project.version}</footer>
<bottom><![CDATA[<i>Copyright © 2010 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
@@ -161,11 +182,20 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <skip>false</skip>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
+
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven2 Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </distributionManagement>
</project>
Modified: remoting3/trunk/pom.xml
===================================================================
--- remoting3/trunk/pom.xml 2010-07-08 21:17:02 UTC (rev 5915)
+++ remoting3/trunk/pom.xml 2010-07-08 21:47:19 UTC (rev 5916)
@@ -26,92 +26,29 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Remoting 3 Parent</name>
- <description>JBoss Remoting 3 Parent POM</description>
+ <name>JBoss Remoting 3 Aggregator</name>
+ <description>JBoss Remoting 3 Aggregator POM</description>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5-beta-5</version>
- </parent>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xnio.version>2.1.0.CR2</xnio.version>
- <jbmar.version>1.3.0.CR3</jbmar.version>
</properties>
<groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting-parent</artifactId>
- <packaging>pom</packaging>
+ <artifactId>jboss-remoting-aggregator</artifactId>
<version>3.1.0.Beta3-SNAPSHOT</version>
-
+
+ <packaging>pom</packaging>
+
<modules>
<module>taglet</module>
<module>jboss-remoting</module>
<module>samples</module>
</modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- <version>${xnio.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- <version>${xnio.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling</artifactId>
- <version>${jbmar.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- <version>${jbmar.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- <version>1.1.1.GA</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -119,4 +56,12 @@
</plugin>
</plugins>
</build>
+
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven2 Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </distributionManagement>
</project>
Modified: remoting3/trunk/samples/pom.xml
===================================================================
--- remoting3/trunk/samples/pom.xml 2010-07-08 21:17:02 UTC (rev 5915)
+++ remoting3/trunk/samples/pom.xml 2010-07-08 21:47:19 UTC (rev 5916)
@@ -29,25 +29,44 @@
<name>JBoss Remoting 3 Samples</name>
<description>JBoss Remoting 3 Samples</description>
- <parent>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting-parent</artifactId>
- <version>3.1.0.Beta3-SNAPSHOT</version>
- </parent>
-
+ <groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting-samples</artifactId>
+ <version>3.1.0.Beta3-SNAPSHOT</version>
+
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.8.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven2 Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </distributionManagement>
</project>
Modified: remoting3/trunk/taglet/pom.xml
===================================================================
--- remoting3/trunk/taglet/pom.xml 2010-07-08 21:17:02 UTC (rev 5915)
+++ remoting3/trunk/taglet/pom.xml 2010-07-08 21:47:19 UTC (rev 5916)
@@ -29,13 +29,10 @@
<name>JBoss Remoting 3 Taglet</name>
<description>JBoss Remoting 3 Documentation Taglet</description>
- <parent>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting-parent</artifactId>
- <version>3.1.0.Beta3-SNAPSHOT</version>
- </parent>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting-taglet</artifactId>
+ <version>3.1.0.Beta3-SNAPSHOT</version>
- <artifactId>jboss-remoting-taglet</artifactId>
<packaging>jar</packaging>
<dependencies>
@@ -47,4 +44,25 @@
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven2 Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </distributionManagement>
</project>
\ No newline at end of file
More information about the jboss-remoting-commits
mailing list