You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2017/10/17 18:18:59 UTC
[1/2] maven git commit: Revert "[MNG-6275] Maven Embedder compatible
fix"
Repository: maven
Updated Branches:
refs/heads/master c19e9dcac -> 4b95ad9fc
Revert "[MNG-6275] Maven Embedder compatible fix"
This reverts commit 27a2bda3f4a8f5385c4cab360ed7365d3d3d3c09.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cae779e4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cae779e4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cae779e4
Branch: refs/heads/master
Commit: cae779e4fbc6565a581f2c6adf9fb15348005603
Parents: c19e9dc
Author: Stephen Connolly <st...@gmail.com>
Authored: Tue Oct 17 19:17:17 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Tue Oct 17 19:17:17 2017 +0100
----------------------------------------------------------------------
.../classrealm/DefaultClassRealmManager.java | 2 +-
.../DefaultClassRealmManagerTest.java | 107 -------------------
2 files changed, 1 insertion(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 013ab23..6ce1925 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -120,7 +120,7 @@ public class DefaultClassRealmManager
{
try
{
- ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER );
+ ClassRealm classRealm = world.newRealm( realmId, null );
if ( logger.isDebugEnabled() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
deleted file mode 100644
index 6d074b9..0000000
--- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.apache.maven.classrealm;
-
-/*
- * 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 java.util.ServiceLoader;
-
-import javax.script.ScriptEngineFactory;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.junit.Test;
-
-public class DefaultClassRealmManagerTest extends PlexusTestCase
-{
- private ClassRealmManager classRealmManager;
- private boolean haveScriptEngineFactory;
-
- @Override
- protected void setUp()
- throws Exception
- {
- super.setUp();
- this.classRealmManager = lookup( ClassRealmManager.class );
- ClassLoader testRealm = getClass().getClassLoader();
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, testRealm );
- // TODO switch to Assume.assumeTrue( sef.iterator().hasNext() ) when PlexusTestCase
- // supports assumptions. Not every Java 7 JRE has a ScriptEngineFactory.
- this.haveScriptEngineFactory = sef.iterator().hasNext();
- }
-
- @Override
- protected void customizeContainerConfiguration( ContainerConfiguration configuration )
- {
- configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
- }
-
- @Test
- public void testMNG6275_pluginRealmDefaultParentClassLoader()
- {
- Plugin plugin = new Plugin();
- plugin.setVersion( "VERSION" );
-
- ClassLoader parent = null;
-
- ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null );
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm );
- assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() );
- }
-
- @Test
- public void testMNG6275_extensionRealmDefaultParentClassLoader()
- {
- Plugin extension = new Plugin();
- extension.setVersion( "VERSION" );
-
- ClassRealm extensionRealm = classRealmManager.createExtensionRealm( extension, null );
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, extensionRealm );
- assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() );
- }
-
- @Test
- public void testMNG6275_projectRealmDefaultParentClassLoader()
- {
- Model model = new Model();
-
- ClassRealm projectRealm = classRealmManager.createProjectRealm( model, null );
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, projectRealm );
- assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() );
- }
-
- @Test
- public void testMNG6275_mavenApiRealmDefaultParentClassLoader()
- {
- ClassRealm mavenApiRealm = classRealmManager.getMavenApiRealm();
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, mavenApiRealm );
- assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() );
- }
-
- @Test
- public void testMNG6275_coreRealmDefaultParentClassLoader()
- {
- ClassRealm coreRealm = classRealmManager.getCoreRealm();
- ServiceLoader<ScriptEngineFactory> sef = ServiceLoader.load( ScriptEngineFactory.class, coreRealm );
- assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() );
- }
-}
[2/2] maven git commit: Revert "MNG-6209 better executeMojo thread
context classloader"
Posted by st...@apache.org.
Revert "MNG-6209 better executeMojo thread context classloader"
This reverts commit ec629f7d511eb910b4e80112a9fbe85ed8786f10.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b95ad9f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b95ad9f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b95ad9f
Branch: refs/heads/master
Commit: 4b95ad9fce6dfe7eec2be88f5837e96c7fbd7292
Parents: cae779e
Author: Stephen Connolly <st...@gmail.com>
Authored: Tue Oct 17 19:18:43 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Tue Oct 17 19:18:43 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4b95ad9f/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index 3af1125..b4f7a4d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,11 +106,8 @@ public class DefaultBuildPluginManager
throw new PluginExecutionException( mojoExecution, project, e );
}
- // use project realm as thread context classloader to enable components from all extensions=true plugins
- ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? project.getClassRealm() : pluginRealm;
-
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( tccl );
+ Thread.currentThread().setContextClassLoader( pluginRealm );
MavenSession oldSession = legacySupport.getSession();