[embjopr-commits] EMBJOPR SVN: r8 - in trunk: core and 2 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Fri Oct 17 09:34:54 EDT 2008
Author: ips
Date: 2008-10-17 09:34:54 -0400 (Fri, 17 Oct 2008)
New Revision: 8
Modified:
trunk/core/pom.xml
trunk/jbas4/pom.xml
trunk/jbas5/pom.xml
trunk/pom.xml
Log:
remove some stuff from the sub-poms that now lives in the parent pom; removed some unused deps
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2008-10-16 23:06:28 UTC (rev 7)
+++ trunk/core/pom.xml 2008-10-17 13:34:54 UTC (rev 8)
@@ -30,51 +30,18 @@
<artifactId>jopr-embedded-core</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>JBoss Administration Console</name>
+ <name>Embedded Jopr Core</name>
<description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description>
- <inceptionYear>2007</inceptionYear>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://jboss.com/</url>
- </organization>
-
- <scm>
- <connection>scm:svn:http://svn.corp.jboss.com/repos/jon/trunk/embedded/</connection>
- <developerConnection>scm:svn:https://svn.corp.jboss.com/repos/jon/trunk/embedded/</developerConnection>
+
+ <scm>
+ <connection>scm:svn:http://svn.jboss.org/repos/embjopr/trunk/core/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/core/</developerConnection>
</scm>
-
- <issueManagement>
- <system>jira</system>
- <url>http://jira.jboss.com/jira/browse/JBMANCON</url>
- </issueManagement>
-
+
<properties>
- <scm.branch>trunk</scm.branch>
- <scm.module.path>embedded/</scm.module.path>
- <final.name>embedded-jopr</final.name>
- <war.dir>${basedir}/target/${final.name}</war.dir>
-
+ <war.dir>${basedir}/target/${project.build.finalName}</war.dir>
<product.name>${project.name}</product.name>
- <product.version>${project.version}</product.version>
-
- <!-- dependency groupIds -->
- <rhq.groupId>org.rhq</rhq.groupId>
- <jon.groupId>org.jboss.on</jon.groupId>
- <seam.groupId>org.jboss.seam</seam.groupId>
- <seam.embedded.groupId>org.jboss.seam.embedded</seam.embedded.groupId>
-
- <!-- dependency versions -->
- <jaxb-api.version>2.1</jaxb-api.version>
- <jaxb-impl.version>2.1.6</jaxb-impl.version>
- <jon.version>2.2.0-SNAPSHOT</jon.version>
- <richfaces.version>3.1.3.GA</richfaces.version>
- <rhq.version>1.2.0-SNAPSHOT</rhq.version>
- <seam.version>2.0.2.SP1</seam.version>
- <seam.embedded.version>beta3.SP2</seam.embedded.version>
- <!-- This is a special patched version of not-yet-released Facelets 1.1.15,
- which is required in order for Facelets to work in AS5.
- (see https://jira.jboss.org/jira/browse/JBSEAM-3066) -->
- <facelets.version>1.1.15.B1</facelets.version>
+ <product.version>${project.version}</product.version>
</properties>
<dependencies>
@@ -110,40 +77,7 @@
<artifactId>rhq-core-util</artifactId>
<version>${rhq.version}</version>
</dependency>
- <!-- == Misc Dependencies ================ -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.0.jboss</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- </dependency>
- <!-- NOTE: Don't try to use Log4J 1.2.15, because it has deps on Sun JMX jars that
- aren't available from any Maven repo. -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- <version>7.0.2</version>
- <scope>provided</scope>
- <!-- (not required at runtime) -->
- </dependency>
+
<!-- == Seam Related Dependencies ================ -->
<dependency>
<groupId>${seam.groupId}</groupId>
@@ -227,22 +161,6 @@
</exclusions>
<scope>runtime</scope>
</dependency>
- <!-- EL stuff -->
- <!-- Gets included through dependency on jboss-seam
- <dependency>
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.0.GA</version>
- </dependency>
- -->
- <!-- Don't think this is needed with latest version of Seam
- <dependency>
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-el-api</artifactId>
- <version>2.0.0.GA</version>
- <scope>provided</scope>
- </dependency>
- -->
<!-- Provided in 5.0 -->
<dependency>
<groupId>javax.el</groupId>
@@ -250,24 +168,14 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
- <!--Needed for 4.0.5, not for 4.2-->
- <!--<dependency>-->
- <!--<groupId>com.sun.el</groupId>-->
- <!--<artifactId>el-ri</artifactId>-->
- <!--<version>1.0</version>-->
- <!--</dependency>-->
- <!-- needed for JBAS5.Beta1 deployment -->
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- ===== RichFaces ===== -->
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
@@ -283,30 +191,7 @@
<artifactId>richfaces-ui</artifactId>
<version>${richfaces.version}</version>
</dependency>
- <!--need this to deploy in 5.0??
- TODO check if this is necessary -->
- <!-- This is not needed for 4.2 - commenting out-->
- <!--<dependency>-->
- <!--<groupId>commons-digester</groupId>-->
- <!--<artifactId>commons-digester</artifactId>-->
- <!--<version>1.8</version>-->
- <!--</dependency>-->
- <!-- for JSF (SunRI)-->
- <!--TODO - figure out how to include the SunRI in our deploy-->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04-p02</version>
- <scope>provided</scope>
- <!-- in JBossAS 4.2-->
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04-p02</version>
- <scope>provided</scope>
- <!-- in JBossAS 4.2-->
- </dependency>
+
<!-- == 3rd Party Provided Dependencies ================ -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -338,9 +223,7 @@
</dependency>
</dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
- <finalName>${final.name}</finalName>
+ <build>
<plugins>
<plugin>
@@ -374,108 +257,6 @@
</plugin>
<plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <!-- IMPORTANT: Use enforce goal, rather than enforce-once goal, otherwise reactor
- builds will fail due to http://jira.codehaus.org/browse/MENFORCER-11 -->
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>(1.5,1.6]</version>
- <!-- 1.5.x -->
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <updateDependencies>false</updateDependencies>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <ideaVersion>6.x</ideaVersion>
- <downloadJavadocs>true</downloadJavadocs>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-test-plugins</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>
- target/itest/plugins
- </outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>
- rhq-platform-plugin
- </artifactId>
- <version>${rhq.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-mock-jboss-plugin</artifactId>
- <version>${rhq.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>
- rhq-jmx-plugin
- </artifactId>
- <version>${rhq.version}</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- NOTE: I think the below block can be entirely removed. It doesn't make sense to deploy the
- embedded jar in the plugins dir, and the tests pass without it. (ips, 10/08/07) -->
- <!--
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/itest/plugins" />
- <copy file="target/${project.artifactId}-${project.version}.jar" toDir="target/itest/plugins" verbose="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<useCache>false</useCache>
@@ -519,42 +300,7 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
- <!--
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-1-jboss-1</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/jbas4/pom.xml
===================================================================
--- trunk/jbas4/pom.xml 2008-10-16 23:06:28 UTC (rev 7)
+++ trunk/jbas4/pom.xml 2008-10-17 13:34:54 UTC (rev 8)
@@ -20,23 +20,33 @@
<packaging>war</packaging>
<name>JBossAS 4.x Administration Console</name>
+ <scm>
+ <connection>scm:svn:http://svn.jboss.org/repos/embjopr/trunk/jbas4/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas4/</developerConnection>
+ </scm>
+
<properties>
<jopr-embedded-core.version>1.1.0-SNAPSHOT</jopr-embedded-core.version>
<warDir>${basedir}/target/${project.build.finalName}</warDir>
<warFile>${warDir}.war</warFile>
- <rhq.groupId>org.rhq</rhq.groupId>
- <jon.groupId>org.jboss.on</jon.groupId>
- <jon.version>2.2.0-SNAPSHOT</jon.version>
- <rhq.version>1.2.0-SNAPSHOT</rhq.version>
</properties>
<dependencies>
+
<dependency>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-core</artifactId>
<version>${jopr-embedded-core.version}</version>
<type>war</type>
</dependency>
+
+ <!--Needed for 4.0.5, not for 4.2-->
+ <!--<dependency>-->
+ <!--<groupId>com.sun.el</groupId>-->
+ <!--<artifactId>el-ri</artifactId>-->
+ <!--<version>1.0</version>-->
+ <!--</dependency>-->
+
</dependencies>
<build>
@@ -126,40 +136,5 @@
-->
</plugins>
</build>
-
- <repositories>
-
- <repository>
- <id>jboss</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
- <pluginRepositories>
-
- <pluginRepository>
- <id>jboss</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- </pluginRepositories>
-
</project>
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2008-10-16 23:06:28 UTC (rev 7)
+++ trunk/jbas5/pom.xml 2008-10-17 13:34:54 UTC (rev 8)
@@ -20,19 +20,19 @@
<packaging>war</packaging>
<name>JBossAS 5.x Administration Console</name>
+ <scm>
+ <connection>scm:svn:http://svn.jboss.org/repos/embjopr/trunk/jbas5/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas5/</developerConnection>
+ </scm>
+
<properties>
<jopr-embedded-core.version>1.1.0-SNAPSHOT</jopr-embedded-core.version>
<warDir>${basedir}/target/${project.build.finalName}</warDir>
<warFile>${warDir}.war</warFile>
- <rhq.groupId>org.rhq</rhq.groupId>
- <jon.groupId>org.jboss.on</jon.groupId>
- <jon.version>2.2.0-SNAPSHOT</jon.version>
- <rhq.version>1.2.0-SNAPSHOT</rhq.version>
- <seam.groupId>org.jboss.seam</seam.groupId>
- <seam.version>2.0.2.SP1</seam.version>
</properties>
<dependencies>
+
<dependency>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-core</artifactId>
@@ -56,7 +56,23 @@
<artifactId>jboss-vfs</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
+
+ <!-- needed for JBAS5.Beta1 deployment -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+
+ <!--need this to deploy in 5.0??
+ TODO check if this is necessary -->
+ <!--<dependency>-->
+ <!--<groupId>commons-digester</groupId>-->
+ <!--<artifactId>commons-digester</artifactId>-->
+ <!--<version>1.8</version>-->
+ <!--</dependency>-->
+
</dependencies>
<build>
@@ -136,40 +152,5 @@
-->
</plugins>
</build>
-
- <repositories>
-
- <repository>
- <id>jboss</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
- <pluginRepositories>
-
- <pluginRepository>
- <id>jboss</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- </pluginRepositories>
-
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-10-16 23:06:28 UTC (rev 7)
+++ trunk/pom.xml 2008-10-17 13:34:54 UTC (rev 8)
@@ -20,13 +20,13 @@
<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>
- <!-- NOTE: We extend the RHQ parent pom, because we essentially want all the same
- base settings - plugins, dependencies, etc. -->
- <parent>
+ <!-- NOTE: We extend the RHQ parent pom, because we essentially want all the same
+ base settings - plugins, dependencies, etc. -->
+ <parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
<version>1.2.0-SNAPSHOT</version>
- </parent>
+ </parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
@@ -42,7 +42,7 @@
<scm>
<connection>scm:svn:http://svn.jboss.org/repos/embjopr/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/</developerConnection>
</scm>
<issueManagement>
@@ -141,7 +141,9 @@
</build>
<modules>
- <module>modules</module>
+ <module>core</module>
+ <module>jbas4</module>
+ <module>jbas5</module>
</modules>
<repositories>
@@ -176,6 +178,15 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
+
+ <pluginRepository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
More information about the embjopr-commits
mailing list