MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

moved maven from v3.3.9 to 3.6.0 - reverting in master

Browse Source
This commit is contained in:
Alexander Bubenchikov
2019-03-13 12:10:10 +03:00
parent e1c867fe8e
commit f848949510
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/dependencies/gradle.properties
+1 -1
View File
@@ -4,6 +4,6 @@ kotlinPluginBuild=1.3.21-release-IJ2019.1-2
jetSignBuild=42.30
secondJreVersion=11
secondJreBuild=11_0_2b185.4
bundledMavenVersion=3.3.9
bundledMavenVersion=3.6.0
jdkBuild=u202b1514.10
gradleApiVersion=4.10.3
build/dependencies/setupBundledMaven.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ dependencies {
}
def communityPluginsDir = project.file("../../plugins")
def mavenServerLibDir = "$communityPluginsDir/maven/maven3-server-impl/lib/"
def mavenServerLibDir = "$communityPluginsDir/maven/maven36-server-impl/lib/"
def mavenDistName = "apache-maven-$bundledMavenVersion"
task unpackMavenDistribution( type: Copy) {
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+2 -2
View File
@@ -344,11 +344,11 @@ class CommunityLibraryLicenses {
libraryName: 'org.apache.maven:maven-aether-provider',
additionalLibraryNames: ['org.apache.maven:maven-model-builder', 'org.apache.maven:maven-artifact', 'org.apache.maven:maven-repository-metadata', 'org.apache.maven:maven-builder-support'],
licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "Maven Model", version: "3.3.9", libraryName: "maven-model", license: "Apache 2.0",
new LibraryLicense(name: "Maven Model", version: "3.6.0", libraryName: "maven-model", license: "Apache 2.0",
url: "http://maven.apache.org/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "Maven3", attachedTo: "intellij.maven.server.m3.common",
additionalLibraryNames: ["org.apache.maven.shared:maven-dependency-tree:1.2", "org.apache.maven.archetype:archetype-common:2.2"],
version: "3.3.9", license: "Apache 2.0", url: "http://maven.apache.org/",
version: "3.6.0", license: "Apache 2.0", url: "http://maven.apache.org/",
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "Memory File System", libraryName: "memoryfilesystem", version: "1.3.0", license: "MIT",
url: "https://github.com/marschall/memoryfilesystem", licenseUrl: "http://opensource.org/licenses/MIT"),
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+1 -1
View File
@@ -158,7 +158,7 @@ class CommunityRepositoryModules {
withModule("intellij.maven.artifactResolver.common", "artifact-resolver-m3.jar")
withModule("intellij.maven.artifactResolver.m31", "artifact-resolver-m31.jar")
withModule("intellij.maven.artifactResolver.common", "artifact-resolver-m31.jar")
withResource("maven3-server-impl/lib/maven3", "lib/maven3")
withResource("maven36-server-impl/lib/maven3", "lib/maven3")
withResource("maven3-server-common/lib", "lib/maven3-server-lib")
withResource("maven2-server-impl/lib/maven2", "lib/maven2")
[
plugins/maven/maven3-server-impl/.gitignore
-1
View File
@@ -1 +0,0 @@
lib/*
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
if (pluginFileOrDir.isDirectory()) {
File parentFile = getMavenPluginParentFile();
myBundledMaven2Home = new File(parentFile, "maven2-server-impl/lib/maven2");
myBundledMaven3Home = new File(parentFile, "maven3-server-impl/lib/maven3");
myBundledMaven3Home = new File(parentFile, "maven36-server-impl/lib/maven3");
}
else {
myBundledMaven2Home = new File(root, "maven2");