Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 08:06:09 +01:00
Code Issues Packages Projects Releases Activity

Use Java 11 as compile version (#2033)

Browse Source 
This sets Java 11 for compilation. To do so, this has to use the gradle smp plugin with the pull request scm-manager/gradle-smp-plugin#16. If the smp plugin is not released as version 0.10.4, the version has to be corrected for org.scm-manager.smpin the various build.gradle files.

It might be necessary to delete all build folders when switching between Java 8 and Java 11:

rm -rf build */build scm-plugins/*/build

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
This commit is contained in:
René Pfeuffer
2022-05-18 08:56:41 +02:00
committed by GitHub
parent 8448a3520b
commit 9bfb074805
30 changed files with 183 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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

4
build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy
View File

@@ -46,7 +46,7 @@ class JavaModulePlugin implements Plugin<Project> {
}
project.tasks.withType(JavaCompile) {
options.release = 8
options.release = 11
options.encoding = 'UTF-8'
}
@@ -56,7 +56,7 @@ class JavaModulePlugin implements Plugin<Project> {
project.sonarqube {
properties {
property "sonar.java.source", "8"
property "sonar.java.source", "11"
}
}

2
gradle.properties
View File

@@ -22,5 +22,5 @@
# SOFTWARE.
#
group = sonia.scm
version = 2.34.1-SNAPSHOT
version = 2.35.0-SNAPSHOT
org.gradle.jvmargs=-Xmx1024M

2
gradle/changelog/java-11.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: changed
description: Migrate to Java 11 ([#1982](https://github.com/scm-manager/scm-manager/pull/1982))

2
lerna.json
View File

@@ -5,5 +5,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "2.34.1-SNAPSHOT"
"version": "2.35.0-SNAPSHOT"
}

2
scm-plugins/scm-git-plugin/build.gradle
View File

@@ -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'

68
scm-plugins/scm-git-plugin/package.json
View File

@@ -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"
}
}

2
scm-plugins/scm-hg-plugin/build.gradle
View File

@@ -23,7 +23,7 @@
*/
plugins {
id 'org.scm-manager.smp' version '0.10.1'
id 'org.scm-manager.smp' version '0.11.0'
}
dependencies {

66
scm-plugins/scm-hg-plugin/package.json
View File

@@ -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"
}
}

2
scm-plugins/scm-integration-test-plugin/build.gradle
View File

@@ -23,7 +23,7 @@
*/
plugins {
id 'org.scm-manager.smp' version '0.10.1'
id 'org.scm-manager.smp' version '0.11.0'
}
dependencies {

2
scm-plugins/scm-legacy-plugin/build.gradle
View File

@@ -23,7 +23,7 @@
*/
plugins {
id 'org.scm-manager.smp' version '0.10.1'
id 'org.scm-manager.smp' version '0.11.0'
}
dependencies {

66
scm-plugins/scm-legacy-plugin/package.json
View File

@@ -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"
}
}

2
scm-plugins/scm-svn-plugin/build.gradle
View File

@@ -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'

66
scm-plugins/scm-svn-plugin/package.json
View File

@@ -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"
}
}

2
scm-ui/e2e-tests/package.json
View File

@@ -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 <eduard.heimbuch@cloudogu.com>",

4
scm-ui/ui-api/package.json
View File

@@ -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",

10
scm-ui/ui-components/package.json
View File

@@ -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",

4
scm-ui/ui-extensions/package.json
View File

@@ -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": {

8
scm-ui/ui-legacy/package.json
View File

@@ -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"

2
scm-ui/ui-modules/package.json
View File

@@ -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": {

12
scm-ui/ui-plugins/package.json
View File

@@ -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",

2
scm-ui/ui-polyfill/package.json
View File

@@ -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 <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-scripts/package.json
View File

@@ -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 <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-styles/package.json
View File

@@ -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",

4
scm-ui/ui-syntaxhighlighting/package.json
View File

@@ -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"

2
scm-ui/ui-tests/package.json
View File

@@ -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 <sebastian.sdorra@cloudogu.com>",
"license": "MIT",

2
scm-ui/ui-text/package.json
View File

@@ -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": {

2
scm-ui/ui-types/package.json
View File

@@ -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": [

16
scm-ui/ui-webapp/package.json
View File

@@ -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",

2
settings.gradle
View File

@@ -48,7 +48,7 @@ enforce {
r.version = '11'
}
rule(enforcer.rules.EnforceBytecodeVersion) { r ->
r.maxJdkVersion = '1.8'
r.maxJdkVersion = '11'
}
}