modules/core/dbutils/pom.xml | 5 +++++ modules/core/util/pom.xml | 7 ++++++- modules/enterprise/agent/pom.xml | 5 +++++ modules/enterprise/comm/pom.xml | 5 +++++ modules/enterprise/gui/installer-war/pom.xml | 6 +++++- modules/enterprise/gui/portal-war/pom.xml | 5 +++++ modules/enterprise/remoting/cli/pom.xml | 5 +++++ modules/enterprise/server/jar/pom.xml | 5 +++++ pom.xml | 12 ++++++------ 9 files changed, 47 insertions(+), 8 deletions(-)
New commits: commit b8685a6877b0fad4e7f9b305db673fd2cab3e2aa Author: Ian Springer ian.springer@redhat.com Date: Mon Aug 2 10:33:46 2010 -0400
add explicit i18nlog dep to poms of modules that depend on it
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 8769bfc..09703ee 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -43,6 +43,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 405eaed..458c635 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -33,6 +33,11 @@ <version>1.0</version> </dependency>
+ <dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + </dependencies>
<build> @@ -125,4 +130,4 @@
</profiles>
-</project> \ No newline at end of file +</project> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 03f3932..7187dbe 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -84,6 +84,11 @@ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </dependency>
+ <dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + <!-- TODO: This is a fix for the Javac bug requiring annotations to be available when compiling dependent classes. It is fixed in JDK 6 --> <dependency> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 93931da..dcd5bed 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -64,6 +64,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>jboss</groupId> <artifactId>jboss-common</artifactId> <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 9a29f14..b3ccdca 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -76,6 +76,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>jboss</groupId> <artifactId>jboss-jmx</artifactId> <version>${jboss.version}</version> @@ -103,7 +108,6 @@ <scope>provided</scope> <!-- by JBossAS --> </dependency>
- <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 880cc16..f802053 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -149,6 +149,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>${el.version}</version> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 5453a41..b118a9e 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -51,6 +51,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>${jline.version}</version> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index a897a53..b0b3484 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -153,6 +153,11 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + </dependency> + + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-javamail_1.3.1_spec</artifactId> <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
commit d8e467b5ab9fd98bb3196e0a5e6c19a671135dbb Merge: 08ea91d... 0807fc7... Author: Ian Springer ian.springer@redhat.com Date: Mon Aug 2 09:57:08 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 08ea91d04e4c61dfc41295262f2cac7af869d54e Merge: c3a4115... dbd7dc1... Author: Ian Springer ian.springer@redhat.com Date: Fri Jul 30 10:38:32 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit c3a411545c18e5efa8b5889416398d8bb8a1b5ae Author: Ian Springer ian.springer@redhat.com Date: Thu Jul 29 15:58:07 2010 -0400
move i18nlog dep from deps section to depMgmt section
diff --git a/pom.xml b/pom.xml index 306bbff..6bc9e4e 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,12 @@ </dependency>
<dependency> + <groupId>i18nlog</groupId> + <artifactId>i18nlog</artifactId> + <version>${i18nlog.version}</version> + </dependency> + + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb-api.version}</version> @@ -420,12 +426,6 @@ <scope>provided</scope> </dependency>
- <dependency> - <groupId>i18nlog</groupId> - <artifactId>i18nlog</artifactId> - <version>${i18nlog.version}</version> - </dependency> - <!-- for the JAXB annotations --> <dependency> <groupId>javax.xml.bind</groupId>
rhq-commits@lists.fedorahosted.org