Task/bael 10829 (#5844)

* BAEL-10829 Clean up the parent pom of the tutorials project

- Cleaned up projects list for default-first and integration-lite-first profiles

* BAEL-10829 Fixing unit test in JGit

* BAEL-10829 Clean up the parent pom of the tutorials project

-Updated modules list for default-second and integration-lite-second profiles

* BAEL-10829 Fixed repository for structurizr libraries and api changes done in StructurizrSimple to incorporate new version

JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java

@@ -28,14 +28,14 @@ public class Log {
                 System.out.println("Had " + count + " commits overall on current branch");
 
                 logs = git.log()
-                        .add(repository.resolve("remotes/origin/testbranch"))
+                        .add(repository.resolve(git.getRepository().getFullBranch()))
                         .call();
                 count = 0;
                 for (RevCommit rev : logs) {
                     System.out.println("Commit: " + rev /* + ", name: " + rev.getName() + ", id: " + rev.getId().getName() */);
                     count++;
                 }
-                System.out.println("Had " + count + " commits overall on test-branch");
+                System.out.println("Had " + count + " commits overall on "+git.getRepository().getFullBranch());
 
                 logs = git.log()
                         .all()

JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java

@@ -1,3 +1,5 @@
+package com.baeldung.jgit;
+
 import com.baeldung.jgit.helper.Helper;
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectReader;

spring-cloud/pom.xml

@@ -35,7 +35,7 @@
         <module>spring-cloud-archaius</module>
         <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>
-		<module>spring-cloud-security</module>
+		<!-- <module>spring-cloud-security</module> --> <!-- Fixing in BAEL-10887 -->
 		<module>spring-cloud-task</module>
         <module>spring-cloud-zuul</module>
     </modules>

structurizr/pom.xml

@@ -2,7 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>structurizr</artifactId>
 	<name>structurizr</name>
 
@@ -26,32 +25,24 @@
         <dependency>
             <groupId>com.structurizr</groupId>
             <artifactId>structurizr-client</artifactId>
-            <version>${structurizr-client.version}</version>
+            <version>${structurizr.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>com.structurizr</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>structurizr-analysis</artifactId>
-            <version>${spring.version}</version>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-plantuml</artifactId>
+            <version>${structurizr.version}</version>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
-        </repository>
-    </repositories>
-
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <structurizr.version>1.0.0-RC3</structurizr.version>
+        <structurizr.version>1.0.0-RC5</structurizr.version>
-        <structurizr-client.version>0.6.0</structurizr-client.version>
-        <spring.version>4.3.8.RELEASE</spring.version>
     </properties>
 
 </project>

structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java

@@ -4,12 +4,10 @@ import java.io.File;
 import java.io.StringWriter;
 
 import com.structurizr.Workspace;
-import com.structurizr.api.StructurizrClient;
+import com.structurizr.analysis.ComponentFinder;
-import com.structurizr.api.StructurizrClientException;
+import com.structurizr.analysis.ReferencedTypesSupportingTypesStrategy;
-import com.structurizr.componentfinder.ComponentFinder;
+import com.structurizr.analysis.SourceCodeComponentFinderStrategy;
-import com.structurizr.componentfinder.ReferencedTypesSupportingTypesStrategy;
+import com.structurizr.analysis.SpringComponentFinderStrategy;
-import com.structurizr.componentfinder.SourceCodeComponentFinderStrategy;
-import com.structurizr.componentfinder.SpringComponentFinderStrategy;
 import com.structurizr.io.WorkspaceWriterException;
 import com.structurizr.io.plantuml.PlantUMLWriter;
 import com.structurizr.model.Component;
@@ -112,11 +110,6 @@ public class StructurizrSimple {
         view.addAllContainers();
     }
 
-    private static void uploadToExternal(Workspace workspace) throws StructurizrClientException {
-        StructurizrClient client = new StructurizrClient("e94bc0c9-76ef-41b0-8de7-82afc1010d04", "78d555dd-2a31-487c-952c-50508f1da495");
-        client.putWorkspace(32961L, workspace);
-    }
-
     private static void exportToPlantUml(View view) throws WorkspaceWriterException {
         StringWriter stringWriter = new StringWriter();
         PlantUMLWriter plantUMLWriter = new PlantUMLWriter();