brett 2004/05/10 16:38:03
Modified: antlr project.xml
codeswitcher project.xml
dist project.xml
docbook project.xml
examples/plugin-script project.xml
jalopy plugin.jelly project.xml
javadoc project.xml
jcoverage project.xml
jdeveloper project.xml
jdiff project.xml
latex plugin.jelly project.xml
native plugin.jelly project.xml
Log:
remove uses of root classloader that are unnecessary
Revision Changes Path
1.30 +0 -8 maven-plugins/antlr/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/antlr/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 2 May 2004 12:34:56 -0000 1.29
+++ project.xml 10 May 2004 23:38:02 -0000 1.30
@@ -73,14 +73,6 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-antlr</artifactId>
<version>20030211.143720</version>
1.28 +0 -13 maven-plugins/codeswitcher/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/codeswitcher/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 2 May 2004 13:39:34 -0000 1.27
+++ project.xml 10 May 2004 23:38:02 -0000 1.28
@@ -60,18 +60,5 @@
</developer>
</developers>
<dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- </dependency>
</dependencies>
</project>
1.25 +0 -15 maven-plugins/dist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 2 May 2004 13:44:56 -0000 1.24
+++ project.xml 10 May 2004 23:38:02 -0000 1.25
@@ -66,19 +66,4 @@
</roles>
</developer>
</developers>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
</project>
1.30 +0 -13 maven-plugins/docbook/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/docbook/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 2 May 2004 13:45:38 -0000 1.29
+++ project.xml 10 May 2004 23:38:02 -0000 1.30
@@ -58,19 +58,6 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.4.1</version>
1.7 +2 -3 maven-plugins/examples/plugin-script/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/examples/plugin-script/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 4 Mar 2004 18:05:27 -0000 1.6
+++ project.xml 10 May 2004 23:38:02 -0000 1.7
@@ -71,14 +71,13 @@
<!-- jar files the project is dependent on -->
<dependencies>
+<!--
<dependency>
<groupId>bsh</groupId>
<artifactId>bsh</artifactId>
<version>1.2-b3</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
+-->
</dependencies>
<!-- build information for the project -->
1.6 +1 -3 maven-plugins/jalopy/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jalopy/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 4 Mar 2004 18:31:20 -0000 1.5
+++ plugin.jelly 10 May 2004 23:38:03 -0000 1.6
@@ -36,13 +36,11 @@
classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
<ant:classpath>
<ant:pathelement path="${plugin.getDependencyPath('jalopy')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('jalopy-ant')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('jalopy:jalopy-ant')}"/>
<ant:pathelement path="${plugin.getDependencyPath('aelfred')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('jaxp')}"/>
<ant:pathelement path="${plugin.getDependencyPath('jdom')}"/>
<ant:pathelement path="${plugin.getDependencyPath('log4j')}"/>
<ant:pathelement path="${plugin.getDependencyPath('oro')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('sax')}"/>
<ant:pathelement path="${plugin.getDependencyPath('textarea')}"/>
</ant:classpath>
</ant:taskdef>
1.32 +0 -29 maven-plugins/jalopy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jalopy/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 2 May 2004 14:01:09 -0000 1.31
+++ project.xml 10 May 2004 23:38:03 -0000 1.32
@@ -78,52 +78,29 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
<groupId>jalopy</groupId>
<artifactId>jalopy</artifactId>
<version>1.0b10</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>jalopy</groupId>
<artifactId>jalopy-ant</artifactId>
<version>0.6.1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>aelfred</groupId>
<artifactId>aelfred</artifactId>
<version>1.2</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0b8</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -134,17 +111,11 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.7</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>textarea</groupId>
<artifactId>textarea</artifactId>
<version>2.2.3</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
</project>
1.32 +0 -8 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 2 May 2004 14:06:38 -0000 1.31
+++ project.xml 10 May 2004 23:38:03 -0000 1.32
@@ -101,14 +101,6 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
1.20 +0 -3 maven-plugins/jcoverage/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 2 May 2004 14:16:25 -0000 1.19
+++ project.xml 10 May 2004 23:38:03 -0000 1.20
@@ -78,9 +78,6 @@
<groupId>jcoverage</groupId>
<artifactId>jcoverage</artifactId>
<version>1.0.5</version>
- <properties>
- <classloader>root</classloader>
- </properties>
<url>http://www.jcoverage.com</url>
</dependency>
<dependency>
1.30 +0 -3 maven-plugins/jdeveloper/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jdeveloper/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 2 May 2004 14:16:24 -0000 1.29
+++ project.xml 10 May 2004 23:38:03 -0000 1.30
@@ -54,9 +54,6 @@
<groupId>jdepend</groupId>
<artifactId>jdepend</artifactId>
<version>2.3</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
<versions>
1.25 +1 -3 maven-plugins/jdiff/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jdiff/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 2 May 2004 14:16:25 -0000 1.24
+++ project.xml 10 May 2004 23:38:03 -0000 1.25
@@ -20,6 +20,7 @@
<project>
<extend>../plugin-parent/project.xml</extend>
+<package>blah</package>
<pomVersion>3</pomVersion>
<id>maven-jdiff-plugin</id>
<name>Maven JDiff Plugin</name>
@@ -72,9 +73,6 @@
<groupId>jdiff</groupId>
<artifactId>jdiff</artifactId>
<version>1.0.9</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
</project>
1.6 +5 -1 maven-plugins/latex/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/latex/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 4 Mar 2004 18:36:31 -0000 1.5
+++ plugin.jelly 10 May 2004 23:38:03 -0000 1.6
@@ -38,7 +38,11 @@
description="Generate documentation from latex source">
<j:if test="${!latexSrcDir.equals('MAVEN_LATEX_SRC_DIR_NOT_SET')}">
- <ant:taskdef name="latex" classname="de.prima.shire.anttex.LaTeX"/>
+ <ant:path id="latex.classpath">
+ <ant:pathelement location="${plugin.getDependencyPath('anttex:anttex')}" />
+ <ant:pathelement
location="${plugin.getDependencyPath('commons-lang:commons-lang')}" />
+ </ant:path>
+ <ant:taskdef name="latex" classname="de.prima.shire.anttex.LaTeX"
classpathref="latex.classpath" />
<ant:echo>scanning: ${latexSrcDir}</ant:echo>
<ant:copy todir="${maven.build.dir}/latex">
1.28 +0 -11 maven-plugins/latex/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/latex/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 2 May 2004 14:16:25 -0000 1.27
+++ project.xml 10 May 2004 23:38:03 -0000 1.28
@@ -64,14 +64,6 @@
</developers>
<dependencies>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>1.0.1</version>
@@ -80,9 +72,6 @@
<groupId>anttex</groupId>
<artifactId>anttex</artifactId>
<version>1.0</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
</project>
1.10 +7 -3 maven-plugins/native/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/native/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 8 May 2004 01:16:02 -0000 1.9
+++ plugin.jelly 10 May 2004 23:38:03 -0000 1.10
@@ -31,9 +31,13 @@
<goal name="native:compile" description="Compile the native compiler"
prereqs="native:jniheader">
- <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
- <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
- <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
+ <path id="native.classpath">
+ <pathelement
location="${plugin.getDependencyPath('ant-contrib:cpptasks')}" />
+ <pathelement location="${plugin.getDependencyPath('bcel:bcel')}" />
+ </path>
+ <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"
classpathref="native.classpath"/>
+ <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"
classpathref="native.classpath"/>
+ <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"
classpathref="native.classpath"/>
<ant:echo> Real Java Home = '${java.home}/..'
artifactId = '${pom.artifactId}' </ant:echo>
1.18 +0 -6 maven-plugins/native/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/native/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 8 May 2004 01:16:02 -0000 1.17
+++ project.xml 10 May 2004 23:38:03 -0000 1.18
@@ -66,17 +66,11 @@
<groupId>ant-contrib</groupId>
<artifactId>cpptasks</artifactId>
<version>20030309.134440</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
<dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
<version>5.0</version>
- <properties>
- <classloader>root</classloader>
- </properties>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
