[jboss-svn-commits] JBoss Common SVN: r2082 - build/trunk common-core/trunk common-core/trunk/src/main/java/org/jboss/util/xml common-logging-jdk/trunk common-logging-log4j/trunk common-logging-spi/trunk
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 27 14:17:11 EDT 2006
Author: scott.stark at jboss.org
Date: 2006-09-27 14:17:00 -0400 (Wed, 27 Sep 2006)
New Revision: 2082
Modified:
build/trunk/pom.xml
common-core/trunk/.classpath
common-core/trunk/pom.xml
common-core/trunk/src/main/java/org/jboss/util/xml/CatalogLocation.java
common-logging-jdk/trunk/.classpath
common-logging-jdk/trunk/pom.xml
common-logging-log4j/trunk/.classpath
common-logging-log4j/trunk/pom.xml
common-logging-spi/trunk/pom.xml
Log:
Fix the inconsistencies in the 2.0.1.GA release and remove the version info from the target output jars using a build/finalName override.
Modified: build/trunk/pom.xml
===================================================================
--- build/trunk/pom.xml 2006-09-27 09:32:53 UTC (rev 2081)
+++ build/trunk/pom.xml 2006-09-27 18:17:00 UTC (rev 2082)
@@ -40,5 +40,22 @@
<module>../common-logging-log4j</module>
<module>../common-logging-jdk</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>
</project>
-
Modified: common-core/trunk/.classpath
===================================================================
--- common-core/trunk/.classpath 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-core/trunk/.classpath 2006-09-27 18:17:00 UTC (rev 2082)
@@ -8,6 +8,6 @@
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-logging-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-logging-spi"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: common-core/trunk/pom.xml
===================================================================
--- common-core/trunk/pom.xml 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-core/trunk/pom.xml 2006-09-27 18:17:00 UTC (rev 2082)
@@ -57,9 +57,8 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
-
-
+ <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
@@ -79,13 +78,13 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
@@ -112,14 +111,9 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: common-core/trunk/src/main/java/org/jboss/util/xml/CatalogLocation.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/CatalogLocation.java 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/CatalogLocation.java 2006-09-27 18:17:00 UTC (rev 2082)
@@ -30,7 +30,7 @@
import java.net.URISyntaxException;
import java.net.URL;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.util.xml.catalog.CatalogManager;
import org.jboss.util.xml.catalog.Resolver;
import org.xml.sax.InputSource;
Modified: common-logging-jdk/trunk/.classpath
===================================================================
--- common-logging-jdk/trunk/.classpath 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-logging-jdk/trunk/.classpath 2006-09-27 18:17:00 UTC (rev 2082)
@@ -7,7 +7,7 @@
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-logging-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-common-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-logging-spi"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: common-logging-jdk/trunk/pom.xml
===================================================================
--- common-logging-jdk/trunk/pom.xml 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-logging-jdk/trunk/pom.xml 2006-09-27 18:17:00 UTC (rev 2082)
@@ -56,11 +56,10 @@
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
-
+ <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,
@@ -79,28 +78,27 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.0.0</version>
- <scope>compile</scope>
+ <version>2.0.1.GA</version>
</dependency>
</dependencies>
Modified: common-logging-log4j/trunk/.classpath
===================================================================
--- common-logging-log4j/trunk/.classpath 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-logging-log4j/trunk/.classpath 2006-09-27 18:17:00 UTC (rev 2082)
@@ -7,7 +7,7 @@
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-logging-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-common-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-logging-spi"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: common-logging-log4j/trunk/pom.xml
===================================================================
--- common-logging-log4j/trunk/pom.xml 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-logging-log4j/trunk/pom.xml 2006-09-27 18:17:00 UTC (rev 2082)
@@ -56,10 +56,9 @@
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
-
-
+ <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
@@ -79,27 +78,27 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: common-logging-spi/trunk/pom.xml
===================================================================
--- common-logging-spi/trunk/pom.xml 2006-09-27 09:32:53 UTC (rev 2081)
+++ common-logging-spi/trunk/pom.xml 2006-09-27 18:17:00 UTC (rev 2082)
@@ -56,8 +56,9 @@
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <plugins>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
@@ -79,17 +80,16 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
-
More information about the jboss-svn-commits
mailing list