You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/12 06:44:46 UTC
cvs commit: jakarta-turbine-maven/src/test/java/org/apache/maven/project DependencyTest.java
jvanzyl 2003/01/11 21:44:46
Modified: src/plugins-build/ant plugin.jelly
src/plugins-build/idea plugin.jelly
src/plugins-build/uberjar plugin.jelly
src/test/java/org/apache/maven/project DependencyTest.java
Log:
o Changing several plugins to use ${dep.artifactDirectory} instead of
${deg.projectId}.
o IDEA plugin will now use the ${java.version} value to pick the JVM
to use.
o Update dep test now that getProjectId has been removed.
Revision Changes Path
1.25 +1 -1 jakarta-turbine-maven/src/plugins-build/ant/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ant/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 2 Jan 2003 14:57:13 -0000 1.24
+++ plugin.jelly 12 Jan 2003 05:44:46 -0000 1.25
@@ -311,7 +311,7 @@
<j:forEach var="dep" items="${pom.dependencies}">
<get
- src="${maven.repo.remote}/${dep.projectId}/jars/${dep.getArtifact()}"
+ src="${maven.repo.remote}/${dep.artifactDirectory}/jars/${dep.artifact}"
dest="lib/${dep.getArtifact()}"
usetimestamp="true"
ignoreerrors="true"
1.4 +5 -5 jakarta-turbine-maven/src/plugins-build/idea/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/idea/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 4 Jan 2003 06:38:28 -0000 1.3
+++ plugin.jelly 12 Jan 2003 05:44:46 -0000 1.4
@@ -17,7 +17,7 @@
<j:file name="${basedir}/${pom.id}.ipr" prettyPrint="true" xmlns="dummy">
<project version="3" relativePaths="false">
<component name="ProjectRootManager" version="2">
- <jdk name="java version "1.4.0_01""/>
+ <jdk name="java version "${java.version}""/>
<projectPath>
<root type="composite">
<root type="simple" url="file://$PROJECT_DIR$"/>
@@ -27,21 +27,21 @@
<root type="composite">
<root type="simple" url="file://$$PROJECT_DIR$$/${pom.build.sourceDirectory}"/>
<root type="simple" url="file://$$PROJECT_DIR$$/${pom.build.unitTestSourceDirectory}"/>
- <root type="jdk" rootType="sourcePath" name="java version "1.4.0_01""/>
+ <root type="jdk" rootType="sourcePath" name="java version "${java.version}""/>
</root>
</sourcePath>
<classPath>
<root type="composite">
- <root type="jdk" rootType="classPath" name="java version "1.4.0_01""/>
+ <root type="jdk" rootType="classPath" name="java version "${java.version}""/>
<root type="output"/>
<j:forEach var="lib" items="${pom.dependencies}">
- <root type="simple" url="jar://${maven.repo.local}/${lib.getProjectId()}/jars/${lib.getArtifact()}!/"/>
+ <root type="simple" url="jar://${maven.repo.local}/${lib.getArtifactDirectory()}/jars/${lib.getArtifact()}!/"/>
</j:forEach>
</root>
</classPath>
<javadocPath>
<root type="composite">
- <root type="jdk" rootType="javadocPath" name="java version "1.4.0_01""/>
+ <root type="jdk" rootType="javadocPath" name="java version "${java.version}""/>
</root>
</javadocPath>
<assert_keyword enabled="no"/>
1.9 +1 -1 jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 7 Jan 2003 23:02:10 -0000 1.8
+++ plugin.jelly 12 Jan 2003 05:44:46 -0000 1.9
@@ -54,7 +54,7 @@
<j:forEach var="dep" items="${pom.dependencies}">
<copy
todir="${libdir}"
- file="${maven.repo.local}/${dep.projectId}/jars/${dep.artifact}"/>
+ file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
</j:forEach>
<!-- Copy the classworlds.jar -->
1.3 +0 -13 jakarta-turbine-maven/src/test/java/org/apache/maven/project/DependencyTest.java
Index: DependencyTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/DependencyTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependencyTest.java 9 Dec 2002 05:59:00 -0000 1.2
+++ DependencyTest.java 12 Jan 2003 05:44:46 -0000 1.3
@@ -77,19 +77,6 @@
// JUnitDoclet end method setGroupId getGroupId
}
- public void testSetGetProjectId() throws Exception
- {
- // JUnitDoclet begin method setProjectId getProjectId
- java.lang.String[] tests = {"", " ", "a", "A", "�", "�", "0123456789", "012345678901234567890", "\n", null};
-
- for ( int i = 0; i < tests.length; i++ )
- {
- dependency.setProjectId( tests[i] );
- assertEquals( tests[i], dependency.getProjectId() );
- }
- // JUnitDoclet end method setProjectId getProjectId
- }
-
public void testSetGetArtifact() throws Exception
{
/*