Explorar el Código

migrate branch master to main
prepare for develop branch

Jan Wittler hace 4 años
padre
commit
93f5d16cd0

+ 3 - 0
.github/dependabot.yml

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

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

@@ -4,7 +4,7 @@ on:
  workflow_dispatch: # Use this to dispatch from the Actions Tab
  push:
     branches:
-      - master
+      - main
       
 jobs:
   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:
   push:
     branches:
-      - master
+      - main
+      - develop
 
   # Allows you to run this workflow manually from the Actions tab
   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)
 [![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)
-[![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)
 
 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>
         <connection>scm:git:git://github.com/jplag/JPlag.git</connection>
         <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>
 
     <issueManagement>