You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/09/01 08:30:48 UTC
svn commit: r690859 [1/6] - in /geronimo/server/trunk: ./
assemblies/geronimo-jetty6-javaee5/ buildsupport/car-maven-plugin/
buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
buildsupport/car-maven-plugin/src/test/java/o...
Author: djencks
Date: Sun Aug 31 23:30:25 2008
New Revision: 690859
URL: http://svn.apache.org/viewvc?rev=690859&view=rev
Log:
GERONIMO-4239, sort of. Use transitive depenedencies in c-m-p everywhere. This may break stuff.... let me know
Added:
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java (with props)
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java (with props)
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java (with props)
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
geronimo/server/trunk/framework/configs/client-system/pom.xml
geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/gshell-framework/pom.xml
geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml
geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/gshell-remote/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jee-specs/pom.xml
geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jmx-security/pom.xml
geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/plugin/pom.xml
geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/server-security-config/pom.xml
geronimo/server/trunk/framework/configs/shutdown/pom.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/transformer-agent/pom.xml
geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/upgrade/pom.xml
geronimo/server/trunk/framework/configs/xmlbeans/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanOperation.java
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
geronimo/server/trunk/plugins/axis/axis-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis/axis/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/client/client-deployer/pom.xml
geronimo/server/trunk/plugins/client/client-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/client/client/pom.xml
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
geronimo/server/trunk/plugins/clustering/clustering/pom.xml
geronimo/server/trunk/plugins/clustering/farming/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml
geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java
geronimo/server/trunk/plugins/console/console-jetty/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java
geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
geronimo/server/trunk/plugins/jasper/jasper/pom.xml
geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
geronimo/server/trunk/plugins/javamail/javamail/pom.xml
geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty/pom.xml
geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml
geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
geronimo/server/trunk/plugins/openejb/openejb/pom.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/spring/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValve.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/StaticMemberGBean.java
geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,6 +46,20 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jsr88-cli</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jsr88-deploymentfactory</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
<!--
HACK: This is currently included from geronimo-framework, which is not really
desirable, once the problems related to this are fixed, enable this plugin here.
@@ -102,20 +116,6 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-deploymentfactory</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Sun Aug 31 23:30:25 2008
@@ -59,7 +59,7 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0</version>
+ <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Sun Aug 31 23:30:25 2008
@@ -122,10 +122,7 @@
*/
private ArtifactCollector artifactCollector;
- /**
- * The computed dependency tree root node of the Maven project.
- */
- private DependencyNode rootNode;
+ protected String treeListing;
//
// MojoSupport Hooks
@@ -251,6 +248,7 @@
DependencyTreeResolutionListener listener = new DependencyTreeResolutionListener(getLogger());
+ DependencyNode rootNode;
try {
Map managedVersions = project.getManagedVersionMap();
@@ -277,7 +275,7 @@
Scanner scanner = new Scanner();
scanner.scan(rootNode, useTransitiveDependencies);
localDependencies = scanner.localDependencies;
-
+ treeListing = scanner.getLog();
}
public void setLog(Log log) {
@@ -305,14 +303,14 @@
return new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version, type);
}
- protected LinkedHashSet<Dependency> toDependencies(Collection<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
+ protected LinkedHashSet<Dependency> toDependencies(Collection<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies, boolean includeImport) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
LinkedHashSet<Dependency> dependencies = new LinkedHashSet<Dependency>();
if (useMavenDependencies == null || !useMavenDependencies.isValue()) {
dependencies.addAll(listedDependencies);
} else {
Map<String, Dependency> explicitDependencyMap = new HashMap<String, Dependency>();
- for (Dependency dependency : dependencies) {
+ for (Dependency dependency : listedDependencies) {
explicitDependencyMap.put(getKey(dependency), dependency);
}
@@ -320,21 +318,21 @@
getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
for (org.apache.maven.artifact.Artifact artifact: localDependencies) {
Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
- dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency));
+ dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport));
}
}
return dependencies;
}
- private Dependency toDependency(Artifact artifact, boolean includeVersion, Dependency explicitDependency) {
+ private Dependency toDependency(Artifact artifact, boolean includeVersion, Dependency explicitDependency, boolean includeImport) {
Dependency dependency = new Dependency();
dependency.setGroupId(artifact.getGroupId());
dependency.setArtifactId(artifact.getArtifactId());
dependency.setVersion(includeVersion ? artifact.getVersion() : null);
dependency.setType(artifact.getType());
String importType = ImportType.ALL.getName();
- if (explicitDependency != null && explicitDependency.getImport() != null) {
+ if (includeImport && explicitDependency != null && explicitDependency.getImport() != null) {
importType = explicitDependency.getImport();
}
dependency.setImport(importType);
@@ -384,40 +382,57 @@
}
}
- //all the dependencies, including provided and their dependencies
- private final Set<Artifact> dependencies = new HashSet<Artifact>();
//all the dependencies needed for this car, with provided dependencies removed
private final Set<Artifact> localDependencies = new HashSet<Artifact>();
//dependencies from ancestor cars, to be removed from localDependencies.
private final Set<Artifact> carDependencies = new HashSet<Artifact>();
+ private final StringBuilder log = new StringBuilder();
+
public void scan(DependencyNode rootNode, boolean useTransitiveDependencies) {
for (DependencyNode child : (List<DependencyNode>) rootNode.getChildren()) {
- scan(child, localDependencies, carDependencies, Accept.ACCEPT, useTransitiveDependencies);
+ scan(child, Accept.ACCEPT, useTransitiveDependencies, false, "");
}
if (useTransitiveDependencies) {
localDependencies.removeAll(carDependencies);
}
}
- private void scan(DependencyNode rootNode, Set<Artifact> localDependencies, Set<Artifact> carDependencies, Accept accept, boolean useTransitiveDependencies) {
+ private void scan(DependencyNode rootNode, Accept parentAccept, boolean useTransitiveDependencies, boolean isFromCar, String indent) {
Artifact artifact = getArtifact(rootNode);
- accept = accept(artifact, accept);
+ Accept accept = accept(artifact, parentAccept);
if (accept.isContinue()) {
- dependencies.add(artifact);
- if (accept.isLocal()) {
+// if (accept.isLocal()) {
+ if (isFromCar) {
+ if (!artifact.getType().equals("car")) {
+ log.append(indent).append("from car:").append(artifact).append("\n");
+ carDependencies.add(artifact);
+ } else {
+ log.append(indent).append("is car:").append(artifact).append("\n");
+ }
+ } else {
+ log.append(indent).append("local:").append(artifact).append("\n");
+ if (carDependencies.contains(artifact)) {
+ log.append(indent).append("already in car, returning:").append(artifact).append("\n");
+ return;
+ }
localDependencies.add(artifact);
if (artifact.getType().equals("car") || !useTransitiveDependencies) {
- localDependencies = carDependencies;
+ isFromCar = true;
+// localDependencies = carDependencies;
}
}
for (DependencyNode child : (List<DependencyNode>) rootNode.getChildren()) {
- scan(child, localDependencies, carDependencies, accept, useTransitiveDependencies);
+ scan(child, accept, useTransitiveDependencies, isFromCar, indent + " ");
}
}
}
+ public String getLog() {
+ return log.toString();
+ }
+
private Artifact getArtifact(DependencyNode rootNode) {
Artifact artifact = rootNode.getArtifact();
if (rootNode.getRelatedArtifact() != null) {
@@ -434,9 +449,9 @@
if (scope == null || "runtime".equalsIgnoreCase(scope) || "compile".equalsIgnoreCase(scope)) {
return previous;
}
- if ("provided".equalsIgnoreCase(scope)) {
- return Accept.PROVIDED;
- }
+// if ("provided".equalsIgnoreCase(scope)) {
+// return Accept.PROVIDED;
+// }
return Accept.STOP;
}
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/DependencyChangeMojo.java Sun Aug 31 23:30:25 2008
@@ -59,7 +59,7 @@
* Whether to fail on changed dependencies
* @parameter
*/
- private boolean failOnChange=true;
+ private boolean warnOnDependencyChange;
/**
* Location of existing dependency file.
@@ -76,14 +76,13 @@
*
* @parameter
*/
- private UseMavenDependencies useMavenDependencies;
+ private UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, true);
public void execute() throws MojoExecutionException, MojoFailureException {
- boolean useTransitiveDependencies = useMavenDependencies == null || useMavenDependencies.isUseTransitiveDependencies();
- UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, useTransitiveDependencies);
+ UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, this.useMavenDependencies.isUseTransitiveDependencies());
try {
- Collection<Dependency> dependencies = toDependencies(this.dependencies, useMavenDependencies);
+ Collection<Dependency> dependencies = toDependencies(this.dependencies, useMavenDependencies, false);
if (dependencyFile.exists()) {
//read dependency types, convert to dependenciees, compare.
FileReader in = new FileReader(dependencyFile);
@@ -102,7 +101,6 @@
writeDependencies(added, addedFile);
File removedFile = new File(dependencyFile.getParentFile(), "dependencies.removed.xml");
writeDependencies(removed, removedFile);
- if (failOnChange) {
StringWriter out = new StringWriter();
out.write("Dependencies have changed:\n");
if (!added.getDependency().isEmpty()) {
@@ -113,8 +111,12 @@
out.write("removed:\n");
PluginXmlUtil.writePluginArtifact(removed, out);
}
- throw new MojoFailureException(out.toString());
- }
+ out.write(treeListing);
+ if (warnOnDependencyChange) {
+ getLog().warn(out.toString());
+ } else {
+ throw new MojoFailureException(out.toString());
+ }
}
} finally {
in.close();
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java Sun Aug 31 23:30:25 2008
@@ -108,7 +108,7 @@
*
* @parameter
*/
- private UseMavenDependencies useMavenDependencies;
+ UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, true);
private VelocityContext createContext() {
VelocityContext context = new VelocityContext();
@@ -267,7 +267,7 @@
protected LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> toKernelDependencies(List<Dependency> listedDependencies, UseMavenDependencies useMavenDependencies) throws InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency> kernelDependencies = new LinkedHashSet<org.apache.geronimo.kernel.repository.Dependency>();
- LinkedHashSet<Dependency> dependencies = toDependencies(listedDependencies, useMavenDependencies);
+ LinkedHashSet<Dependency> dependencies = toDependencies(listedDependencies, useMavenDependencies, true);
for (Dependency dependency: dependencies) {
kernelDependencies.add(dependency.toKernelDependency());
}
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java Sun Aug 31 23:30:25 2008
@@ -26,15 +26,12 @@
import java.io.StringReader;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
import java.util.LinkedHashSet;
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.system.plugin.PluginXmlUtil;
import org.apache.geronimo.system.plugin.model.ArtifactType;
-import org.apache.geronimo.system.plugin.model.DependencyType;
import org.apache.geronimo.system.plugin.model.LicenseType;
import org.apache.geronimo.system.plugin.model.PluginArtifactType;
import org.apache.geronimo.system.plugin.model.PluginType;
@@ -127,7 +124,7 @@
*
* @parameter
*/
- private UseMavenDependencies useMavenDependencies;
+ private UseMavenDependencies useMavenDependencies = new UseMavenDependencies(true, false, true);
/**
* Shared configuration from parent that we merge since maven is incompetent at it. This is a plugin-artifactType element without moduleId or dependencies.
@@ -250,7 +247,7 @@
}
private void addDependencies(PluginArtifactType instance) throws InvalidConfigException, IOException, NoSuchConfigException, InvalidDependencyVersionException, ArtifactResolutionException, ProjectBuildingException, MojoExecutionException {
- LinkedHashSet<Dependency> resolvedDependencies = toDependencies(dependencies, useMavenDependencies);
+ LinkedHashSet<Dependency> resolvedDependencies = toDependencies(dependencies, useMavenDependencies, false);
for (Dependency dependency: resolvedDependencies) {
instance.getDependency().add(dependency.toDependencyType());
}
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/DependencyTest.java Sun Aug 31 23:30:25 2008
@@ -20,11 +20,13 @@
package org.apache.geronimo.mavenplugins.car;
+import java.util.LinkedHashSet;
+
import junit.framework.TestCase;
import org.apache.geronimo.system.plugin.model.DependencyType;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class DependencyTest extends TestCase {
@@ -34,6 +36,7 @@
assertTrue(d1.equals(d2));
d1.setStart(true);
assertTrue(d1.equals(d2));
+ assertTrue(d2.equals(d1));
d2.setStart(true);
assertTrue(d1.equals(d2));
Dependency d3 = newDependency(null);
@@ -43,6 +46,20 @@
Dependency d6 = newDependency("1.1");
assertTrue(d5.equals(d6));
}
+
+ public void testRemove() throws Exception {
+ Dependency d1 = newDependency(null);
+ Dependency d2 = newDependency(null);
+ d1.setStart(true);
+ LinkedHashSet<Dependency> dependencies = new LinkedHashSet<Dependency>();
+ dependencies.add(d1);
+ dependencies.remove(d2);
+ assertTrue(dependencies.isEmpty());
+ dependencies.add(d2);
+ dependencies.remove(d1);
+ assertTrue(dependencies.isEmpty());
+ }
+
public void testStart() throws Exception {
Dependency d1 = newDependency(null, null);
Dependency d2 = newDependency(null, null);
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java Sun Aug 31 23:30:25 2008
@@ -36,6 +36,7 @@
protected void setUp() throws Exception {
processorMojo = new PlanProcessorMojo();
+ processorMojo.useMavenDependencies = new UseMavenDependencies(false, false, false);
Model model = new Model();
MavenProject mavenProject = new MavenProject(model);
mavenProject.setGroupId("dummy-group");
Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Sun Aug 31 23:30:25 2008
@@ -91,7 +91,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -178,7 +178,7 @@
</element>
<element>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</element>
<element>
<groupId>org.apache.xbean</groupId>
@@ -192,10 +192,6 @@
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<config-xml-content load="false"/>
Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<type>jar</type>
@@ -27,23 +22,68 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -52,18 +92,23 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
+ <artifactId>geronimo-cli</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -22,41 +22,26 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- <type>jar</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>asm</groupId>-->
+ <!--<artifactId>asm-tree</artifactId>-->
+ <!--<type>jar</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
@@ -66,11 +51,11 @@
<artifactId>asm</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <type>jar</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>xpp3</groupId>-->
+ <!--<artifactId>xpp3</artifactId>-->
+ <!--<type>jar</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -91,16 +76,11 @@
<artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <type>jar</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>commons-lang</groupId>-->
+ <!--<artifactId>commons-lang</artifactId>-->
+ <!--<type>jar</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -43,13 +43,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- </dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deployment</artifactId>
@@ -90,41 +84,9 @@
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </dependency>
-
- <!-- needed by the plan -->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml Sun Aug 31 23:30:25 2008
@@ -103,7 +103,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -193,7 +193,7 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</element>
<element>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</element>
<element>
@@ -203,10 +203,6 @@
</classpath>
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<config-xml-content load = "false"/>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Sun Aug 31 23:30:25 2008
@@ -103,7 +103,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -193,7 +193,7 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</element>
<element>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</element>
<element>
@@ -271,7 +271,7 @@
<import>classes</import>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.1</version>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,8 +12,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-common</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/gshell-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-framework/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-framework/pom.xml Sun Aug 31 23:30:25 2008
@@ -72,11 +72,6 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </useMavenDependencies>
<config-xml-content load="false"/>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml Sun Aug 31 23:30:25 2008
@@ -89,11 +89,6 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </useMavenDependencies>
<config-xml-content load="false"/>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,68 +7,13 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-common</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-crypto</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>gshell-framework</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-cli</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <artifactId>geronimo-plugin</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -83,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-plugin</artifactId>
+ <artifactId>geronimo-deploy-tool</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -92,26 +37,11 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-tree</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-config</artifactId>
<type>jar</type>
@@ -122,13 +52,13 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-prefs</artifactId>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -152,28 +82,28 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-clp</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-commands</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-commands</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -182,6 +112,16 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all-minimal</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
<type>jar</type>
@@ -193,6 +133,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-framework</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-remote/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-remote/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-remote/pom.xml Sun Aug 31 23:30:25 2008
@@ -74,11 +74,6 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </useMavenDependencies>
<config-xml-content load="false"/>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Sun Aug 31 23:30:25 2008
@@ -89,11 +89,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->
- </useMavenDependencies>
<category>Security</category>
<instance>
<plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Sun Aug 31 23:30:25 2008
@@ -102,7 +102,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -122,6 +122,11 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
@@ -214,7 +219,7 @@
</element>
<element>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</element>
<element>
<groupId>org.apache.xbean</groupId>
@@ -228,10 +233,6 @@
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<config-xml-content load = "false"/>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -52,7 +52,7 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<type>jar</type>
</dependency>
@@ -82,6 +82,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<type>jar</type>
@@ -91,4 +96,46 @@
<artifactId>asm-commons</artifactId>
<type>jar</type>
</dependency>
+ <!-- in classpath: now also accessible from repo -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <type>jar</type>
+ </dependency>
+
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,10 +38,11 @@
<!-- geronimo-javaee-deployment_1.1MR3_spec is intentionally missing, it must be available earlier in the classpath
Hopefully we can eliminate this restriction in the future. -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
+ <!-- activation is needed in root cl to run jaxb -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -216,9 +217,6 @@
<deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
- <useMavenDependencies>
- <value>false</value>
- </useMavenDependencies>
<category>JavaEE</category>
<dependencies>
@@ -228,131 +226,6 @@
<type>car</type>
<import>classes</import>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-jdbc</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-concurrent_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
</dependencies>
</configuration>
Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -42,11 +42,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-jdbc</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/jmx-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jmx-security/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jmx-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jmx-security/pom.xml Sun Aug 31 23:30:25 2008
@@ -62,10 +62,6 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
</deploymentConfigs>
<category>Security</category>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<instance>
<plugin-artifact>
<config-xml-content load="false">
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,7 +38,8 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
- <scope>runtime</scope>
+ <!--<scope>runtime</scope>-->
+ <scope>provided</scope>
<version>${version}</version>
</dependency>
@@ -85,8 +86,10 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
+ <groupId>org.apache.geronimo.plugins.classloaders</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -113,7 +116,7 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
<dependency>
@@ -129,10 +132,6 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
<category>Deployment</category>
<instance>
<plugin-artifact>