modules/helpers/pluginAnnotations/pom.xml | 8 ++++---- modules/helpers/pluginGen/pom.xml | 6 +++--- modules/helpers/pluginGen/src/main/resources/pom.ftl | 15 ++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-)
New commits: commit 42c00f9ade61af787ec4dd325b1045c6841f22bb Author: Heiko W. Rupp hwr@redhat.com Date: Mon Aug 27 15:25:57 2012 -0400
Update pom-template.
diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl index 378bd76..2434ddd 100644 --- a/modules/helpers/pluginGen/src/main/resources/pom.ftl +++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl @@ -2,7 +2,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-20012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version><#if props.rhqVersion??>${props.rhqVersion}<#else >1.3.0-SNAPSHOT</#if></version><!-- TODO adjust RHQ version --> + <version><#if props.rhqVersion??>${props.rhqVersion}<#else >4.5.0-SNAPSHOT</#if></version><!-- TODO adjust RHQ version --> </parent>
<groupId>org.rhq</groupId> @@ -43,9 +43,6 @@ <description>${props.description}</description> </#if>
- <properties> - <rhq.version><#if props.rhqVersion??>${props.rhqVersion}<#else >1.3.0-SNAPSHOT</#if></rhq.version> <!-- TODO adjust, see above too --> - </properties>
<build> <plugins> @@ -212,26 +209,26 @@ <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-domain</artifactId> - <version>${r"${rhq.version}"}</version> + <version>${r"${project.version}"}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-plugin-api</artifactId> - <version>${r"${rhq.version}"}</version> + <version>${r"${project.version}"}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-native-system</artifactId> - <version>${r"${rhq.version}"}</version> + <version>${r"${project.version}"}</version> <scope>provided</scope> </dependency> <#if props.dependsOnJmxPlugin> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-jmx-plugin</artifactId> - <version>${r"${rhq.version}"}</version> + <version>${r"${project.version}"}</version> <scope>provided</scope> </dependency> </#if>
commit 11fb6e5360c29a76726d7759b680220459386497 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Aug 23 12:07:35 2012 -0400
Update plugin generator poms.
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index b6720cb..74800f8 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -7,20 +7,20 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0</version> + <version>4.5.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
<groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> <packaging>jar</packaging> - <version>3.0.2-SNAPSHOT</version> + <version>4.5.0-SNAPSHOT</version>
<name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description>
<build> - + <plugins>
<plugin> @@ -31,7 +31,7 @@ </configuration> </plugin>
- <plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 299550d..62bf822 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0</version> + <version>4.5.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
<groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginGen</artifactId> <packaging>jar</packaging> - <version>3.0.2-SNAPSHOT</version> + <version>4.5.0-SNAPSHOT</version>
<name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> @@ -90,7 +90,7 @@ <dependency> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>4.5.0-SNAPSHOT</version> </dependency> </dependencies>
rhq-commits@lists.fedorahosted.org