[jboss-svn-commits] JBL Code SVN: r36749 - labs/jbosstm/trunk/rhq-plugin.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 25 09:36:58 EST 2011
Author: tomjenkinson
Date: 2011-02-25 09:36:57 -0500 (Fri, 25 Feb 2011)
New Revision: 36749
Modified:
labs/jbosstm/trunk/rhq-plugin/build.xml
labs/jbosstm/trunk/rhq-plugin/pom.xml
Log:
JBTM-574 backed out changes temporarily
Modified: labs/jbosstm/trunk/rhq-plugin/build.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/build.xml 2011-02-25 14:33:08 UTC (rev 36748)
+++ labs/jbosstm/trunk/rhq-plugin/build.xml 2011-02-25 14:36:57 UTC (rev 36749)
@@ -2,7 +2,7 @@
<project name="rhq-plugin" default="maven:package" basedir=".">
- <property name="modulename" value="jbossts-jopr-plugin-4.15.0.M1-SNAPSHOT"/>
+ <property name="modulename" value="jopr-jbossts-plugin-2.3.0.EmbJopr.1.3.0-4"/>
<property name="component-module-list" value="${modulename}"/>
<property name="install.jar.dir" value="../install/bin"/>
<property name="install.doc.dir" value="../install/docs/rhq"/>
@@ -15,11 +15,6 @@
<property name="plugindocjar" value="${modulename}-javadoc.jar"/>
<target name="maven:package" depends="clean">
-
- <exec executable="mvn" dir="../narayana-build-common">
- <arg value="install"/>
- </exec>
-
<exec executable="mvn" dir="${basedir}">
<arg value="-Dversion=${version}"/>
<arg value="-DartifactId=${modulename}"/>
@@ -28,14 +23,15 @@
</target>
<target name="dist" depends="maven:package">
- <copy file="${maven.project.build.directory}/${pluginjar}" tofile="${install.jar.dir}/jbossts-jopr-plugin.jar"/>
- <copy file="${maven.project.build.directory}/${pluginsrcjar}" tofile="${install.jar.dir}/jbossts-jopr-plugin-sources.jar"/>
- <copy file="${maven.project.build.directory}/${plugindocjar}" tofile="${install.doc.dir}/jbossts-jopr-plugin-javadoc.jar"/>
+ <copy file="${maven.project.build.directory}/${pluginjar}" todir="${install.jar.dir}"/>
+ <copy file="${maven.project.build.directory}/${pluginsrcjar}" todir="${install.jar.dir}"/>
+ <copy file="${maven.project.build.directory}/${plugindocjar}" todir="${install.doc.dir}"/>
</target>
<target name="clean">
- <delete dir="target"/>
-
+ <exec executable="mvn" dir="${basedir}">
+ <arg value="clean"/>
+ </exec>
<delete dir="build"/>
<delete dir="${install.doc.dir}"/>
<echo message="deleting ${install.jar.dir}/${pluginjar} and ${install.jar.dir}/${pluginsrcjar}"/>
Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-02-25 14:33:08 UTC (rev 36748)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-02-25 14:36:57 UTC (rev 36749)
@@ -2,14 +2,15 @@
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>narayana-build-common</artifactId>
- <version>4.15.0.M1-SNAPSHOT</version>
+ <groupId>org.jboss.on</groupId>
+ <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
+ <artifactId>jopr-modules-parent</artifactId>
+ <version>2.3.0.EmbJopr.1.3.0-4</version>
</parent>
- <artifactId>jbossts-jopr-plugin</artifactId>
+ <groupId>org.jboss.on</groupId>
+ <artifactId>jopr-jbossts-plugin</artifactId>
<packaging>jar</packaging>
<name>Jopr Test Plugin</name>
@@ -30,10 +31,35 @@
</repositories>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create_sources_jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <includePom>true</includePom>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<executions>
<execution>
<id>create_javadocs</id>
@@ -44,99 +70,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create_sources_jar</id>
+ <goals> <goal>jar</goal> </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <includePom>true</includePom>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
- <!-- Below are the core modules that are required dependencies of all plugins -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-plugin-api</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-native-system</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
<dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
- <version>${rhq.version}</version>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-jmx-plugin</artifactId>
+ <version>${rhq.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.GA</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!--
- Uncomment the one of the three logging systems your plugin uses: log4j, commons-logging or i18nlog
- All three are provided to your plugin by the agent/plugin-container.
- -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!--
<dependency>
<groupId>org.rhq</groupId>
@@ -156,9 +114,4 @@
-->
</dependencies>
-
-
- <properties>
- <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version>
- </properties>
</project>
More information about the jboss-svn-commits
mailing list