[jboss-cvs] JBossAS SVN: r68198 - in projects/integration/trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 12 15:12:24 EST 2007
Author: pgier
Date: 2007-12-12 15:12:23 -0500 (Wed, 12 Dec 2007)
New Revision: 68198
Modified:
projects/integration/trunk/build/assembly/bin-jdk14.xml
projects/integration/trunk/build/assembly/bin.xml
projects/integration/trunk/build/assembly/sources.xml
projects/integration/trunk/build/pom.xml
projects/integration/trunk/jboss-transaction-spi/pom.xml
projects/integration/trunk/pom.xml
Log:
Moving the assembly to the aggregate instead of the parent, and putting it in a profile so that hudson does not fail during the assembly.
Also removing some info from the aggregate that is not needed.
Modified: projects/integration/trunk/build/assembly/bin-jdk14.xml
===================================================================
--- projects/integration/trunk/build/assembly/bin-jdk14.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/build/assembly/bin-jdk14.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -5,15 +5,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>../jboss-classloading-spi/target/classes-jdk14</directory>
+ <directory>jboss-classloading-spi/target/classes-jdk14</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-transaction-spi/target/classes-jdk14</directory>
+ <directory>jboss-transaction-spi/target/classes-jdk14</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-corba-ots-spi/target/classes-jdk14</directory>
+ <directory>jboss-corba-ots-spi/target/classes-jdk14</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: projects/integration/trunk/build/assembly/bin.xml
===================================================================
--- projects/integration/trunk/build/assembly/bin.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/build/assembly/bin.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -5,15 +5,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>../jboss-classloading-spi/target/classes</directory>
+ <directory>jboss-classloading-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-transaction-spi/target/classes</directory>
+ <directory>jboss-transaction-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-corba-ots-spi/target/classes</directory>
+ <directory>jboss-corba-ots-spi/target/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: projects/integration/trunk/build/assembly/sources.xml
===================================================================
--- projects/integration/trunk/build/assembly/sources.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/build/assembly/sources.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -6,15 +6,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>../jboss-classloading-spi/src/main</directory>
+ <directory>jboss-classloading-spi/src/main</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-transaction-spi/src/main</directory>
+ <directory>jboss-transaction-spi/src/main</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
- <directory>../jboss-corba-ots-spi/src/main</directory>
+ <directory>jboss-corba-ots-spi/src/main</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: projects/integration/trunk/build/pom.xml
===================================================================
--- projects/integration/trunk/build/pom.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/build/pom.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -14,11 +14,6 @@
<description>
The JBoss Integration SPI classes
</description>
- <!--<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/integration/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/integration/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/integration/trunk/</url>
- </scm>-->
<build>
<sourceDirectory>src/main</sourceDirectory>
@@ -44,24 +39,6 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>assembly/bin.xml</descriptor>
- <descriptor>assembly/sources.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<printSummary>false</printSummary>
@@ -72,21 +49,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
</plugins>
</build>
<reporting>
@@ -123,12 +85,12 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.20070913080910</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1.20070913080910</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jacorb</groupId>
Modified: projects/integration/trunk/jboss-transaction-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-transaction-spi/pom.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/jboss-transaction-spi/pom.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -1,7 +1,7 @@
<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">
<parent>
<groupId>org.jboss</groupId>
- <artifactId>jboss-integration</artifactId>
+ <artifactId>jboss-integration-parent</artifactId>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: projects/integration/trunk/pom.xml
===================================================================
--- projects/integration/trunk/pom.xml 2007-12-12 20:04:20 UTC (rev 68197)
+++ projects/integration/trunk/pom.xml 2007-12-12 20:12:23 UTC (rev 68198)
@@ -10,7 +10,7 @@
<artifactId>jboss-integration</artifactId>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Integration 5.0 Build</name>
+ <name>JBoss Integration 5.0 Aggregate</name>
<url>http://www.jboss.com</url>
<description>
The JBoss Integration SPI classes
@@ -27,52 +27,53 @@
<module>jboss-transaction-spi</module>
<module>jboss-corba-ots-spi</module>
</modules>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.4.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.1.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.20070913080910</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1.20070913080910</version>
- </dependency>
- <dependency>
- <groupId>jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>2.3.0jboss.patch4-brew</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+
+ <profiles>
+ <profile>
+ <id>assembly</id>
+ <activation>
+ <property>
+ <name>!skip.assembly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>build/assembly/bin.xml</descriptor>
+ <descriptor>build/assembly/sources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list