Merge pull request #96 from yodamad/dev

yodamad · web-flow · commit 8bafd95b1ece · 2020-07-01T22:49:47.000+02:00
🍸 Release 1.19.0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+stages:
+    - 🚧 build
+    - 🗣 publish
+
+# Custom steps
+🛠 build-application:
+    stage: 🚧 build
+    image: jhipster/jhipster
+    before_script:
+        - export MAVEN_USER_HOME=`pwd`/.maven
+        - ./mvnw com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v14.3.0 -DnpmVersion=6.13.7
+        - ./mvnw com.github.eirslett:frontend-maven-plugin:install-node-and-yarn -DnodeVersion=v14.3.0 -DyarnVersion=v1.10.1
+    script:
+        - ./mvnw clean package -DskipTests -Pprod
+    artifacts:
+        paths:
+            - target
+        expire_in: 1 week
+
+🐳 build-image:
+    stage: 🗣 publish
+    image:
+        name: gcr.io/kaniko-project/executor:debug-v0.18.0
+        entrypoint: [""]
+    dependencies:
+        - 🛠 build-application
+    script:
+        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+        - /kaniko/executor --context="$CI_PROJECT_DIR" --dockerfile="$CI_PROJECT_DIR/Dockerfile" --destination="$CI_REGISTRY_IMAGE:$BUILD_VERSION"
+    only:
+        - internal_master
+        - master
+        - dev
+    except:
+        - schedules
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "file-loader": "3.0.1",
     "fork-ts-checker-webpack-plugin": "0.5.2",
     "friendly-errors-webpack-plugin": "1.7.0",
-    "generator-jhipster": "5.4.2",
+    "generator-jhipster": "6.7.1",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
@@ -128,7 +128,7 @@
     "webpack:prod": "npm run cleanup && npm run webpack:prod:main && npm run clean-www",
     "webpack:test": "npm run test",
     "webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js",
