From c1aa851c72be07d71d73eff406e62231969f83d2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 21 Dec 2020 11:01:33 +0100 Subject: [PATCH] Migrate plugins --- scm-plugins/scm-git-plugin/build.gradle | 53 +++++++++ scm-plugins/scm-git-plugin/package.json | 19 ++- scm-plugins/scm-git-plugin/pom.xml | 106 ----------------- .../main/resources/META-INF/scm/plugin.xml | 47 -------- scm-plugins/scm-hg-plugin/build.gradle | 54 +++++++++ scm-plugins/scm-hg-plugin/package.json | 19 ++- scm-plugins/scm-hg-plugin/pom.xml | 102 ---------------- .../main/resources/META-INF/scm/plugin.xml | 47 -------- .../scm-integration-test-plugin/build.gradle | 48 ++++++++ .../scm-integration-test-plugin/pom.xml | 50 -------- .../main/resources/META-INF/scm/plugin.xml | 42 ------- scm-plugins/scm-legacy-plugin/build.gradle | 48 ++++++++ scm-plugins/scm-legacy-plugin/package.json | 19 ++- scm-plugins/scm-legacy-plugin/pom.xml | 67 ----------- .../main/resources/META-INF/scm/plugin.xml | 46 ------- scm-plugins/scm-svn-plugin/build.gradle | 62 ++++++++++ scm-plugins/scm-svn-plugin/package.json | 19 ++- scm-plugins/scm-svn-plugin/pom.xml | 112 ------------------ .../main/resources/META-INF/scm/plugin.xml | 47 -------- settings.gradle | 12 +- 20 files changed, 328 insertions(+), 691 deletions(-) create mode 100644 scm-plugins/scm-git-plugin/build.gradle delete mode 100644 scm-plugins/scm-git-plugin/pom.xml delete mode 100644 scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml create mode 100644 scm-plugins/scm-hg-plugin/build.gradle delete mode 100644 scm-plugins/scm-hg-plugin/pom.xml delete mode 100644 scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml create mode 100644 scm-plugins/scm-integration-test-plugin/build.gradle delete mode 100644 scm-plugins/scm-integration-test-plugin/pom.xml delete mode 100644 scm-plugins/scm-integration-test-plugin/src/main/resources/META-INF/scm/plugin.xml create mode 100644 scm-plugins/scm-legacy-plugin/build.gradle delete mode 100644 scm-plugins/scm-legacy-plugin/pom.xml delete mode 100644 scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml create mode 100644 scm-plugins/scm-svn-plugin/build.gradle delete mode 100644 scm-plugins/scm-svn-plugin/pom.xml delete mode 100644 scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml diff --git a/scm-plugins/scm-git-plugin/build.gradle b/scm-plugins/scm-git-plugin/build.gradle new file mode 100644 index 0000000000..4c7747e0aa --- /dev/null +++ b/scm-plugins/scm-git-plugin/build.gradle @@ -0,0 +1,53 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +plugins { + id 'org.scm-manager.smp' version '0.5.1' +} + +dependencies { + implementation 'sonia.jgit:org.eclipse.jgit:5.6.1.202002131546-r-scm1' + implementation 'sonia.jgit:org.eclipse.jgit.http.server:5.6.1.202002131546-r-scm1' + implementation 'sonia.jgit:org.eclipse.jgit.lfs.server:5.6.1.202002131546-r-scm1' + + testImplementation 'com.github.sdorra:shiro-unit' +} + +scmPlugin { + scmVersion = project.version + core = true + name = "scm-git-plugin" + displayName = 'Git' + description = 'Plugin for the version control system Git' + author = 'Cloudogu GmbH' + category = 'Source Code Management' + + openapi { + packages = [ + 'sonia.scm.api.v2.resources' + ] + } + +} diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 425ef09226..270b56dc5d 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -5,11 +5,21 @@ "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { - "build": "ui-scripts plugin", - "watch": "ui-scripts plugin-watch", + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", "test": "jest", "typecheck": "tsc" }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/plugin-scripts": "^1.0.1", + "@scm-manager/babel-preset": "^2.11.1", + "@scm-manager/jest-preset": "^2.12.3", + "@scm-manager/prettier-config": "^2.11.1", + "@scm-manager/eslint-config": "^2.11.1" + }, "babel": { "presets": [ "@scm-manager/babel-preset" @@ -18,8 +28,5 @@ "jest": { "preset": "@scm-manager/jest-preset" }, - "prettier": "@scm-manager/prettier-config", - "dependencies": { - "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" - } + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml deleted file mode 100644 index 64ffc947e8..0000000000 --- a/scm-plugins/scm-git-plugin/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - 4.0.0 - - - scm-plugins - sonia.scm.plugins - 2.13.0-SNAPSHOT - - - scm-git-plugin - smp - https://github.com/scm-manager/scm-manager - Plugin for the version control system Git - - - - - sonia.jgit - org.eclipse.jgit - ${jgit.version} - - - - sonia.jgit - org.eclipse.jgit.http.server - ${jgit.version} - - - - sonia.jgit - org.eclipse.jgit.lfs.server - ${jgit.version} - - - - commons-lang - commons-lang - 2.6 - - - - org.jboss.resteasy - resteasy-jackson2-provider - ${resteasy.version} - - - - - - - - - sonia.scm.maven - smp-maven-plugin - true - - true - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - - - - diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml deleted file mode 100644 index d2e46aa899..0000000000 --- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - 2 - - - Git - Cloudogu GmbH - Source Code Management - /images/git-logo.png - - - - ${project.parent.version} - - - - - - - diff --git a/scm-plugins/scm-hg-plugin/build.gradle b/scm-plugins/scm-hg-plugin/build.gradle new file mode 100644 index 0000000000..76d3f2514c --- /dev/null +++ b/scm-plugins/scm-hg-plugin/build.gradle @@ -0,0 +1,54 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +plugins { + id 'org.scm-manager.smp' version '0.5.1' +} + +dependencies { + implementation('com.aragost.javahg:javahg:0.16') { + exclude group: 'com.google.guava', module: 'guava' + exclude group: 'org.slf4j' + } + testImplementation 'com.github.sdorra:shiro-unit' + testImplementation 'ch.qos.logback:logback-classic' +} + +scmPlugin { + scmVersion = project.version + core = true + name = 'scm-hg-plugin' + displayName = 'Mercurial' + description = 'Plugin for the version control system Mercurial' + author = 'Cloudogu GmbH' + category = 'Source Code Management' + + openapi { + packages = [ + 'sonia.scm.api.v2.resources' + ] + } + +} diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index e423d0d8f3..13a8e1c5a6 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -5,10 +5,20 @@ "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { - "build": "ui-scripts plugin", - "watch": "ui-scripts plugin-watch", + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", "typecheck": "tsc" }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/plugin-scripts": "^1.0.1", + "@scm-manager/babel-preset": "^2.11.1", + "@scm-manager/jest-preset": "^2.12.3", + "@scm-manager/prettier-config": "^2.11.1", + "@scm-manager/eslint-config": "^2.11.1" + }, "babel": { "presets": [ "@scm-manager/babel-preset" @@ -17,8 +27,5 @@ "jest": { "preset": "@scm-manager/jest-preset" }, - "prettier": "@scm-manager/prettier-config", - "dependencies": { - "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" - } + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml deleted file mode 100644 index 0925b7266b..0000000000 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - 4.0.0 - - - sonia.scm.plugins - scm-plugins - 2.13.0-SNAPSHOT - - - scm-hg-plugin - smp - https://github.com/scm-manager/scm-manager - Plugin for the version control system Mercurial - - - - - com.aragost.javahg - javahg - 0.16 - - - com.google.guava - guava - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-nop - - - - - - ch.qos.logback - logback-classic - test - - - - - - - - - sonia.scm.maven - smp-maven-plugin - true - - true - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - - - - diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml deleted file mode 100644 index 3b91da0ab5..0000000000 --- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - 2 - - - Mercurial - Cloudogu GmbH - Source Code Management - /images/hg-logo.png - - - - ${project.parent.version} - - - - - - - diff --git a/scm-plugins/scm-integration-test-plugin/build.gradle b/scm-plugins/scm-integration-test-plugin/build.gradle new file mode 100644 index 0000000000..af62891d9a --- /dev/null +++ b/scm-plugins/scm-integration-test-plugin/build.gradle @@ -0,0 +1,48 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +plugins { + id 'org.scm-manager.smp' version '0.5.1' +} + +dependencies { +} + +scmPlugin { + scmVersion = project.version + core = true + name = 'scm-integration-test-plugin' + displayName = 'Integration Test Support' + description = 'Add functions for integration tests. This is not intended for production systems.' + author = 'Cloudogu GmbH' + category = 'Source Code Management' + + openapi { + packages = [ + 'sonia.scm.it.resource' + ] + } + +} diff --git a/scm-plugins/scm-integration-test-plugin/pom.xml b/scm-plugins/scm-integration-test-plugin/pom.xml deleted file mode 100644 index f3d0e11c3b..0000000000 --- a/scm-plugins/scm-integration-test-plugin/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - 4.0.0 - - sonia.scm.plugins - scm-plugins - 2.13.0-SNAPSHOT - - - scm-integration-test-plugin - Add functions for integration tests. This is not intended for production systems. - 2.13.0-SNAPSHOT - smp - - - - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - - diff --git a/scm-plugins/scm-integration-test-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-integration-test-plugin/src/main/resources/META-INF/scm/plugin.xml deleted file mode 100644 index f2f70ba9ff..0000000000 --- a/scm-plugins/scm-integration-test-plugin/src/main/resources/META-INF/scm/plugin.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - 2 - - - Integration Test Support - Cloudogu GmbH - Test - - - - ${project.parent.version} - - - diff --git a/scm-plugins/scm-legacy-plugin/build.gradle b/scm-plugins/scm-legacy-plugin/build.gradle new file mode 100644 index 0000000000..06545baf43 --- /dev/null +++ b/scm-plugins/scm-legacy-plugin/build.gradle @@ -0,0 +1,48 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +plugins { + id 'org.scm-manager.smp' version '0.5.1' +} + +dependencies { +} + +scmPlugin { + scmVersion = project.version + core = true + name = 'scm-legacy-plugin' + displayName = 'Legacy' + description = 'Support migrated repository urls and v1 passwords' + author = 'Cloudogu GmbH' + category = 'Source Code Management' + + openapi { + packages = [ + 'sonia.scm.legacy' + ] + } + +} diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index dda6d075d5..cc5494c350 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -5,10 +5,20 @@ "license": "MIT", "main": "./src/main/js/index.tsx", "scripts": { - "build": "ui-scripts plugin", - "watch": "ui-scripts plugin-watch", + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", "typecheck": "tsc" }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/plugin-scripts": "^1.0.1", + "@scm-manager/babel-preset": "^2.11.1", + "@scm-manager/jest-preset": "^2.12.3", + "@scm-manager/prettier-config": "^2.11.1", + "@scm-manager/eslint-config": "^2.11.1" + }, "babel": { "presets": [ "@scm-manager/babel-preset" @@ -17,8 +27,5 @@ "jest": { "preset": "@scm-manager/jest-preset" }, - "prettier": "@scm-manager/prettier-config", - "dependencies": { - "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" - } + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-legacy-plugin/pom.xml b/scm-plugins/scm-legacy-plugin/pom.xml deleted file mode 100644 index 59fb575e2f..0000000000 --- a/scm-plugins/scm-legacy-plugin/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - sonia.scm.plugins - scm-plugins - 2.13.0-SNAPSHOT - - - scm-legacy-plugin - Support migrated repository urls and v1 passwords - 2.13.0-SNAPSHOT - smp - - - - - - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - - - - - - - sonia.scm.maven - smp-maven-plugin - true - - true - - - - - - diff --git a/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml deleted file mode 100644 index e0135fefa6..0000000000 --- a/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - 2 - - - Legacy - Cloudogu GmbH - Legacy Support - - - - ${project.parent.version} - - - - - - - diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle new file mode 100644 index 0000000000..6b15062e64 --- /dev/null +++ b/scm-plugins/scm-svn-plugin/build.gradle @@ -0,0 +1,62 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +plugins { + id 'org.scm-manager.smp' version '0.5.1' +} + +dependencies { + implementation('sonia.svnkit:svnkit:1.10.1-scm2') { + exclude group: 'org.tmatesoft.svnkit', module: 'trilead-ssh2' + } + implementation 'sonia.svnkit:svnkit-dav:1.10.1-scm2' + testImplementation 'com.github.sdorra:shiro-unit' +} + +scmPlugin { + scmVersion = project.version + core = true + name = 'scm-svn-plugin' + displayName = 'Subversion' + description = 'Plugin for the version control system Subversion' + author = 'Cloudogu GmbH' + category = 'Source Code Management' + + openapi { + packages = [ + 'sonia.scm.api.v2.resources' + ] + } + +} + +/* + +\*\*\/SCMSvnDiffGenerator.java +*/ diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 49551490e3..10b1dee9d6 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -5,10 +5,20 @@ "license": "MIT", "main": "./src/main/js/index.ts", "scripts": { - "build": "ui-scripts plugin", - "watch": "ui-scripts plugin-watch", + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", "typecheck": "tsc" }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/plugin-scripts": "^1.0.1", + "@scm-manager/babel-preset": "^2.11.1", + "@scm-manager/jest-preset": "^2.12.3", + "@scm-manager/prettier-config": "^2.11.1", + "@scm-manager/eslint-config": "^2.11.1" + }, "babel": { "presets": [ "@scm-manager/babel-preset" @@ -17,8 +27,5 @@ "jest": { "preset": "@scm-manager/jest-preset" }, - "prettier": "@scm-manager/prettier-config", - "dependencies": { - "@scm-manager/ui-plugins": "^2.13.0-SNAPSHOT" - } + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml deleted file mode 100644 index 355bbd8da7..0000000000 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - 4.0.0 - - - scm-plugins - sonia.scm.plugins - 2.13.0-SNAPSHOT - - - scm-svn-plugin - smp - https://github.com/scm-manager/scm-manager - Plugin for the version control system Subversion - - - - - sonia.svnkit - svnkit - ${svnkit.version} - - - trilead-ssh2 - org.tmatesoft.svnkit - - - - - - sonia.svnkit - svnkit-dav - ${svnkit.version} - - - - - - - - - sonia.scm.maven - smp-maven-plugin - - true - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - - - - - - **/SCMSvnDiffGenerator.java - - - - - - maven.tmatesoft.com - tmatesoft release repository - https://maven.tmatesoft.com/content/repositories/releases - - - - - diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml deleted file mode 100644 index b73c76a825..0000000000 --- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - 2 - - - Subversion - Cloudogu GmbH - Source Code Management - /images/svn-logo.gif - - - - ${project.parent.version} - - - - - - - diff --git a/settings.gradle b/settings.gradle index 00f0975500..03ca67ab82 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,12 +24,22 @@ rootProject.name = 'scm' +def includePlugin(String name) { + include ":${name}" + project(":${name}").projectDir = new File("scm-plugins/${name}") +} + include('scm-annotations') include('scm-annotation-processor') include('scm-core') include('scm-test') // include('scm-ui') -// include('scm-plugins') +includePlugin('scm-git-plugin') +includePlugin('scm-hg-plugin') +includePlugin('scm-svn-plugin') +includePlugin('scm-legacy-plugin') +includePlugin('scm-integration-test-plugin') include('scm-dao-xml') include('scm-webapp') include('scm-server') +includeBuild '../gradle-smp-plugin'