diff --git a/.drone.yml b/.drone.yml index 9f9478cf..643a972e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ pipeline: image: openjdk:11-slim commands: - export GRADLE_USER_HOME=$${DRONE_WORKSPACE}/.gradle - - ./gradlew checkAll assembleAll -PisSnapshot=true + - ./gradlew checkAll assembleAll -Psnapshot=true when: event: [push, pull_request] @@ -28,7 +28,7 @@ pipeline: image: openjdk:11-slim commands: - export GRADLE_USER_HOME=$${DRONE_WORKSPACE}/.gradle - - ./gradlew publishAll -PisSnapshot=true -PdeployUser=$SNAPSHOT_USER -PdeployPassword=$SNAPSHOT_PASS + - ./gradlew publishAll -Psnapshot=true -PdeployUser=$SNAPSHOT_USER -PdeployPassword=$SNAPSHOT_PASS secrets: [ snapshot_user, snapshot_pass] when: event: push diff --git a/.yarnrc.yml b/.yarnrc.yml index 2554e817..f912b743 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,8 +1,8 @@ npmScopes: xtraplatform: - npmPublishRegistry: 'https://api.bintray.com/npm/iide/npm/' - npmRegistryServer: 'https://api.bintray.com/npm/iide/npm/' - npmAuthToken: '${BINTRAY_NPM_TOKEN:-not_set}' + npmPublishRegistry: 'https://dl.interactive-instruments.de/repository/npm/' + npmRegistryServer: 'https://dl.interactive-instruments.de/repository/npm/' + npmAuthToken: '${NPM_TOKEN:-not_set}' packageExtensions: 'eslint-module-utils@*': diff --git a/package.json b/package.json index 2ab65388..83f0639f 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "@storybook/addon-essentials": "^6.0.13", "@storybook/addon-links": "^6.0.13", "@storybook/react": "^6.0.13", - "@xtraplatform/manager": "^2.0.0-beta.12", - "@xtraplatform/neutrino": "^2.0.0-beta.4", + "@xtraplatform/manager": "^2.0.0", + "@xtraplatform/neutrino": "^2.0.0", "babel-loader": "^8", "core-js": "^3", "eslint": "^7.7.0", diff --git a/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/generators/templates/workspace/.yarnrc.yml b/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/generators/templates/workspace/.yarnrc.yml index 2554e817..f912b743 100644 --- a/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/generators/templates/workspace/.yarnrc.yml +++ b/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/generators/templates/workspace/.yarnrc.yml @@ -1,8 +1,8 @@ npmScopes: xtraplatform: - npmPublishRegistry: 'https://api.bintray.com/npm/iide/npm/' - npmRegistryServer: 'https://api.bintray.com/npm/iide/npm/' - npmAuthToken: '${BINTRAY_NPM_TOKEN:-not_set}' + npmPublishRegistry: 'https://dl.interactive-instruments.de/repository/npm/' + npmRegistryServer: 'https://dl.interactive-instruments.de/repository/npm/' + npmAuthToken: '${NPM_TOKEN:-not_set}' packageExtensions: 'eslint-module-utils@*': diff --git a/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/package.json b/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/package.json index b1df0aea..5dd3a311 100644 --- a/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/package.json +++ b/xtraplatform-build-tools/scaffolding/src/main/javascript/create-js/package.json @@ -1,6 +1,6 @@ { "name": "@xtraplatform/create-js", - "version": "2.0.0-beta.0", + "version": "2.0.0", "main": "index.js", "author": "interactive instruments GmbH", "license": "MPL-2.0", @@ -13,8 +13,8 @@ "@neutrinojs/eslint": "^9.3.0", "@neutrinojs/mocha": "^9.3.0", "@storybook/source-loader": "^6.0.14", - "@xtraplatform/core": "^2.0.0-beta.14", - "@xtraplatform/neutrino": "^2.0.0-beta.4", + "@xtraplatform/core": "^2.0.0", + "@xtraplatform/neutrino": "^2.0.0", "chalk": "^4.1.0", "yeoman-environment": "^2.10.3", "yeoman-generator": "^4.11.0" diff --git a/xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino/package.json b/xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino/package.json index 35da66a7..64e13152 100644 --- a/xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino/package.json +++ b/xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino/package.json @@ -1,6 +1,6 @@ { "name": "@xtraplatform/neutrino", - "version": "2.0.0-beta.4", + "version": "2.0.0", "main": "index.js", "author": "interactive instruments GmbH", "license": "MPL-2.0", diff --git a/xtraplatform-core/build.gradle b/xtraplatform-core/build.gradle index c1a14a5d..2f90f2c7 100755 --- a/xtraplatform-core/build.gradle +++ b/xtraplatform-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'de.interactive_instruments.xtraplatform-feature' version '3.5.1-SNAPSHOT' + id 'de.interactive_instruments.xtraplatform-feature' version '3.5.1' id "com.diffplug.spotless" version "5.1.2" apply false //id 'com.github.hierynomus.license-report' version '0.15.0' apply false } @@ -9,7 +9,7 @@ allprojects { } ext { - versionSuffix = project.findProperty('isSnapshot') == 'true' ? '-SNAPSHOT' : '' + versionSuffix = project.findProperty('snapshot') == 'true' ? '-SNAPSHOT' : '' } version = '3.5.0' + versionSuffix diff --git a/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/package.json b/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/package.json index 64a95831..6a6f8553 100644 --- a/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/package.json +++ b/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/package.json @@ -1,6 +1,6 @@ { "name": "@xtraplatform/core", - "version": "2.0.0-beta.14", + "version": "2.0.0", "author": "interactive instruments GmbH", "license": "MPL-2.0", "module": "src/index.js", @@ -28,7 +28,7 @@ "@neutrinojs/airbnb": "^9.3.0", "@neutrinojs/mocha": "^9.3.0", "@storybook/addon-docs": "^6.0.12", - "@xtraplatform/neutrino": "^2.0.0-beta.4", + "@xtraplatform/neutrino": "^2.0.0", "core-js": "^3", "eslint": "*", "eslint-import-resolver-node": "*", diff --git a/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/src/introduction.story.mdx b/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/src/introduction.story.mdx index c074fd9e..49b37791 100644 --- a/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/src/introduction.story.mdx +++ b/xtraplatform-core/xtraplatform-manager/src/main/javascript/core/src/introduction.story.mdx @@ -125,7 +125,7 @@ yarn dlx Now you can switch to the `javascript` directory and run: ``` -env "NPM_CONFIG_@xtraplatform:registry=https://api.bintray.com/npm/iide/npm/" npx @xtraplatform/create-module javascript geo_json +env "NPM_CONFIG_@xtraplatform:registry=https://dl.interactive-instruments.de/repository/npm/" npx @xtraplatform/create-module javascript geo_json ``` In this case the name of the module would be `geo_json`, so adjust to the desired name. diff --git a/xtraplatform-core/xtraplatform-manager/src/main/javascript/manager/package.json b/xtraplatform-core/xtraplatform-manager/src/main/javascript/manager/package.json index d616232a..b18df6fa 100644 --- a/xtraplatform-core/xtraplatform-manager/src/main/javascript/manager/package.json +++ b/xtraplatform-core/xtraplatform-manager/src/main/javascript/manager/package.json @@ -1,6 +1,6 @@ { "name": "@xtraplatform/manager", - "version": "2.0.0-beta.12", + "version": "2.0.0", "author": "interactive instruments GmbH", "license": "MPL-2.0", "module": "src/index.js", @@ -11,7 +11,7 @@ }, "peerDependencies": { "@apollo/client": "^3", - "@xtraplatform/core": "^2.0.0-beta.14", + "@xtraplatform/core": "^2.0.0", "feature-u": "^3", "grommet": "^2", "grommet-icons": "^4", @@ -27,8 +27,8 @@ "@apollo/client": "^3", "@neutrinojs/airbnb": "^9.3.0", "@neutrinojs/mocha": "^9.3.0", - "@xtraplatform/core": "^2.0.0-beta.14", - "@xtraplatform/neutrino": "^2.0.0-beta.4", + "@xtraplatform/core": "^2.0.0", + "@xtraplatform/neutrino": "^2.0.0", "core-js": "^3", "eslint": "*", "eslint-import-resolver-node": "*", diff --git a/xtraplatform-core/xtraplatform-services/src/main/javascript/package.json b/xtraplatform-core/xtraplatform-services/src/main/javascript/package.json index b738c29a..4469a3ad 100644 --- a/xtraplatform-core/xtraplatform-services/src/main/javascript/package.json +++ b/xtraplatform-core/xtraplatform-services/src/main/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@xtraplatform/services", - "version": "2.0.0-beta.11", + "version": "2.0.0", "author": "interactive instruments GmbH", "license": "MPL-2.0", "module": "src/index.js", @@ -11,8 +11,8 @@ }, "peerDependencies": { "@apollo/client": "^3", - "@xtraplatform/core": "^2.0.0-beta.14", - "@xtraplatform/manager": "^2.0.0-beta.12", + "@xtraplatform/core": "^2.0.0", + "@xtraplatform/manager": "^2.0.0", "feature-u": "^3", "grommet": "^2", "grommet-icons": "^4", @@ -28,9 +28,9 @@ "@apollo/client": "^3", "@neutrinojs/airbnb": "^9.3.0", "@neutrinojs/mocha": "^9.3.0", - "@xtraplatform/core": "^2.0.0-beta.14", - "@xtraplatform/manager": "^2.0.0-beta.12", - "@xtraplatform/neutrino": "^2.0.0-beta.4", + "@xtraplatform/core": "^2.0.0", + "@xtraplatform/manager": "^2.0.0", + "@xtraplatform/neutrino": "^2.0.0", "core-js": "^3", "eslint": "*", "eslint-import-resolver-node": "*", diff --git a/xtraplatform-dev/build.gradle b/xtraplatform-dev/build.gradle index 64d532ed..1c5e598d 100755 --- a/xtraplatform-dev/build.gradle +++ b/xtraplatform-dev/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'de.interactive_instruments.xtraplatform-feature' version '3.5.1-SNAPSHOT' + id 'de.interactive_instruments.xtraplatform-feature' version '3.5.1' } allprojects { @@ -7,7 +7,7 @@ allprojects { } ext { - versionSuffix = project.findProperty('isSnapshot') == 'true' ? '-SNAPSHOT' : '' + versionSuffix = project.findProperty('snapshot') == 'true' ? '-SNAPSHOT' : '' } version = '3.5.0' + versionSuffix diff --git a/yarn.lock b/yarn.lock index a83f8f6a..e8c68f01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3914,7 +3914,7 @@ __metadata: languageName: node linkType: hard -"@xtraplatform/core@^2.0.0-beta.14, @xtraplatform/core@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/core": +"@xtraplatform/core@^2.0.0, @xtraplatform/core@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/core": version: 0.0.0-use.local resolution: "@xtraplatform/core@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/core" dependencies: @@ -3923,7 +3923,7 @@ __metadata: "@neutrinojs/airbnb": ^9.3.0 "@neutrinojs/mocha": ^9.3.0 "@storybook/addon-docs": ^6.0.12 - "@xtraplatform/neutrino": ^2.0.0-beta.4 + "@xtraplatform/neutrino": ^2.0.0 check-prop-types: ^1.1.2 core-js: ^3 deepmerge: ^4.2.2 @@ -3974,23 +3974,23 @@ __metadata: "@neutrinojs/eslint": ^9.3.0 "@neutrinojs/mocha": ^9.3.0 "@storybook/source-loader": ^6.0.14 - "@xtraplatform/core": ^2.0.0-beta.14 - "@xtraplatform/neutrino": ^2.0.0-beta.4 + "@xtraplatform/core": ^2.0.0 + "@xtraplatform/neutrino": ^2.0.0 chalk: ^4.1.0 yeoman-environment: ^2.10.3 yeoman-generator: ^4.11.0 languageName: unknown linkType: soft -"@xtraplatform/manager@^2.0.0-beta.12, @xtraplatform/manager@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/manager": +"@xtraplatform/manager@^2.0.0, @xtraplatform/manager@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/manager": version: 0.0.0-use.local resolution: "@xtraplatform/manager@workspace:xtraplatform-core/xtraplatform-manager/src/main/javascript/manager" dependencies: "@apollo/client": ^3 "@neutrinojs/airbnb": ^9.3.0 "@neutrinojs/mocha": ^9.3.0 - "@xtraplatform/core": ^2.0.0-beta.14 - "@xtraplatform/neutrino": ^2.0.0-beta.4 + "@xtraplatform/core": ^2.0.0 + "@xtraplatform/neutrino": ^2.0.0 apollo-link-rest: ^0.8.0-beta.0 core-js: ^3 eslint: "*" @@ -4021,7 +4021,7 @@ __metadata: styled-components: ^5 peerDependencies: "@apollo/client": ^3 - "@xtraplatform/core": ^2.0.0-beta.14 + "@xtraplatform/core": ^2.0.0 feature-u: ^3 grommet: ^2 grommet-icons: ^4 @@ -4035,7 +4035,7 @@ __metadata: languageName: unknown linkType: soft -"@xtraplatform/neutrino@^2.0.0-beta.4, @xtraplatform/neutrino@workspace:xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino": +"@xtraplatform/neutrino@^2.0.0, @xtraplatform/neutrino@workspace:xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino": version: 0.0.0-use.local resolution: "@xtraplatform/neutrino@workspace:xtraplatform-build-tools/scaffolding/src/main/javascript/neutrino" dependencies: @@ -4054,9 +4054,9 @@ __metadata: "@apollo/client": ^3 "@neutrinojs/airbnb": ^9.3.0 "@neutrinojs/mocha": ^9.3.0 - "@xtraplatform/core": ^2.0.0-beta.14 - "@xtraplatform/manager": ^2.0.0-beta.12 - "@xtraplatform/neutrino": ^2.0.0-beta.4 + "@xtraplatform/core": ^2.0.0 + "@xtraplatform/manager": ^2.0.0 + "@xtraplatform/neutrino": ^2.0.0 apollo-link-rest: ^0.8.0-beta.0 core-js: ^3 deepmerge: ^4.2.2 @@ -4084,8 +4084,8 @@ __metadata: styled-components: ^5 peerDependencies: "@apollo/client": ^3 - "@xtraplatform/core": ^2.0.0-beta.14 - "@xtraplatform/manager": ^2.0.0-beta.12 + "@xtraplatform/core": ^2.0.0 + "@xtraplatform/manager": ^2.0.0 feature-u: ^3 grommet: ^2 grommet-icons: ^4 @@ -14013,8 +14013,8 @@ fsevents@^1.2.7: "@storybook/addon-essentials": ^6.0.13 "@storybook/addon-links": ^6.0.13 "@storybook/react": ^6.0.13 - "@xtraplatform/manager": ^2.0.0-beta.12 - "@xtraplatform/neutrino": ^2.0.0-beta.4 + "@xtraplatform/manager": ^2.0.0 + "@xtraplatform/neutrino": ^2.0.0 babel-loader: ^8 core-js: ^3 eslint: ^7.7.0