diff options
author | Matthias Villiger | 2019-11-19 13:49:51 +0000 |
---|---|---|
committer | Matthias Villiger | 2019-11-20 02:42:31 +0000 |
commit | cdc4ea1b41146cae1fd863daa44e45794e8f32a1 (patch) | |
tree | 4d5f3f32a4d1ce4f3358871d1ef207e2f349f28f | |
parent | 1bbaf015a8b18055cd68f16ea97e5ca6df7daaef (diff) | |
download | org.eclipse.scout.rt-cdc4ea1b41146cae1fd863daa44e45794e8f32a1.tar.gz org.eclipse.scout.rt-cdc4ea1b41146cae1fd863daa44e45794e8f32a1.tar.xz org.eclipse.scout.rt-cdc4ea1b41146cae1fd863daa44e45794e8f32a1.zip |
Update maven master and add releng module
-rw-r--r-- | eclipse-scout-releng/eclipse-scout-releng.iml | 12 | ||||
-rw-r--r-- | eclipse-scout-releng/package.json | 8 | ||||
-rw-r--r-- | eclipse-scout-releng/pom.xml | 23 | ||||
-rw-r--r-- | eclipse-scout-testing/package.json | 1 | ||||
-rw-r--r-- | eslint-config/package.json | 1 | ||||
-rw-r--r-- | org.eclipse.scout.rt/pom.xml | 3 |
6 files changed, 42 insertions, 6 deletions
diff --git a/eclipse-scout-releng/eclipse-scout-releng.iml b/eclipse-scout-releng/eclipse-scout-releng.iml new file mode 100644 index 0000000000..f409c0ea8d --- /dev/null +++ b/eclipse-scout-releng/eclipse-scout-releng.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/eclipse-scout-releng/package.json b/eclipse-scout-releng/package.json index e698943b47..ab73588a75 100644 --- a/eclipse-scout-releng/package.json +++ b/eclipse-scout-releng/package.json @@ -22,9 +22,11 @@ "scripts" ], "scripts": { - "snapshot-version": "node bin/releng-scripts snapshot-version", - "release-version": "node bin/releng-scripts release-version", - "snapshot-cleanup": "node bin/releng-scripts snapshot-cleanup" + "snapshot-cleanup": "node bin/releng-scripts snapshot-cleanup", + "snapshot-predependency": "node bin/releng-scripts snapshot-install-dependency", + "snapshot-postdependency": "node bin/releng-scripts snapshot-publish-dependency", + "release-predependency": "node bin/releng-scripts release-install-dependency", + "release-postdependency": "node bin/releng-scripts release-publish-dependency" }, "dependencies": { "axios": "0.19.0", diff --git a/eclipse-scout-releng/pom.xml b/eclipse-scout-releng/pom.xml new file mode 100644 index 0000000000..9ffa8d232c --- /dev/null +++ b/eclipse-scout-releng/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.scout.rt</groupId> + <artifactId>org.eclipse.scout.rt</artifactId> + <version>10.0.0-SNAPSHOT</version> + <relativePath>../org.eclipse.scout.rt/pom.xml</relativePath> + </parent> + + <artifactId>eclipse-scout-releng</artifactId> + + <properties> + <master_skip_pnpm_install_dev>true</master_skip_pnpm_install_dev> + <master_skip_pnpm_install_prod>true</master_skip_pnpm_install_prod> + <master_skip_karma_test>true</master_skip_karma_test> + <master_skip_copy_webpack_build_output>true</master_skip_copy_webpack_build_output> + </properties> + +</project> diff --git a/eclipse-scout-testing/package.json b/eclipse-scout-testing/package.json index 97f2666d27..43aaeed7c8 100644 --- a/eclipse-scout-testing/package.json +++ b/eclipse-scout-testing/package.json @@ -29,7 +29,6 @@ "release-postdependency": "releng-scripts release-publish-dependency" }, "devDependencies": { - "@eclipse-scout/cli": "10.0.0-snapshot", "@eclipse-scout/releng": "10.0.0", "jquery": "3.4.1", "@eclipse-scout/core": "10.0.0-snapshot" diff --git a/eslint-config/package.json b/eslint-config/package.json index bead84c76c..afde729703 100644 --- a/eslint-config/package.json +++ b/eslint-config/package.json @@ -49,7 +49,6 @@ "release-postdependency": "releng-scripts release-publish-dependency" }, "devDependencies": { - "@eclipse-scout/cli": "10.0.0-snapshot", "@eclipse-scout/releng": "10.0.0", "eslint": "6.5.1" }, diff --git a/org.eclipse.scout.rt/pom.xml b/org.eclipse.scout.rt/pom.xml index 97ef353cd0..b72f398507 100644 --- a/org.eclipse.scout.rt/pom.xml +++ b/org.eclipse.scout.rt/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.eclipse.scout</groupId> <artifactId>maven_rt_plugin_config-master</artifactId> - <version>3.6.0</version> + <version>3.7.0-SNAPSHOT</version> <relativePath></relativePath> </parent> @@ -79,6 +79,7 @@ <module>../org.eclipse.scout.rt-settings</module> <module>../org.eclipse.scout.migration.ecma6</module> + <module>../eclipse-scout-releng</module> <module>../eclipse-scout-cli</module> <module>../eclipse-scout-core</module> <module>../eclipse-scout-testing</module> |