You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2014/12/13 14:59:03 UTC
maven git commit: MNG-5719 reintroduced DefaultJavaToolChain
Repository: maven
Updated Branches:
refs/heads/master 44d06d890 -> d6e45a5d5
MNG-5719 reintroduced DefaultJavaToolChain
DefaultJavaToolChain was the only way to access JDK toolchain
javaHome parameter and was used by some clients, notably Tycho.
The class is now marked as deprecated and clients are adviced to
use JavaToolchainImpl instead.
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d6e45a5d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d6e45a5d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d6e45a5d
Branch: refs/heads/master
Commit: d6e45a5d56ab0facd36751ccee722db6a2006f50
Parents: 44d06d8
Author: Igor Fedorenko <if...@apache.org>
Authored: Sat Dec 13 08:39:08 2014 -0500
Committer: Igor Fedorenko <if...@apache.org>
Committed: Sat Dec 13 08:42:07 2014 -0500
----------------------------------------------------------------------
.../toolchain/java/DefaultJavaToolChain.java | 54 ++++++++++++++++++++
.../toolchain/java/JavaToolchainFactory.java | 5 +-
2 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d6e45a5d/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
new file mode 100644
index 0000000..a84847c
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
@@ -0,0 +1,54 @@
+package org.apache.maven.toolchain.java;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.toolchain.model.ToolchainModel;
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * Provides backwards compatibility with Maven 3.2.3 and earlier. Clients that do not require compatibility with Maven
+ * 3.2.3 and earlier are encouraged to use {@link JavaToolchainImpl}.
+ *
+ * @deprecated clients that do not require compatibility with Maven 3.2.3 and earlier should link to
+ * {@link JavaToolchainImpl} instead.
+ */
+public class DefaultJavaToolChain
+ extends JavaToolchainImpl
+{
+ public static final String KEY_JAVAHOME = JavaToolchainImpl.KEY_JAVAHOME;
+
+ public DefaultJavaToolChain( ToolchainModel model, Logger logger )
+ {
+ super( model, logger );
+ }
+
+ @Override
+ public String getJavaHome()
+ {
+ return super.getJavaHome();
+ }
+
+ @Override
+ public void setJavaHome( String javaHome )
+ {
+ super.setJavaHome( javaHome );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/d6e45a5d/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index 017caa6..cd4aef0 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -59,7 +59,10 @@ public class JavaToolchainFactory
return null;
}
- JavaToolchainImpl jtc = new JavaToolchainImpl( model, logger );
+ // use DefaultJavaToolChain for compatibility with maven 3.2.3 and earlier
+
+ @SuppressWarnings( "deprecation" )
+ JavaToolchainImpl jtc = new DefaultJavaToolChain( model, logger );
// populate the provides section
Properties provides = model.getProvides();