Преглед изворни кода

migrate branch master to main
prepare for develop branch

Jan Wittler пре 4 година
родитељ
комит
93f5d16cd0
5 измењених фајлова са 9 додато и 5 уклоњено
  1. 3 0
      .github/dependabot.yml
  2. 1 1
      .github/workflows/report-viewer.yml
  3. 3 2
      .github/workflows/sonarcloud-branch.yml
  4. 1 1
      README.md
  5. 1 1
      pom.xml

+ 3 - 0
.github/dependabot.yml

@@ -1,6 +1,7 @@
 version: 2
 version: 2
 updates:
 updates:
   - package-ecosystem: "github-actions"
   - package-ecosystem: "github-actions"
+    target-branch: "develop"
     directory: "/"
     directory: "/"
     schedule:
     schedule:
       interval: "weekly"
       interval: "weekly"
@@ -11,6 +12,7 @@ updates:
       prefix: "Dependency"
       prefix: "Dependency"
       include: "scope"
       include: "scope"
   - package-ecosystem: "maven"
   - package-ecosystem: "maven"
+    target-branch: "develop"
     directory: "/"
     directory: "/"
     schedule:
     schedule:
       interval: "weekly"
       interval: "weekly"
@@ -24,6 +26,7 @@ updates:
       - "dependencies"
       - "dependencies"
       - "minor"
       - "minor"
   - package-ecosystem: "npm"
   - package-ecosystem: "npm"
+    target-branch: "develop"
     directory: "/report-viewer"
     directory: "/report-viewer"
     schedule:
     schedule:
       interval: "weekly"
       interval: "weekly"

+ 1 - 1
.github/workflows/report-viewer.yml

@@ -4,7 +4,7 @@ on:
  workflow_dispatch: # Use this to dispatch from the Actions Tab
  workflow_dispatch: # Use this to dispatch from the Actions Tab
  push:
  push:
     branches:
     branches:
-      - master
+      - main
       
       
 jobs:
 jobs:
   build-and-deploy:
   build-and-deploy:

+ 3 - 2
.github/workflows/sonarcloud-branch.yml

@@ -1,9 +1,10 @@
-name: SonarCloud Scan (master branch)
+name: SonarCloud Scan (main and develop branch)
 
 
 on:
 on:
   push:
   push:
     branches:
     branches:
-      - master
+      - main
+      - develop
 
 
   # Allows you to run this workflow manually from the Actions tab
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
   workflow_dispatch:

+ 1 - 1
README.md

@@ -6,7 +6,7 @@
 [![CI Build](https://github.com/jplag/jplag/actions/workflows/maven.yml/badge.svg)](https://github.com/jplag/jplag/actions/workflows/maven.yml)
 [![CI Build](https://github.com/jplag/jplag/actions/workflows/maven.yml/badge.svg)](https://github.com/jplag/jplag/actions/workflows/maven.yml)
 [![Latest Release](https://img.shields.io/github/release/jplag/jplag.svg)](https://github.com/jplag/jplag/releases/latest)
 [![Latest Release](https://img.shields.io/github/release/jplag/jplag.svg)](https://github.com/jplag/jplag/releases/latest)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.jplag/jplag/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.jplag/jplag)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.jplag/jplag/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.jplag/jplag)
-[![License](https://img.shields.io/github/license/jplag/jplag.svg)](https://github.com/jplag/jplag/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/jplag/jplag.svg)](https://github.com/jplag/jplag/blob/main/LICENSE)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/jplag/JPlag)](https://github.com/jplag/JPlag/pulse)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/jplag/JPlag)](https://github.com/jplag/JPlag/pulse)
 
 
 JPlag is a system that finds similarities among multiple sets of source code files. This way it can detect software plagiarism and collusion in software development. JPlag currently supports various programming languages, EMF metamodels, and natural language text.
 JPlag is a system that finds similarities among multiple sets of source code files. This way it can detect software plagiarism and collusion in software development. JPlag currently supports various programming languages, EMF metamodels, and natural language text.

+ 1 - 1
pom.xml

@@ -45,7 +45,7 @@
     <scm>
     <scm>
         <connection>scm:git:git://github.com/jplag/JPlag.git</connection>
         <connection>scm:git:git://github.com/jplag/JPlag.git</connection>
         <developerConnection>scm:git:ssh://github.com:jplag/JPlag.git</developerConnection>
         <developerConnection>scm:git:ssh://github.com:jplag/JPlag.git</developerConnection>
-        <url>https://github.com/jplag/JPlag/tree/master</url>
+        <url>https://github.com/jplag/JPlag</url>
     </scm>
     </scm>
 
 
     <issueManagement>
     <issueManagement>