[jboss-svn-commits] JBoss Common SVN: r2265 - common-core/trunk and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 7 11:21:14 EST 2007
Author: pgier
Date: 2007-02-07 11:21:14 -0500 (Wed, 07 Feb 2007)
New Revision: 2265
Modified:
build/trunk/pom.xml
common-core/trunk/pom.xml
common-logging-jdk/trunk/pom.xml
common-logging-log4j/trunk/pom.xml
common-logging-spi/trunk/pom.xml
Log:
[JBBUILD-338] Changed the pom files so that they all inherit from the main build/pom.xml.
Also the main pom now inherits from jboss-parent.
Modified: build/trunk/pom.xml
===================================================================
--- build/trunk/pom.xml 2007-02-06 16:55:16 UTC (rev 2264)
+++ build/trunk/pom.xml 2007-02-07 16:21:14 UTC (rev 2265)
@@ -15,25 +15,32 @@
-->
<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-parent</artifactId>
+ <version>1</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
- <version>2.0.4.Alpha</version>
+ <version>2.0.4-SNAPSHOT</version>
<artifactId>jboss-common</artifactId>
<name>JBoss Common Build</name>
<url>http://www.jboss.org</url>
- <description>Parent POM for the JBoss Common Classes Jars</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>
-
+ <description>Parent project for the JBoss Common Classes Jars</description>
<packaging>pom</packaging>
+ <build>
+ <finalName>${artifactId}</finalName>
+ </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>../common-core</module>
<module>../common-logging-spi</module>
@@ -58,7 +65,6 @@
</plugin>
</plugins>
</reporting>
-
<distributionManagement>
<repository>
<id>cvs-file-repository</id>
Modified: common-core/trunk/pom.xml
===================================================================
--- common-core/trunk/pom.xml 2007-02-06 16:55:16 UTC (rev 2264)
+++ common-core/trunk/pom.xml 2007-02-07 16:21:14 UTC (rev 2265)
@@ -1,95 +1,17 @@
<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-common</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<packaging>jar</packaging>
- <version>2.0.4.Beta</version>
<name>JBoss Common Classes</name>
<url>http://www.jboss.org</url>
<description>A set of commonly used classed classes</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/java</sourceDirectory>
- <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 -->
- <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>
-
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>apache-xerces</groupId>
@@ -115,13 +37,13 @@
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
<!-- v >= 2.0.2.GA -->
- <version>(,2.0.2.GA]</version>
+ <version>[2.0.2.GA,)</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
<!-- v >= 1.0.1.GA -->
- <version>(,1.0.1.GA]</version>
+ <version>[1.0.1.GA,)</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -131,16 +53,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <!-- Set maven.cvs.root in your settings.xml
- See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
- -->
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: common-logging-jdk/trunk/pom.xml
===================================================================
--- common-logging-jdk/trunk/pom.xml 2007-02-06 16:55:16 UTC (rev 2264)
+++ common-logging-jdk/trunk/pom.xml 2007-02-07 16:21:14 UTC (rev 2265)
@@ -1,24 +1,17 @@
<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-common</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-jdk</artifactId>
<packaging>jar</packaging>
- <version>2.0.4.Alpha</version>
<name>JBoss Logging JDK</name>
<url>http://www.jboss.org</url>
<description>JBoss Logging JDK classes</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>
@@ -30,66 +23,6 @@
</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/java</sourceDirectory>
- <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.4,
- these setting will be inherited by child projects -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</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>
-
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>jboss</groupId>
@@ -102,16 +35,4 @@
<version>2.0.3.GA</version>
</dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <!-- Set maven.cvs.root in your settings.xml
- See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
- -->
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
-
Modified: common-logging-log4j/trunk/pom.xml
===================================================================
--- common-logging-log4j/trunk/pom.xml 2007-02-06 16:55:16 UTC (rev 2264)
+++ common-logging-log4j/trunk/pom.xml 2007-02-07 16:21:14 UTC (rev 2265)
@@ -1,95 +1,17 @@
<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-common</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<packaging>jar</packaging>
- <version>2.0.4.Alpha</version>
<name>JBoss Logging Log4j</name>
<url>http://www.jboss.org</url>
<description>JBoss Logging Log4j classes</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/java</sourceDirectory>
- <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.4,
- these setting will be inherited by child projects -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</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>
-
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>jboss</groupId>
@@ -109,15 +31,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <!-- Set maven.cvs.root in your settings.xml
- See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
- -->
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
Modified: common-logging-spi/trunk/pom.xml
===================================================================
--- common-logging-spi/trunk/pom.xml 2007-02-06 16:55:16 UTC (rev 2264)
+++ common-logging-spi/trunk/pom.xml 2007-02-07 16:21:14 UTC (rev 2265)
@@ -1,106 +1,15 @@
<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-common</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
<packaging>jar</packaging>
- <version>2.0.4.Alpha</version>
<name>JBoss Logging Programming Interface</name>
<url>http://www.jboss.org</url>
<description>The JBoss Logging Framework Programming Interface</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/java</sourceDirectory>
- <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.4,
- these setting will be inherited by child projects -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</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>
-
- </plugins>
- </build>
-
- <distributionManagement>
- <repository>
- <id>cvs-file-repository</id>
- <!-- Set maven.cvs.root in your settings.xml
- See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
- -->
- <url>file://${maven.cvs.root}</url>
- </repository>
- </distributionManagement>
-
</project>
More information about the jboss-svn-commits
mailing list