diff --git a/README.md b/README.md index f5ea748e18..75f10a024e 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ The build of SCM-Manager requires the following installed packages: * Mercurial (required for tests) * Docker (required for the docker package) -The build of SCM-Manager requires Java 11, but the target runtime platform is still Java 8. +The build of SCM-Manager requires Java 11. ### Tasks diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy index 18e9aff5b2..d215022b51 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy @@ -46,7 +46,7 @@ class JavaModulePlugin implements Plugin { } project.tasks.withType(JavaCompile) { - options.release = 8 + options.release = 11 options.encoding = 'UTF-8' } @@ -56,7 +56,7 @@ class JavaModulePlugin implements Plugin { project.sonarqube { properties { - property "sonar.java.source", "8" + property "sonar.java.source", "11" } } diff --git a/gradle.properties b/gradle.properties index 6e25b980f0..fee55c1ab5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ # SOFTWARE. # group = sonia.scm -version = 2.34.1-SNAPSHOT +version = 2.35.0-SNAPSHOT org.gradle.jvmargs=-Xmx1024M diff --git a/gradle/changelog/java-11.yaml b/gradle/changelog/java-11.yaml new file mode 100644 index 0000000000..b7d5b0c512 --- /dev/null +++ b/gradle/changelog/java-11.yaml @@ -0,0 +1,2 @@ +- type: changed + description: Migrate to Java 11 ([#1982](https://github.com/scm-manager/scm-manager/pull/1982)) diff --git a/lerna.json b/lerna.json index 6f02908a49..0b783b4f9f 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.34.1-SNAPSHOT" + "version": "2.35.0-SNAPSHOT" } diff --git a/scm-plugins/scm-git-plugin/build.gradle b/scm-plugins/scm-git-plugin/build.gradle index 63d1cde6f4..5dc2fc28e2 100644 --- a/scm-plugins/scm-git-plugin/build.gradle +++ b/scm-plugins/scm-git-plugin/build.gradle @@ -23,7 +23,7 @@ */ plugins { - id 'org.scm-manager.smp' version '0.10.1' + id 'org.scm-manager.smp' version '0.11.0' } def jgitVersion = '5.11.1.202105131744-r-scm1' diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 367dd9fccb..9407767d93 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -1,36 +1,36 @@ { - "name": "@scm-manager/scm-git-plugin", - "private": true, - "version": "2.34.1-SNAPSHOT", - "license": "MIT", - "main": "./src/main/js/index.ts", - "scripts": { - "build": "plugin-scripts build", - "watch": "plugin-scripts watch", - "test": "jest", - "typecheck": "tsc" - }, - "dependencies": { - "@scm-manager/ui-plugins": "^2.34.1-SNAPSHOT" - }, - "devDependencies": { - "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/eslint-config": "^2.15.1", - "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/plugin-scripts": "^1.2.2", - "@scm-manager/prettier-config": "^2.11.1", - "@types/react": "^17.0.1" - }, - "babel": { - "presets": [ - "@scm-manager/babel-preset" - ] - }, - "jest": { - "preset": "@scm-manager/jest-preset" - }, - "prettier": "@scm-manager/prettier-config", - "eslintConfig": { - "extends": "@scm-manager/eslint-config" - } + "name": "@scm-manager/scm-git-plugin", + "private": true, + "version": "2.35.0-SNAPSHOT", + "license": "MIT", + "main": "./src/main/js/index.ts", + "scripts": { + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", + "test": "jest", + "typecheck": "tsc" + }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.35.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/babel-preset": "^2.13.1", + "@scm-manager/eslint-config": "^2.15.1", + "@scm-manager/jest-preset": "^2.13.0", + "@scm-manager/plugin-scripts": "^1.2.2", + "@scm-manager/prettier-config": "^2.11.1", + "@types/react": "^17.0.1" + }, + "babel": { + "presets": [ + "@scm-manager/babel-preset" + ] + }, + "jest": { + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config", + "eslintConfig": { + "extends": "@scm-manager/eslint-config" + } } diff --git a/scm-plugins/scm-hg-plugin/build.gradle b/scm-plugins/scm-hg-plugin/build.gradle index 1e0e807128..303fde4317 100644 --- a/scm-plugins/scm-hg-plugin/build.gradle +++ b/scm-plugins/scm-hg-plugin/build.gradle @@ -23,7 +23,7 @@ */ plugins { - id 'org.scm-manager.smp' version '0.10.1' + id 'org.scm-manager.smp' version '0.11.0' } dependencies { diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 946ce8e63e..d359cbb6ca 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -1,35 +1,35 @@ { - "name": "@scm-manager/scm-hg-plugin", - "private": true, - "version": "2.34.1-SNAPSHOT", - "license": "MIT", - "main": "./src/main/js/index.ts", - "scripts": { - "build": "plugin-scripts build", - "watch": "plugin-scripts watch", - "typecheck": "tsc" - }, - "dependencies": { - "@scm-manager/ui-plugins": "^2.34.1-SNAPSHOT" - }, - "devDependencies": { - "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/eslint-config": "^2.15.1", - "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/plugin-scripts": "^1.2.2", - "@scm-manager/prettier-config": "^2.11.1", - "@types/react": "^17.0.1" - }, - "babel": { - "presets": [ - "@scm-manager/babel-preset" - ] - }, - "jest": { - "preset": "@scm-manager/jest-preset" - }, - "prettier": "@scm-manager/prettier-config", - "eslintConfig": { - "extends": "@scm-manager/eslint-config" - } + "name": "@scm-manager/scm-hg-plugin", + "private": true, + "version": "2.35.0-SNAPSHOT", + "license": "MIT", + "main": "./src/main/js/index.ts", + "scripts": { + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", + "typecheck": "tsc" + }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.35.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/babel-preset": "^2.13.1", + "@scm-manager/eslint-config": "^2.15.1", + "@scm-manager/jest-preset": "^2.13.0", + "@scm-manager/plugin-scripts": "^1.2.2", + "@scm-manager/prettier-config": "^2.11.1", + "@types/react": "^17.0.1" + }, + "babel": { + "presets": [ + "@scm-manager/babel-preset" + ] + }, + "jest": { + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config", + "eslintConfig": { + "extends": "@scm-manager/eslint-config" + } } diff --git a/scm-plugins/scm-integration-test-plugin/build.gradle b/scm-plugins/scm-integration-test-plugin/build.gradle index 04d5fa70b7..f23bbeecd3 100644 --- a/scm-plugins/scm-integration-test-plugin/build.gradle +++ b/scm-plugins/scm-integration-test-plugin/build.gradle @@ -23,7 +23,7 @@ */ plugins { - id 'org.scm-manager.smp' version '0.10.1' + id 'org.scm-manager.smp' version '0.11.0' } dependencies { diff --git a/scm-plugins/scm-legacy-plugin/build.gradle b/scm-plugins/scm-legacy-plugin/build.gradle index 497058e67d..55941a8efd 100644 --- a/scm-plugins/scm-legacy-plugin/build.gradle +++ b/scm-plugins/scm-legacy-plugin/build.gradle @@ -23,7 +23,7 @@ */ plugins { - id 'org.scm-manager.smp' version '0.10.1' + id 'org.scm-manager.smp' version '0.11.0' } dependencies { diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 05add0dc39..6207fa30be 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -1,35 +1,35 @@ { - "name": "@scm-manager/scm-legacy-plugin", - "private": true, - "version": "2.34.1-SNAPSHOT", - "license": "MIT", - "main": "./src/main/js/index.tsx", - "scripts": { - "build": "plugin-scripts build", - "watch": "plugin-scripts watch", - "typecheck": "tsc" - }, - "dependencies": { - "@scm-manager/ui-plugins": "^2.34.1-SNAPSHOT" - }, - "devDependencies": { - "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/eslint-config": "^2.15.1", - "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/plugin-scripts": "^1.2.2", - "@scm-manager/prettier-config": "^2.11.1", - "@types/react": "^17.0.1" - }, - "babel": { - "presets": [ - "@scm-manager/babel-preset" - ] - }, - "jest": { - "preset": "@scm-manager/jest-preset" - }, - "prettier": "@scm-manager/prettier-config", - "eslintConfig": { - "extends": "@scm-manager/eslint-config" - } + "name": "@scm-manager/scm-legacy-plugin", + "private": true, + "version": "2.35.0-SNAPSHOT", + "license": "MIT", + "main": "./src/main/js/index.tsx", + "scripts": { + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", + "typecheck": "tsc" + }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.35.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/babel-preset": "^2.13.1", + "@scm-manager/eslint-config": "^2.15.1", + "@scm-manager/jest-preset": "^2.13.0", + "@scm-manager/plugin-scripts": "^1.2.2", + "@scm-manager/prettier-config": "^2.11.1", + "@types/react": "^17.0.1" + }, + "babel": { + "presets": [ + "@scm-manager/babel-preset" + ] + }, + "jest": { + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config", + "eslintConfig": { + "extends": "@scm-manager/eslint-config" + } } diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle index 1d4b13e1ff..147e6ed566 100644 --- a/scm-plugins/scm-svn-plugin/build.gradle +++ b/scm-plugins/scm-svn-plugin/build.gradle @@ -23,7 +23,7 @@ */ plugins { - id 'org.scm-manager.smp' version '0.10.1' + id 'org.scm-manager.smp' version '0.11.0' } def svnkitVersion = '1.10.3-scm2' diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index 09aa006112..9d77ee0618 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -1,35 +1,35 @@ { - "name": "@scm-manager/scm-svn-plugin", - "private": true, - "version": "2.34.1-SNAPSHOT", - "license": "MIT", - "main": "./src/main/js/index.ts", - "scripts": { - "build": "plugin-scripts build", - "watch": "plugin-scripts watch", - "typecheck": "tsc" - }, - "dependencies": { - "@scm-manager/ui-plugins": "^2.34.1-SNAPSHOT" - }, - "devDependencies": { - "@scm-manager/babel-preset": "^2.13.1", - "@scm-manager/eslint-config": "^2.15.1", - "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/plugin-scripts": "^1.2.2", - "@scm-manager/prettier-config": "^2.11.1", - "@types/react": "^17.0.1" - }, - "babel": { - "presets": [ - "@scm-manager/babel-preset" - ] - }, - "jest": { - "preset": "@scm-manager/jest-preset" - }, - "prettier": "@scm-manager/prettier-config", - "eslintConfig": { - "extends": "@scm-manager/eslint-config" - } + "name": "@scm-manager/scm-svn-plugin", + "private": true, + "version": "2.35.0-SNAPSHOT", + "license": "MIT", + "main": "./src/main/js/index.ts", + "scripts": { + "build": "plugin-scripts build", + "watch": "plugin-scripts watch", + "typecheck": "tsc" + }, + "dependencies": { + "@scm-manager/ui-plugins": "^2.35.0-SNAPSHOT" + }, + "devDependencies": { + "@scm-manager/babel-preset": "^2.13.1", + "@scm-manager/eslint-config": "^2.15.1", + "@scm-manager/jest-preset": "^2.13.0", + "@scm-manager/plugin-scripts": "^1.2.2", + "@scm-manager/prettier-config": "^2.11.1", + "@types/react": "^17.0.1" + }, + "babel": { + "presets": [ + "@scm-manager/babel-preset" + ] + }, + "jest": { + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config", + "eslintConfig": { + "extends": "@scm-manager/eslint-config" + } } diff --git a/scm-ui/e2e-tests/package.json b/scm-ui/e2e-tests/package.json index 6a62357552..cf132d36b4 100644 --- a/scm-ui/e2e-tests/package.json +++ b/scm-ui/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/e2e-tests", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "End to end Tests for SCM-Manager", "main": "index.js", "author": "Eduard Heimbuch ", diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json index 92a97bdd93..703e9025cc 100644 --- a/scm-ui/ui-api/package.json +++ b/scm-ui/ui-api/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-api", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "React hook api for the SCM-Manager backend", "main": "src/index.ts", "files": [ @@ -25,7 +25,7 @@ "react-test-renderer": "^17.0.1" }, "dependencies": { - "@scm-manager/ui-types": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-types": "^2.35.0-SNAPSHOT", "fetch-mock-jest": "^1.5.1", "gitdiff-parser": "^0.2.2", "query-string": "6.14.1", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index b70bd96eae..85804c05e7 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-components", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "UI Components for SCM-Manager and its plugins", "main": "src/index.ts", "files": [ @@ -25,7 +25,7 @@ "@scm-manager/jest-preset": "^2.13.0", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-tests": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-tests": "^2.35.0-SNAPSHOT", "@storybook/addon-actions": "^6.4.20", "@storybook/addon-essentials": "^6.4.20", "@storybook/addon-interactions": "^6.4.20", @@ -64,9 +64,9 @@ }, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-types": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-api": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.35.0-SNAPSHOT", "classnames": "^2.2.6", "date-fns": "^2.4.1", "deepmerge": "^4.2.2", diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index aa58d3792e..5d1fc08a2e 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-extensions", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "main": "src/index.ts", "license": "MIT", "private": false, @@ -10,7 +10,7 @@ "test": "jest" }, "dependencies": { - "@scm-manager/ui-types": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-types": "^2.35.0-SNAPSHOT", "react": "^17.0.1" }, "devDependencies": { diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json index 3b78e0e28c..652c836a5e 100644 --- a/scm-ui/ui-legacy/package.json +++ b/scm-ui/ui-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-legacy", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -8,9 +8,9 @@ "lint": "eslint src" }, "dependencies": { - "@scm-manager/ui-api": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-types": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-api": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.35.0-SNAPSHOT", "react": "^17.0.1", "react-redux": "^5.0.7", "redux": "^4.0.0" diff --git a/scm-ui/ui-modules/package.json b/scm-ui/ui-modules/package.json index 74329a68d2..14770acf44 100644 --- a/scm-ui/ui-modules/package.json +++ b/scm-ui/ui-modules/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-modules", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { diff --git a/scm-ui/ui-plugins/package.json b/scm-ui/ui-plugins/package.json index c2324f50cf..60382a5dea 100644 --- a/scm-ui/ui-plugins/package.json +++ b/scm-ui/ui-plugins/package.json @@ -1,13 +1,13 @@ { "name": "@scm-manager/ui-plugins", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "license": "MIT", "bin": { "ui-plugins": "./bin/ui-plugins.js" }, "dependencies": { - "@scm-manager/ui-components": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-components": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.35.0-SNAPSHOT", "classnames": "^2.2.6", "query-string": "6.14.1", "react": "^17.0.1", @@ -26,9 +26,9 @@ "@scm-manager/plugin-scripts": "^1.2.2", "@scm-manager/prettier-config": "^2.10.1", "@scm-manager/tsconfig": "^2.13.0", - "@scm-manager/ui-scripts": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-tests": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-types": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-scripts": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-tests": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-types": "^2.35.0-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index e949711eb1..1b791bff93 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-polyfill", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "Polyfills for SCM-Manager UI", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-scripts/package.json b/scm-ui/ui-scripts/package.json index d1d46ccf03..cb136db618 100644 --- a/scm-ui/ui-scripts/package.json +++ b/scm-ui/ui-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-scripts", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "Build scripts for SCM-Manager", "main": "src/index.js", "author": "Sebastian Sdorra ", diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 50da36dcad..973bee5ff3 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-styles", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "Styles for SCM-Manager", "main": "src/scm.scss", "license": "MIT", diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json index de62d09e1f..185c9c8304 100644 --- a/scm-ui/ui-syntaxhighlighting/package.json +++ b/scm-ui/ui-syntaxhighlighting/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-syntaxhighlighting", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { @@ -11,7 +11,7 @@ "write-mapping": "node scripts/write-mapping.mjs" }, "dependencies": { - "@scm-manager/ui-text": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-text": "^2.35.0-SNAPSHOT", "nanoid": "^3.3.2", "react-diff-view": "^2.4.10", "refractor": "^4.5.0" diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 11988dd0ed..1a057867b4 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-tests", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "UI-Tests helpers", "author": "Sebastian Sdorra ", "license": "MIT", diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json index b2d3b7f5d3..3faef6302f 100644 --- a/scm-ui/ui-text/package.json +++ b/scm-ui/ui-text/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-text", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "private": true, "main": "src/index.ts", "scripts": { diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index d7dbfa6305..d319b98bd7 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -1,6 +1,6 @@ { "name": "@scm-manager/ui-types", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "description": "Typescript types for SCM-Manager related Objects", "main": "src/index.ts", "files": [ diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 09b4150206..439ef0d3dd 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,15 +1,15 @@ { "name": "@scm-manager/ui-webapp", - "version": "2.34.1-SNAPSHOT", + "version": "2.35.0-SNAPSHOT", "private": true, "dependencies": { "@headlessui/react": "^1.4.3", - "@scm-manager/ui-api": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-components": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-extensions": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-modules": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-syntaxhighlighting": "^2.34.1-SNAPSHOT", - "@scm-manager/ui-text": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-api": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-components": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-extensions": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-modules": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-syntaxhighlighting": "^2.35.0-SNAPSHOT", + "@scm-manager/ui-text": "^2.35.0-SNAPSHOT", "classnames": "^2.2.5", "history": "^4.10.1", "i18next": "^19.6.0", @@ -36,7 +36,7 @@ "devDependencies": { "@scm-manager/eslint-config": "^2.15.1", "@scm-manager/jest-preset": "^2.13.0", - "@scm-manager/ui-tests": "^2.34.1-SNAPSHOT", + "@scm-manager/ui-tests": "^2.35.0-SNAPSHOT", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.3", "@types/fetch-mock": "^7.3.1", diff --git a/settings.gradle b/settings.gradle index 6d382f7959..2cbaa38e3a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,7 +48,7 @@ enforce { r.version = '11' } rule(enforcer.rules.EnforceBytecodeVersion) { r -> - r.maxJdkVersion = '1.8' + r.maxJdkVersion = '11' } }