-    "webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js"
+    "webpack": "node --max_old_space_size=5120 node_modules/webpack/bin/webpack.js"
   },
   "jestSonar": {
     "reportPath": "target/test-results/jest",
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>fr.yodamad.svn2git</groupId>
     <artifactId>svn-2-git</artifactId>
-    <version>1.18.2</version>
+    <version>1.19.0</version>
     <packaging>jar</packaging>
     <name>Svn 2 GitLab</name>
 
@@ -23,7 +23,7 @@
         <maven.version>3.0.0</maven.version>
         <java.version>1.8</java.version>
         <scala.version>2.12.6</scala.version>
-        <node.version>v8.16.2</node.version>
+        <node.version>v14.3.0</node.version>
         <yarn.version>v1.10.1</yarn.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -66,7 +66,7 @@
         <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
-        <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.10.0</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
         <scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
         <sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
@@ -766,6 +766,17 @@
                         <artifactId>frontend-maven-plugin</artifactId>
                         <version>${frontend-maven-plugin.version}</version>
                         <executions>
+                            <execution>
+                                <id>install node and npm</id>
+                                <goals>
+                                    <goal>install-node-and-npm</goal>
+                                </goals>
+                                <configuration>
+                                    <nodeVersion>${node.version}</nodeVersion>
+                                    <npmVersion>6.13.7</npmVersion>
+                                </configuration>
+                                <phase>generate-resources</phase>
+                            </execution>
                             <execution>
                                 <id>install node and yarn</id>
                                 <goals>
@@ -949,6 +960,17 @@
                         <artifactId>frontend-maven-plugin</artifactId>
                         <version>${frontend-maven-plugin.version}</version>
                         <executions>
+                            <execution>
+                                <id>install node and npm</id>
+                                <goals>
+                                    <goal>install-node-and-npm</goal>
+                                </goals>
+                                <configuration>
+                                    <nodeVersion>${node.version}</nodeVersion>
+                                    <npmVersion>6.13.7</npmVersion>
+                                </configuration>
+                                <phase>generate-resources</phase>
+                            </execution>
                             <execution>
                                 <id>install node and yarn</id>
                                 <goals>
diff --git a/src/main/java/fr/yodamad/svn2git/service/Cleaner.java b/src/main/java/fr/yodamad/svn2git/service/Cleaner.java
@@ -166,12 +166,12 @@ public CleanedFilesManager listCleanedFiles(WorkUnit workUnit) throws IOExceptio
         AtomicBoolean warnings = new AtomicBoolean(false);
 
         if (!isEmpty(workUnit.migration.getTrunk())) {
-            CleanedFiles cleanedFilesTrunk = listCleanedFilesInSvnLocation(workUnit, "trunk", SvnLayout.TRUNK);
-            cleanedFilesMap.put("trunk", cleanedFilesTrunk);
+            CleanedFiles cleanedFilesTrunk = listCleanedFilesInSvnLocation(workUnit, workUnit.migration.getTrunk(), SvnLayout.TRUNK);
+            cleanedFilesMap.put(workUnit.migration.getTrunk(), cleanedFilesTrunk);
         }
 
         List<String> remotes = listRemotes(workUnit.directory);
-        listBranchesOnly(remotes).forEach(
+        listBranchesOnly(remotes, workUnit.migration.getTrunk()).forEach(
             b -> {
                 try {
                     // get branchName
@@ -530,14 +530,14 @@ Pair<AtomicBoolean, List<String>> cleanRemovedElements(WorkUnit workUnit, boolea
                 .map(l -> l.trim().replace("origin/", ""))
                 .filter(t -> t.startsWith("tags"))
                 .map(l -> l.replace(TAGS, ""))
-                .filter(l -> !l.equalsIgnoreCase("trunk"))
+                .filter(l -> !l.equalsIgnoreCase(workUnit.migration.getTrunk()))
                 .collect(Collectors.toList());
         } else {
             gitElementsToDelete = Files.readAllLines(Paths.get(workUnit.directory, GIT_LIST))
                 .stream()
                 .map(l -> l.trim().replace("origin/", ""))
                 .filter(l -> !l.startsWith(TAGS))
-                .filter(l -> !l.equalsIgnoreCase("trunk"))
+                .filter(l -> !l.equalsIgnoreCase(workUnit.migration.getTrunk()))
                 .collect(Collectors.toList());
         }
 
diff --git a/src/main/java/fr/yodamad/svn2git/service/GitManager.java b/src/main/java/fr/yodamad/svn2git/service/GitManager.java
@@ -205,7 +205,7 @@ private static String generateIgnorePaths(String trunk, String tags, String bran
 
         if (trunk != null) {
             sb.append(svnProject.replaceFirst("/", "/?"))
-                .append("/trunk/");
+                .append(format("/%s/", trunk));
 
             if (tags != null || branches != null) {
                 sb.append("|");
@@ -289,14 +289,14 @@ static List<String> listRemotes(String directory) throws InterruptedException, I
      * @param remotes Remote list
      * @return list containing only branches
      */
-    static List<String> listBranchesOnly(List<String> remotes) {
+    static List<String> listBranchesOnly(List<String> remotes, String trunk) {
         return remotes.stream()
             .map(String::trim)
             // Remove tags
             .filter(b -> !b.startsWith(ORIGIN_TAGS))
             // Remove master/trunk
             .filter(b -> !b.contains(MASTER))
-            .filter(b -> !b.contains("trunk"))
+            .filter(b -> !b.contains(trunk))
             .filter(b -> !b.contains("@"))
             .collect(Collectors.toList());
     }
@@ -496,7 +496,7 @@ private String initCommand(WorkUnit workUnit, String username, String secret) {
         String sCommand = format("%s git svn clone %s %s %s %s %s %s %s %s%s",
             StringUtils.isEmpty(secret) ? "" : isWindows ? format("echo(%s|", secret) : format("echo %s |", secret),
             StringUtils.isEmpty(username) ? "" : format("--username %s", username),
-            workUnit.migration.getTrunk() == null ? "" : format("--trunk=%s/trunk", workUnit.migration.getSvnProject()),
+            (workUnit.migration.getTrunk() == null || !workUnit.migration.getTrunk().equals("trunk")) ? "" : format("--trunk=%s/trunk", workUnit.migration.getSvnProject()),
             workUnit.migration.getBranches() == null ? "" : format("--branches=%s/branches", workUnit.migration.getSvnProject()),
             workUnit.migration.getTags() == null ? "" : format("--tags=%s/tags", workUnit.migration.getSvnProject()),
             StringUtils.isEmpty(ignorePaths) ? "" : ignorePaths,
@@ -761,7 +761,7 @@ private StatusEnum mv(WorkUnit workUnit, String svnDir, String gitDir, String br
      * @param remotes
      */
     void manageBranches(WorkUnit workUnit, List<String> remotes) {
-        listBranchesOnly(remotes).forEach(b -> {
+        listBranchesOnly(remotes, workUnit.migration.getTrunk()).forEach(b -> {
                 final boolean warn = pushBranch(workUnit, b);
                 workUnit.warnings.set(workUnit.warnings.get() || warn);
 
diff --git a/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java b/src/main/java/fr/yodamad/svn2git/service/MigrationManager.java
@@ -220,14 +220,23 @@ public void startMigration(final long migrationId, final boolean retry) {
                 }
 
                 // 4. Git push master based on SVN trunk
-                if (migration.getTrunk() != null && migration.getTrunk().equals("*")) {
-                    history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, "SVN trunk -> GitLab master");
+                if (migration.getTrunk() != null) {
+                    history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, format("SVN %s -> GitLab master", migration.getTrunk()));
 
                     // Set origin
                     execCommand(commandManager, workUnit.directory,
                         gitManager.buildRemoteCommand(workUnit, svn, false),
                         gitManager.buildRemoteCommand(workUnit, svn, true));
 
+                    if (!migration.getTrunk().equals("trunk")) {
+                        gitCommand = format("git checkout -b %s %s", migration.getTrunk(), "refs/remotes/origin/" + migration.getTrunk());
+                        execCommand(workUnit.commandManager, workUnit.directory, gitCommand);
+                        gitCommand = format("git branch -D master");
+                        execCommand(workUnit.commandManager, workUnit.directory, gitCommand);
+                        gitCommand = format("git branch -m master");
+                        execCommand(workUnit.commandManager, workUnit.directory, gitCommand);
+                    }
+
                     // if no history option set
                     if (migration.getSvnHistory().equals("nothing")) {
                         gitManager.removeHistory(workUnit, MASTER, false, history);
@@ -246,8 +255,8 @@ public void startMigration(final long migrationId, final boolean retry) {
                     boolean warning = gitManager.applyMapping(workUnit, MASTER);
                     workUnit.warnings.set(workUnit.warnings.get() || warning);
                 } else {
-                    history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, "Trunk");
-                    historyMgr.endStep(history, StatusEnum.IGNORED, "Skip trunk");
+                    history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, migration.getTrunk());
+                    historyMgr.endStep(history, StatusEnum.IGNORED, format("Skip %s", migration.getTrunk()));
                 }
 
                 // 6. List branches & tags
@@ -308,7 +317,7 @@ public void startMigration(final long migrationId, final boolean retry) {
                 }
 
             } else {
-                history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, "Trunk, Tags, Branches");
+                history = historyMgr.startStep(migration, StepEnum.GIT_PUSH, format("%s, Tags, Branches", migration.getTrunk()));
                 historyMgr.endStep(history, StatusEnum.IGNORED, "Skipping Migration : No Files Available. No Push to Gitlab");
             }
 
diff --git a/src/main/webapp/app/migration/migration-stepper.component.html b/src/main/webapp/app/migration/migration-stepper.component.html
@@ -143,6 +143,7 @@
                             <td mat-cell *matCellDef="let directory" style="width: 70px">
                                 <mat-checkbox (click)="$event.stopPropagation()"
                                               (change)="$event ? historyToggle(directory) : null"
+                                              [disabled]="noTrunk() && directory === 'trunk'"
                                               [checked]="historyChecked(directory)">
                                 </mat-checkbox>
                             </td>
@@ -174,6 +175,12 @@
                         <input matInput placeholder="{{'migration-process.history.tags-to-migrate-placeholder' | translate}}" formControlName="tagsToMigrate">
                     </mat-form-field>
                 </li>
+                <li>
+                    <mat-form-field *ngIf="true" class="tagsbranches-to-migrate">
+                        <span class="fa-li"><fa-icon [icon]="'check-double'"></fa-icon></span>
+                        <input matInput placeholder="{{'migration-process.history.branch-for-master' | translate}}" formControlName="branchForMaster">
+                    </mat-form-field>
+                </li>
                 </form>
             </ul>
             <mat-divider style="margin-bottom: 10px"></mat-divider>
diff --git a/src/main/webapp/app/migration/migration-stepper.component.ts b/src/main/webapp/app/migration/migration-stepper.component.ts
@@ -158,7 +158,8 @@ export class MigrationStepperComponent implements OnInit {
 
         this.historyFormGroup = this._formBuilder.group({
             branchesToMigrate: [''],
-            tagsToMigrate: ['']
+            tagsToMigrate: [''],
+            branchForMaster: ['']
         });
         this.historySelection = new SelectionModel<string>(this.allowMultiSelect, ['trunk']);
 
@@ -409,7 +410,7 @@ export class MigrationStepperComponent implements OnInit {
         if (this.historySelection !== undefined && !this.historySelection.isEmpty()) {
             this.historySelection.selected.forEach(hst => {
                 if (hst === 'trunk') {
-                    this.mig.trunk = '*';
+                    this.mig.trunk = 'trunk';
                 } else if (hst === 'branches') {
                     this.mig.branches = '*';
                 } else if (hst === 'tags') {
@@ -437,6 +438,14 @@ export class MigrationStepperComponent implements OnInit {
         }
         this.mig.svnHistory = this.historyOption;
 
+        // Branch for master
+        if (
+            this.historyFormGroup.controls['branchForMaster'] !== undefined &&
+            this.historyFormGroup.controls['branchForMaster'].value !== ''
+        ) {
+            this.mig.trunk = this.historyFormGroup.controls['branchForMaster'].value;
+        }
+
         // Mappings
         // Note : selectionSvnDirectoryDelete can be empty
         if (this.selectionMapping !== undefined && !this.selectionMapping.isEmpty() && this.selectionSvnDirectoryDelete !== undefined) {
@@ -455,14 +464,10 @@ export class MigrationStepperComponent implements OnInit {
             // this.mig.mappings = this.selectionMapping.selected
             //    .filter(mapping => mapping.gitDirectory !== undefined);
             this.mig.mappings = this.mappings.filter(row => {
-                if (
+                return (
                     (this.isRealMappingRow(row) && this.selectionMapping.isSelected(row)) ||
                     this.selectionSvnDirectoryDelete.isSelected(row)
-                ) {
-                    return true;
-                } else {
-                    return false;
-                }
+                );
             });
         }
 
@@ -879,6 +884,9 @@ export class MigrationStepperComponent implements OnInit {
      * @param directory
      */
     historyChecked(directory: string) {
+        if (directory === 'trunk') {
+            return this.historySelection.isSelected(directory) && !this.noTrunk();
+        }
         return this.historySelection.isSelected(directory);
     }
 
@@ -927,4 +935,11 @@ export class MigrationStepperComponent implements OnInit {
             return false;
         }
     }
+
+    noTrunk() {
+        return (
+            this.historyFormGroup.controls['branchForMaster'] !== undefined &&
+            this.historyFormGroup.controls['branchForMaster'].value !== ''
+        );
+    }
 }
diff --git a/src/main/webapp/i18n/en/migrationProcess.json b/src/main/webapp/i18n/en/migrationProcess.json
@@ -46,6 +46,7 @@
             "no" : "Nothing",
             "option" : "History option",
             "options" : "History options",
+            "branch-for-master": "Branch to use for master if not trunk",
             "tags-to-migrate" : "Tags To Keep",
             "branches-to-migrate" : "Branches To Keep",
             "tags-to-migrate-placeholder" : "Tags To Keep (Comma Separated)",
diff --git a/src/main/webapp/i18n/fr/migrationProcess.json b/src/main/webapp/i18n/fr/migrationProcess.json
@@ -46,6 +46,7 @@
             "no" : "Rien",
             "option" : "Choix de conservation de l'historique",
             "options" : "Options d'historique",
+            "branch-for-master": "Branche à utiliser comme master si différente de trunk",
             "tags-to-migrate" : "Tags à garder",
             "branches-to-migrate" : "Branches à garder",
             "tags-to-migrate-placeholder" : "Tags à garder (Séparées par des virgules)",
