[jboss-cvs] JBossAS SVN: r82647 - in projects/jboss-man/trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 6 18:12:36 EST 2009
Author: pgier
Date: 2009-01-06 18:12:35 -0500 (Tue, 06 Jan 2009)
New Revision: 82647
Added:
projects/jboss-man/trunk/build/src/assembly/dist-with-deps.xml
Removed:
projects/jboss-man/trunk/managed/pom-jdk14.xml
projects/jboss-man/trunk/metatype/pom-jdk14.xml
Modified:
projects/jboss-man/trunk/
projects/jboss-man/trunk/build/pom.xml
projects/jboss-man/trunk/build/src/assembly/dist.xml
projects/jboss-man/trunk/build/src/assembly/src.xml
projects/jboss-man/trunk/managed/pom.xml
projects/jboss-man/trunk/metatype/pom.xml
projects/jboss-man/trunk/pom.xml
Log:
[JBBUILD-507] Updates to building the dist zips.
Property changes on: projects/jboss-man/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
.classpath
.project
target
Modified: projects/jboss-man/trunk/build/pom.xml
===================================================================
--- projects/jboss-man/trunk/build/pom.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/build/pom.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,16 +1,16 @@
<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.man</groupId>
- <artifactId>jboss-man</artifactId>
+ <artifactId>jboss-man-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.man</groupId>
- <artifactId>jboss-man-dist</artifactId>
+ <artifactId>jboss-man</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Managed Distribution Build</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <name>JBoss Managed Distribution</name>
+ <url>http://www.jboss.org/jbossmc</url>
<description>JBoss Managed Distribution Build</description>
<build>
@@ -18,14 +18,37 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <finalName>jboss-man-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/dist-with-deps.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Added: projects/jboss-man/trunk/build/src/assembly/dist-with-deps.xml
===================================================================
--- projects/jboss-man/trunk/build/src/assembly/dist-with-deps.xml (rev 0)
+++ projects/jboss-man/trunk/build/src/assembly/dist-with-deps.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -0,0 +1,11 @@
+<assembly>
+ <id>with-deps</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Property changes on: projects/jboss-man/trunk/build/src/assembly/dist-with-deps.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/jboss-man/trunk/build/src/assembly/dist.xml
===================================================================
--- projects/jboss-man/trunk/build/src/assembly/dist.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/build/src/assembly/dist.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,16 +1,11 @@
<assembly>
<formats>
- <!--<format>tar.gz</format>-->
<format>zip</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>../metatype/target/classes</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../managed/target/classes</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: projects/jboss-man/trunk/build/src/assembly/src.xml
===================================================================
--- projects/jboss-man/trunk/build/src/assembly/src.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/build/src/assembly/src.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,11 +1,9 @@
<assembly>
<id>src</id>
<formats>
- <!--<format>tar.gz</format>-->
<format>zip</format>
</formats>
<fileSets>
- <!-- Include everything from the root of the project except the target dirs -->
<fileSet>
<directory>..</directory>
<outputDirectory></outputDirectory>
Deleted: projects/jboss-man/trunk/managed/pom-jdk14.xml
===================================================================
--- projects/jboss-man/trunk/managed/pom-jdk14.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/managed/pom-jdk14.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
- - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
- -->
-<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.microcontainer-jdk14</groupId>
- <artifactId>jboss-microcontainer-jdk14</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-managed-jdk14</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Managed JDK 1.4</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Managed</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <!-- Skip the tests here because the jdk14 tests have
- - to be run in a separate profile.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
- - of the lifecycle. In other words it should be called directly from the command
- - line like this
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
- -->
- <profile>
- <id>run-jdk14-tests</id>
- <properties>
- <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-jdk14-property</id>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java14_home</property>
- <message>
- The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
- </message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java14_home}/bin/java</jvm>
- <forkMode>always</forkMode>
- <skip>false</skip>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>true</testFailureIgnore>
- <useSystemClassLoader>true</useSystemClassLoader>
- <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.aop-jdk14</groupId>
- <artifactId>jboss-aop-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.reflect</groupId>
- <artifactId>jboss-reflect-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-metatype-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi-jdk14</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-</project>
Modified: projects/jboss-man/trunk/managed/pom.xml
===================================================================
--- projects/jboss-man/trunk/managed/pom.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/managed/pom.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,14 +1,14 @@
<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.man</groupId>
- <artifactId>jboss-man</artifactId>
+ <artifactId>jboss-man-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-managed</artifactId>
<packaging>jar</packaging>
<name>JBoss Managed</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <url>http://www.jboss.org/jbossmc</url>
<description>JBoss Managed</description>
<build>
Deleted: projects/jboss-man/trunk/metatype/pom-jdk14.xml
===================================================================
--- projects/jboss-man/trunk/metatype/pom-jdk14.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/metatype/pom-jdk14.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
- - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
- -->
-<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.microcontainer-jdk14</groupId>
- <artifactId>jboss-microcontainer-jdk14</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-metatype-jdk14</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Metatype JDK 1.4</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Metatype</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <!-- Skip the tests here because the jdk14 tests have
- - to be run in a separate profile.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
- - of the lifecycle. In other words it should be called directly from the command
- - line like this
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
- -->
- <profile>
- <id>run-jdk14-tests</id>
- <properties>
- <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-jdk14-property</id>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java14_home</property>
- <message>
- The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
- </message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java14_home}/bin/java</jvm>
- <forkMode>always</forkMode>
- <skip>false</skip>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>true</testFailureIgnore>
- <useSystemClassLoader>true</useSystemClassLoader>
- <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Modified: projects/jboss-man/trunk/metatype/pom.xml
===================================================================
--- projects/jboss-man/trunk/metatype/pom.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/metatype/pom.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -1,14 +1,14 @@
<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.man</groupId>
- <artifactId>jboss-man</artifactId>
+ <artifactId>jboss-man-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-metatype</artifactId>
<packaging>jar</packaging>
<name>JBoss Metatype</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <url>http://www.jboss.org/jbossmc</url>
<description>JBoss Metatype</description>
<build>
Modified: projects/jboss-man/trunk/pom.xml
===================================================================
--- projects/jboss-man/trunk/pom.xml 2009-01-06 23:11:39 UTC (rev 82646)
+++ projects/jboss-man/trunk/pom.xml 2009-01-06 23:12:35 UTC (rev 82647)
@@ -6,11 +6,11 @@
<version>4</version>
</parent>
<groupId>org.jboss.man</groupId>
- <artifactId>jboss-man</artifactId>
+ <artifactId>jboss-man-parent</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Managed Parent POM</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <url>http://www.jboss.org/jbossmc</url>
<description>JBoss Managed Parent POM</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-man/trunk/</connection>
@@ -67,20 +67,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
@@ -94,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.2</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
More information about the jboss-cvs-commits
mailing list