jvanzyl 2002/07/16 01:02:41
Modified: . jars.list project.xml
src/java/org/apache/maven ProjectVerifier.java
src/plugins-build/jdepend project.xml
Log:
o Update the project verifier to use the DefaultJarArtifact
o Checkstyle plugin is now self-contained
o Updating the jars.list and the project.xml to remove dependencies
that are now plugin dependencies.
Revision Changes Path
1.47 +0 -5 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- jars.list 16 Jul 2002 05:53:42 -0000 1.46
+++ jars.list 16 Jul 2002 08:02:40 -0000 1.47
@@ -23,9 +23,6 @@
#-------------------------------------------------------------------------
ant/jars/ant-1.4.1.jar
ant/jars/ant-optional-1.4.1.jar
-antlr/jars/antlrall-2.7.1.jar
-bcel/jars/bcel-5.0.jar
-checkstyle/jars/checkstyle-2.2.jar
commons-beanutils/jars/commons-beanutils-1.4-dev.jar
commons-betwixt/jars/commons-betwixt-1.0-dev.jar
commons-cli/jars/commons-cli-1.0-dev.jar
@@ -45,8 +42,6 @@
junit/jars/junit-3.7.jar
logkit/jars/logkit-1.0.1.jar
log4j/jars/log4j-1.1.3.jar
-oro/jars/oro-2.0.6.jar
-regexp/jars/regexp-1.2.jar
velocity/jars/velocity-1.4-dev.jar
velocity-dvsl/jars/velocity-dvsl-0.43.20020711.010949.jar
xerces/jars/xerces-2.0.0.jar
1.156 +0 -71 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- project.xml 16 Jul 2002 05:53:43 -0000 1.155
+++ project.xml 16 Jul 2002 08:02:40 -0000 1.156
@@ -328,12 +328,6 @@
</dependency>
<dependency>
- <id>bcel</id>
- <version>5.0</version>
- <url>http://jakarta.apache.org/bcel/</url>
- </dependency>
-
- <dependency>
<id>commons-betwixt</id>
<version>1.0-dev</version>
<url>http://jakarta.apache.org/commons/betwixt/</url>
@@ -375,12 +369,6 @@
</dependency>
<dependency>
- <id>oro</id>
- <version>2.0.6</version>
- <url>http://jakarta.apache.org/oro/</url>
- </dependency>
-
- <dependency>
<id>velocity</id>
<version>1.4-dev</version>
<url>http://jakarta.apache.org/velocity/</url>
@@ -473,65 +461,6 @@
<version>2.2</version>
<url>http://www.clarkware.com/software/JDepend.html</url>
</dependency>
-
- <!-- maven:pdf requirements
- <dependency>
- <id>fop</id>
- <version>0.20.3</version>
- <url>http://xml.apache.org/fop/</url>
- </dependency>
-
- <dependency>
- <id>batik</id>
- <version>1.0</version>
- <url>http://xml.apache.org/batik/</url>
- </dependency>
-
- <dependency>
- <id>logkit</id>
- <version>1.0.1</version>
- <url>http://jakarta.apache.org/avalon/logkit/</url>
- </dependency>
-
- <dependency>
- <id>avalon-framework</id>
- <version>4.0</version>
- <url>http://jakarta.apache.org/avalon/</url>
- </dependency>
-
- <dependency>
- <id>xerces</id>
- <version>1.2.3</version>
- <url>http://xml.apache.org/xerces/</url>
- </dependency>
-
- <dependency>
- <id>xalan</id>
- <version>2.0.0</version>
- <url>http://xml.apache.org/xalan/</url>
- </dependency>
- -->
-
- <!-- the following are all required for checkstyle to work -->
- <dependency>
- <id>checkstyle</id>
- <version>2.2</version>
- <url>http://checkstyle.sourceforge.net/</url>
- </dependency>
-
- <dependency>
- <id>antlr</id>
- <version>2.7.1</version>
- <jar>antlrall-2.7.1.jar</jar>
- <url>http://www.antlr.org/</url>
- </dependency>
-
- <dependency>
- <id>regexp</id>
- <version>1.2</version>
- <url>http://jakarta.apache.org/regexp/</url>
- </dependency>
- <!-- end checkstyle requirements -->
<!-- Build dependency only -->
<!--
1.18 +14 -2
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java
Index: ProjectVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProjectVerifier.java 14 Jul 2002 15:51:23 -0000 1.17
+++ ProjectVerifier.java 16 Jul 2002 08:02:40 -0000 1.18
@@ -76,6 +76,9 @@
import org.apache.maven.project.Dependency;
import org.apache.maven.util.HttpUtils;
+// Temporary
+import org.apache.maven.repository.DefaultJarArtifact;
+
/**
* Make sure that everything that is required for the project to build
* successfully is present. We will start by looking at the dependencies
@@ -264,9 +267,18 @@
Dependency dependency = (Dependency) i.next();
String jar = dependency.getJar();
- File jarFile = new File(getMavenLocalRepo() + "/"
+ /*
+ File jarFile = new File(getMavenLocalRepo() + "/"
+ dependency.getId() + "/jars/", jar);
+ */
+
+ DefaultJarArtifact dfa = new DefaultJarArtifact();
+ File jarFile = new File(getMavenLocalRepo(),
+ dfa.getPath(dependency.getId(),
+ dependency.getVersion(),
+ dependency.getJar()));
+
if (jarFile.exists() == false || jar.endsWith("SNAPSHOT.jar"))
{
// The directory structure for this project may
1.2 +2 -10 jakarta-turbine-maven/src/plugins-build/jdepend/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jul 2002 19:09:20 -0000 1.1
+++ project.xml 16 Jul 2002 08:02:41 -0000 1.2
@@ -46,16 +46,8 @@
<dependencies>
<dependency>
- <id>ant</id>
- <version>1.4.1</version>
- <metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
- </metaEntries>
- </dependency>
-
- <dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
+ <id>jdepend</id>
+ <version>2.2</version>
<metaEntries>
<metaEntry>classloader:root.maven</metaEntry>
</metaEntries>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
