modules/helpers/pluginAnnotations/pom.xml | 26 +++++++++++++++-----------
modules/helpers/pluginGen/pom.xml | 25 ++++++++++++++-----------
modules/helpers/pom.xml | 19 ++++++++++++-------
3 files changed, 41 insertions(+), 29 deletions(-)
New commits:
commit 3754606f88c751ed44b1e1a326edb887d2fd2684
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:32:26 2010 -0400
break pluginGen and pluginAnnotations out from the RHQ reactor, so they can be
released independently
diff --git a/modules/helpers/pluginAnnotations/pom.xml
b/modules/helpers/pluginAnnotations/pom.xml
index e637aad..3579caa 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -1,29 +1,32 @@
<?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/xsd/maven-4.0.0.xsd">
+
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>rhq-helpers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0</version>
</parent>
-
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin
descriptors</description>
- <version>4.0.0-SNAPSHOT</version>
<scm>
-
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/help...
-
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
+
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/help...
+
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
</scm>
<build>
+
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -33,8 +36,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -46,8 +48,10 @@
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
+
+
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 221ae3e..25ddded 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -1,22 +1,24 @@
<?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/xsd/maven-4.0.0.xsd">
+
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>rhq-helpers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0</version>
</parent>
-
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginGen</artifactId>
<packaging>jar</packaging>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin generator</name>
<description>Helper to generate plugin skeletons</description>
- <version>4.0.0-SNAPSHOT</version>
<scm>
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/help...
@@ -25,6 +27,7 @@
<build>
<plugins>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -33,8 +36,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -64,7 +66,7 @@
<id>make-assembly</id> <!-- this is used for inheritance
merges -->
<phase>package</phase> <!-- append to the packaging phase.
-->
<goals>
- <goal>attached</goal> <!-- goals == mojos -->
+ <goal>single</goal> <!-- goals == mojos -->
</goals>
</execution>
</executions>
@@ -77,9 +79,8 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <version>1.1.0.jboss</version>
</dependency>
-
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -91,4 +92,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
</project>
+
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a16c058..cb5d895 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
@@ -20,11 +22,13 @@
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
</scm>
+
<properties>
<scm.module.path>modules/helpers/</scm.module.path>
</properties>
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
@@ -36,16 +40,17 @@
<modules>
- <!-- plugins that are used by both enterprise and embedded -->
- <module>rtfilter</module>
- <!-- plugin generator -->
+ <module>rtfilter</module>
+<!--
<module>pluginGen</module>
<module>pluginAnnotations</module>
- <module>bundleGen</module>
- <module>perftest-support</module>
+-->
+ <module>bundleGen</module>
+ <module>perftest-support</module>
</modules>
+
<profiles>
</profiles>