Skip to content
This repository has been archived by the owner on Jul 11, 2022. It is now read-only.

Commit

Permalink
[prod] Add independent versioning for rhq-ant-bundle-plugin and rhq-…
Browse files Browse the repository at this point in the history 
…serverplugin-ant-bundle.
  • Loading branch information
Simeon Pinder committed Apr 3, 2015
1 parent 6dc2525 commit ef2aebc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions modules/enterprise/server/ear/pom.xml
View file
Expand Up @@ -391,7 +391,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-ant-bundle-plugin</artifactId>
<version>${project.version}</version>
<version>${rhq-ant-bundle-plugin.version}</version>
</artifactItem>

<artifactItem>
Expand Down Expand Up @@ -425,7 +425,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-serverplugin-ant-bundle</artifactId>
<version>${project.version}</version>
<version>${rhq-serverplugin-ant-bundle.version}</version>
</artifactItem>

<artifactItem>
Expand Down
4 changes: 2 additions & 2 deletions modules/enterprise/server/itests-2/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@
<description>RHQ enterprise server JAR integration tests</description>

<properties>
<rhq.ant-bundle.serverplugin.path>${settings.localRepository}/org/rhq/rhq-serverplugin-ant-bundle/${project.version}/rhq-serverplugin-ant-bundle-${project.version}.jar</rhq.ant-bundle.serverplugin.path>
<rhq.ant-bundle.serverplugin.path>${settings.localRepository}/org/rhq/rhq-serverplugin-ant-bundle/${rhq-serverplugin-ant-bundle.version}/rhq-serverplugin-ant-bundle-${rhq-serverplugin-ant-bundle.version}.jar</rhq.ant-bundle.serverplugin.path>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
<jboss.unzip.location>${basedir}/target/${jboss.eap.version}</jboss.unzip.location>
<jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m
Expand Down Expand Up @@ -626,7 +626,7 @@
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-ant-bundle</artifactId>
<version>${project.version}</version>
<version>${rhq-serverplugin-ant-bundle.version}</version>
<scope>test</scope>
</dependency>

Expand Down
1 change: 1 addition & 0 deletions modules/enterprise/server/plugins/ant-bundle/pom.xml
View file
Expand Up @@ -10,6 +10,7 @@

<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-ant-bundle</artifactId>
<version>4.12.0.JON330GA</version>
<packaging>jar</packaging>

<name>RHQ Ant Bundle Server Plugin</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
View file
Expand Up @@ -50,8 +50,8 @@
<pathelement location="../drift-mongodb/target/drift-mongodb-serverplugin-${project.version}.jar" />
<pathelement location="../drift-rhq/target/rhq-serverplugin-drift-${project.version}.jar" />
<pathelement location="../filetemplate-bundle/target/rhq-serverplugin-filetemplate-bundle-${project.version}.jar" />
<pathelement location="../ant-bundle/target/rhq-serverplugin-ant-bundle-${project.version}.jar" />
<pathelement location="../jdr-support/target/rhq-serverplugin-jdr-${project.version}.jar" />
<pathelement location="../ant-bundle/target/rhq-serverplugin-ant-bundle-${rhq-serverplugin-ant-bundle.version}.jar" />
<pathelement location="../jdr-support/target/rhq-serverplugin-jdr-${rhq-serverplugin-jdr.version}.jar" />
</classpath>
<sysproperty key="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.SimpleLog" />
<sysproperty key="rhq.test.serverplugins" value="${rhq.test.serverplugins}" />
Expand Down
7 changes: 4 additions & 3 deletions modules/plugins/ant-bundle/pom.xml
View file
Expand Up @@ -10,6 +10,7 @@

<groupId>org.rhq</groupId>
<artifactId>rhq-ant-bundle-plugin</artifactId>
<version>4.12.0.JON330GA</version>
<packaging>jar</packaging>

<name>RHQ Ant Bundle Plugin</name>
Expand Down Expand Up @@ -104,7 +105,7 @@
<phase>pre-integration-test</phase>
<configuration>
<target>
<echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
<echo>Setting up plugin dependencies for ${project.artifactId}-${rhq-ant-bundle-plugin.version}.jar...</echo>
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<mkdir dir="target/itest" />
<mkdir dir="target/itest/plugins" />
Expand All @@ -114,7 +115,7 @@
<include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
</fileset>
<fileset dir="${project.build.directory}">
<include name="${project.artifactId}-${project.version}.jar" />
<include name="${project.artifactId}-${rhq-ant-bundle-plugin.version}.jar" />
</fileset>
</copy>
<unzip dest="target/itest/lib">
Expand Down Expand Up @@ -171,7 +172,7 @@
</property>
<property>
<name>project.version</name>
<value>${project.version}</value>
<value>${rhq-ant-bundle-plugin.version}</value>
</property>
</systemProperties>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion modules/plugins/validate-all-plugins/pom.xml
View file
Expand Up @@ -59,7 +59,7 @@
<pathelement location="../virt/target/rhq-virt-plugin-${project.version}.jar" />
<pathelement location="../kickstart/target/rhq-kickstart-plugin-${project.version}.jar" />
<pathelement location="../filetemplate-bundle/target/rhq-filetemplate-bundle-plugin-${project.version}.jar" />
<pathelement location="../ant-bundle/target/rhq-ant-bundle-plugin-${project.version}.jar" />
<pathelement location="../ant-bundle/target/rhq-ant-bundle-plugin-${rhq-ant-bundle-plugin.version}.jar" />
<pathelement location="../cassandra/target/rhq-cassandra-plugin-${rhq-cassandra-plugin.version}.jar" />
<pathelement location="../rhq-storage/target/rhq-rhqstorage-${project.version}.jar" />
</classpath>
Expand Down

0 comments on commit ef2aebc

Please sign in to comment.