[jboss-cvs] JBossAS SVN: r60499 - in projects/microcontainer/trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 12 17:17:51 EST 2007
Author: pgier
Date: 2007-02-12 17:17:51 -0500 (Mon, 12 Feb 2007)
New Revision: 60499
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/dependency/pom.xml
projects/microcontainer/trunk/deployers/pom.xml
projects/microcontainer/trunk/kernel/pom.xml
projects/microcontainer/trunk/managed/pom.xml
projects/microcontainer/trunk/metatype/pom.xml
projects/microcontainer/trunk/osgi-int/pom.xml
projects/microcontainer/trunk/spring-int/pom.xml
Log:
JBMICROCONT-117; Changed maven poms so that they inherit basic information from common parent pom (jboss-parent). Also changed version so that the builds can use the maven snapshot model.
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,95 +1,26 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer AOP MC INT</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
<plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- <!-- define that we wish to create src jars -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -101,63 +32,52 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>snapshot</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.Alpha2</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.0.4.Alpha2</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.1.GA</version>
+ </dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
<groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>1.0.0.CR8</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/build/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- A top level maven pom that expects a structure like:
+ The parent maven for the microcontainer project that expects a structure like:
build/pom.xml
aop-mc-int/pom.xml
container/pom.xml
@@ -10,39 +11,85 @@
metatype/pom.xml
spring-int/pom.xml
+ This pom aggregates the subproject pom, and it also functions as a default configuration. The subproject
+ poms each inherit configuration from this one.
+
To build this project maven 2 should be installed and in the system path. From the command line
- run "mvn install".
-
+ run "mvn" from the build directory and "install" will be used as the default goal. In order to use
+ the "deploy" goal, the mvn.cvs.root should be specified in settings.xml.
-->
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>1</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
- <version>snapshot</version>
<artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>JBoss Microcontainer Build</name>
- <url>http://www.jboss.org</url>
- <description>Parent POM for the JBoss Microcontainer Projects</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <packaging>pom</packaging>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>
+ The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
+ and configuration.
+ </description>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>etc/**</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src</directory>
+ <includes>
+ <include>resources/**</include>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>false</printSummary>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.com/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<modules>
<module>../container</module>
<module>../dependency</module>
<module>../metatype</module>
<module>../kernel</module>
<module>../managed</module>
+ <module>../aop-mc-int</module>
<module>../deployers</module>
- <module>../aop-mc-int</module>
<module>../spring-int</module>
</modules>
<reporting>
@@ -63,13 +110,4 @@
</plugin>
</plugins>
</reporting>
-
- <distributionManagement>
- <repository>
- <!-- Copy the distribution jar file to a local copy of the maven repository, for use by other projects -->
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/container/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,150 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-container</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Container</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Container</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
-
- <!-- define that we wish to create src jars -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
-
+ </plugin>-->
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.0.4.snapshot</version>
- </dependency>
-
- <!-- Test dependencies -->
+ <groupId>jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.0.4.snapshot</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <version>1.0.0.CR5</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <version>1.0.0.CR5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,94 +1,33 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-dependency</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Dependency</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Dependency</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency
+ </connection>
+ <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/trunk/dependency
+ </developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/trunk/dependency</url>
+ </scm>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
- <!-- define that we wish to create src jars -->
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -100,38 +39,33 @@
</excludes>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.Alpha</version>
- </dependency>
-
- <!-- Test dependencies -->
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.0.4.Alpha</version>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
<distributionManagement>
<repository>
<id>cvs-file-repository</id>
<url>file://${maven.cvs.root}</url>
</repository>
</distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/deployers/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,148 +1,78 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-deployers</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Deployers</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Deployers</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <!-- define that we wish to create src jars -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
-
<!-- Global dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
- </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.Alpha2</version>
- </dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.0</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.0.4.Alpha2</version>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/kernel/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,102 +1,36 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Kernel</name>
- <url>http://www.jboss.org</url>
- <description>JBoss Microcontainer Kernel</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Kernel</description>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
<plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- define that we wish to create src jars -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
<execution>
<goals>
- <goal>jar</goal>
+ <goal>test-jar</goal>
</goals>
</execution>
</executions>
- </plugin>
-
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -104,50 +38,38 @@
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- </dependency>
-
+ <groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>1.0.0.CR8</version>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <!-- Note: JUnit is required for the main classes, so it is not actually in the test -->
- <!-- scope. Maybe these dependencies can be changed. -->
- <!--<scope>test</scope>-->
- </dependency>
-
- <!-- Test dependencies -->
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <!-- Note: JUnit is required for the main classes, so it is not actually in the test -->
+ <!-- scope. Maybe these dependencies can be changed. -->
+ <!--<scope>test</scope>-->
+ </dependency>
+ <!-- Test dependencies -->
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/managed/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,94 +1,26 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-managed</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Managed</name>
- <url>http://www.jboss.org</url>
- <description>JBoss Microcontainer Managed</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Managed</description>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <!-- define that we wish to create src jars -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -97,46 +29,35 @@
</plugin>
</plugins>
</build>
-
<dependencies>
<!-- Global dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
- </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
+ <groupId>jboss</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
-
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/metatype/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,127 +1,48 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-metatype</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Metatype</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Metatype</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <!-- define that we wish to create src jars -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
-
- <!-- Test dependencies -->
+ <!-- none -->
+ <!-- Test dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.Alpha</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.0.4.Alpha</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
-
Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/osgi-int/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,111 +1,37 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0.SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-osgi-int</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer OSGI INT</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.1</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sourceDirectory>${basedir}/src/main</sourceDirectory>
- <!--<outputDirectory>${project.build.directory}/generated-sources/javacc/org/jboss/vfs/bundle</outputDirectory>-->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <!-- define that we wish to create src jars -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
+ <executions>
<execution>
+ <phase>generate-sources</phase>
<goals>
- <goal>jar</goal>
+ <goal>javacc</goal>
</goals>
</execution>
</executions>
- </plugin>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main</sourceDirectory>
+ <!--<outputDirectory>${project.build.directory}/
+ generated-sources/javacc/org/jboss/vfs/bundle</outputDirectory>-->
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -113,38 +39,26 @@
<skip>false</skip>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- Test dependencies -->
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- </dependency>
-
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2007-02-12 17:42:24 UTC (rev 60498)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2007-02-12 22:17:51 UTC (rev 60499)
@@ -1,140 +1,59 @@
<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>jboss</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-spring-int</artifactId>
<packaging>jar</packaging>
- <version>snapshot</version>
<name>JBoss Microcontainer Spring Int</name>
- <url>http://www.jboss.org</url>
+ <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Spring Int</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.com/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jbosspluginrepo</id>
- <name>jboss plugin repository</name>
- <url>http://repository.jboss.com/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.5,
- these setting will be inherited by child projects -->
+ <plugins>
+ <!-- The antrun plugin is used for generating jdk1.4 compatible classes.
+ The configuration for this plugin is specified in the parent pom. -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <!-- define that we wish to create src jars -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>1.0.0.CR8</version>
+ </dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.1.GA</version>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
More information about the jboss-cvs-commits
mailing list