merge 0.9

# Conflicts:
#	dev.jeka.core/src/main/java/dev/jeka/core/api/java/testing/JkInternalJunitDoer.java

dev.jeka.core-samples-dependers/jeka/def/FatJarBuild.java

@@ -1,6 +1,5 @@
 import dev.jeka.core.api.depmanagement.JkDependencySet;
-import dev.jeka.core.api.java.JkJavaVersion;
-import dev.jeka.core.samples.AClassicBuild;
+import dev.jeka.core.samples.JavaPluginBuild;
 import dev.jeka.core.tool.JkCommandSet;
 import dev.jeka.core.tool.JkDefImport;
 import dev.jeka.core.tool.builtins.java.JkPluginJava;
@@ -14,16 +13,20 @@
  */
 public class FatJarBuild extends JkCommandSet {
 
-    JkPluginJava javaPlugin = getPlugin(JkPluginJava.class);
+    JkPluginJava java = getPlugin(JkPluginJava.class);
 
     @JkDefImport("../dev.jeka.core-samples")
-    private AClassicBuild sampleBuild;
+    private JavaPluginBuild sampleBuild;
 
     @Override
     protected void setup() {
-        javaPlugin.getProject().addDependencies(JkDependencySet.of().and(sampleBuild.javaPlugin.getProject()));
-        javaPlugin.getProject().setSourceVersion(JkJavaVersion.V8);
-        javaPlugin.getProject().getMaker().defineMainArtifactAsFatJar(true);
+        java.getProject()
+            .getArtifactProducer()
+                .putMainArtifact(java.getProject().getProduction()::createFatJar).__
+            .getDependencyManagement()
+                .addDependencies(JkDependencySet.of()
+                        .and(sampleBuild.java.getProject().toDependency()))
+        ;
     }
 
 }

dev.jeka.core-samples-dependers/jeka/def/NormalJarBuild.java

@@ -1,6 +1,5 @@
 import dev.jeka.core.api.depmanagement.JkDependencySet;
-import dev.jeka.core.api.java.JkJavaVersion;
-import dev.jeka.core.samples.AClassicBuild;
+import dev.jeka.core.samples.JavaPluginBuild;
 import dev.jeka.core.tool.JkCommandSet;
 import dev.jeka.core.tool.JkDefImport;
 import dev.jeka.core.tool.JkInit;
@@ -21,31 +20,33 @@
  */
 public class NormalJarBuild extends JkCommandSet {
 
-    JkPluginJava javaPlugin = getPlugin(JkPluginJava.class);
+    JkPluginJava java = getPlugin(JkPluginJava.class);
 
     /*
      *  Creates a sample build instance of the 'org.jerkar.samples' project.
      *  The 'samples' project path must be relative to this one.
      *  So in this case, the two projects are supposed to lie in the same folder.
      */
     @JkDefImport("../dev.jeka.core-samples")
-    private AClassicBuild sampleBuild;
+    private JavaPluginBuild sampleBuild;
 
     @Override
     protected void setup() {
-        javaPlugin.getProject().getMaker().defineMainArtifactAsFatJar(true);
-        javaPlugin.getProject()
-                .setDependencies(JkDependencySet.of().and(sampleBuild.javaPlugin.getProject()))
-                .setSourceVersion(JkJavaVersion.V8);
+        java.getProject()
+            .getArtifactProducer()
+                .putMainArtifact(java.getProject().getProduction()::createFatJar).__
+            .getDependencyManagement()
+                .addDependencies(JkDependencySet.of()
+                    .and(sampleBuild.java.getProject().toDependency()));
     }
 
     public void cleanPack() {
         clean();
-        javaPlugin.pack();
+        java.pack();
     }
 
     public static void main(String[] args) {
-        JkInit.instanceOf(NormalJarBuild.class).javaPlugin.clean().pack();
+        JkInit.instanceOf(NormalJarBuild.class).cleanPack();
     }
 
 }

dev.jeka.core-samples-dependers/jeka/def/PureApi.java

@@ -1,27 +1,33 @@
 import dev.jeka.core.api.depmanagement.JkDependencySet;
-import dev.jeka.core.api.depmanagement.JkJavaDepScopes;
+import dev.jeka.core.api.depmanagement.JkScope;
+import dev.jeka.core.api.depmanagement.JkVersion;
 import dev.jeka.core.api.java.project.JkJavaProject;
 import dev.jeka.core.api.system.JkLog;
 
+import java.nio.file.Paths;
+
 public class PureApi {
 
     public static void main(String[] args) {
         JkLog.setHierarchicalConsoleConsumer();  // activate console logging
 
         // A project with ala Maven layout (src/main/javaPlugin, src/test/javaPlugin, ...)
-        JkJavaProject coreProject = JkJavaProject.ofMavenLayout("../dev.jeka.core-samples");
-        coreProject.addDependencies(
-                JkDependencySet.of().and("junit:junit:4.13", JkJavaDepScopes.TEST));
+        JkJavaProject coreProject = JkJavaProject.of()
+            .setBaseDir(Paths.get("../dev.jeka.core-samples"))
+             .getDependencyManagement()
+                .addDependencies(JkDependencySet.of()
+                        .and("junit:junit:4.13", JkScope.TEST)).__;
 
         // A project depending on the first project + Guava
-        JkJavaProject dependerProject = JkJavaProject.ofMavenLayout(".");
-        dependerProject.setVersionedModule("mygroup:depender", "1.0-SNAPSHOT");
-        dependerProject.addDependencies(JkDependencySet.of()
-                .and("com.google.guava:guava:22.0")
-                .and(coreProject));
-
-        coreProject.getMaker().clean();
-        dependerProject.getMaker().clean().makeAllArtifacts();
-        dependerProject.getMaker().getSteps().getPublishing().publish();
+        JkJavaProject dependerProject = JkJavaProject.of()
+            .getDependencyManagement()
+                .addDependencies(JkDependencySet.of()
+                    .and("com.google.guava:guava:22.0")
+                    .and(coreProject.toDependency())).__
+                .getPublication()
+                    .setModuleId("mygroup:depender")
+                    .setVersion(JkVersion.of("1.0-SNAPSHOT")).__;
+        dependerProject.getArtifactProducer().makeAllArtifacts();
+        dependerProject.getPublication().publish();
     }
 }