From 0cee304d372c934df741ecd247db1961a8a04145 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Tue, 22 Jan 2008 20:49:07 +0000 Subject: [PATCH] Restore JDK 1.4 compat, and add a profile to do a strict build that enforces the use of JDK 1.4. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614316 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/realm/RealmUtils.java | 10 ++--- pom.xml | 44 +++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java b/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java index 18806afdbd..9de80cc634 100644 --- a/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java +++ b/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java @@ -37,16 +37,16 @@ public final class RealmUtils public static String createExtensionRealmId( Artifact extensionArtifact ) { return "/extensions/" + extensionArtifact.getGroupId() + ":" - + extensionArtifact.getArtifactId() + ":" + extensionArtifact.getVersion() + - "/thread:" + Thread.currentThread().getId(); //add thread to the mix to prevent clashes in paralel execution + + extensionArtifact.getArtifactId() + ":" + extensionArtifact.getVersion() + + "/thread:" + Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution } public static String createProjectId( String projectGroupId, String projectArtifactId, String projectVersion ) { - return "/projects/" + projectGroupId + ":" + projectArtifactId + ":" + projectVersion + - "/thread:" + Thread.currentThread().getId(); //add thread to the mix to prevent clashes in paralel execution + return "/projects/" + projectGroupId + ":" + projectArtifactId + ":" + projectVersion + + "/thread:" + Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution } public static String createPluginRealmId( Plugin plugin ) @@ -87,7 +87,7 @@ public final class RealmUtils } id.append( '@' ).append( depId.toString().hashCode() ) - .append( "/thread:" ).append( Thread.currentThread().getId() ); //add thread to the mix to prevent clashes in paralel execution + .append( "/thread:" ).append( Thread.currentThread().getName() ); //add thread to the mix to prevent clashes in paralel execution return id.toString(); } diff --git a/pom.xml b/pom.xml index b53776752d..a1152127df 100644 --- a/pom.xml +++ b/pom.xml @@ -304,5 +304,49 @@ under the License. maven-core-it-runner + + strict + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-alpha-3 + + + enforce-jdk-14 + + enforce + + + + + [1.3,1.5.0) + + + + + + + + maven-compiler-plugin + 2.0.2 + + 1.4 + 1.4 + + + + org.codehaus.mojo + aspectj-maven-plugin + 1.0-beta-2 + + 1.4 + 1.4 + + + + +