MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

update libs

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-03-08 14:34:11 +01:00
parent 06e426615b
commit b62bcd09e2
12 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/libraries/assertJ.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="assertJ" type="repository">
<properties maven-id="org.assertj:assertj-core:3.11.1" />
<properties maven-id="org.assertj:assertj-core:3.12.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.12.1/assertj-core-3.12.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.12.1/assertj-core-3.12.1-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/assertj_swing.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="assertj-swing" type="repository">
<properties include-transitive-deps="false" maven-id="org.assertj:assertj-swing:3.8.0" />
<properties include-transitive-deps="false" maven-id="org.assertj:assertj-swing:3.9.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-swing/3.8.0/assertj-swing-3.8.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-swing/3.9.2/assertj-swing-3.9.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-swing/3.8.0/assertj-swing-3.8.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-swing/3.9.2/assertj-swing-3.9.2-sources.jar!/" />
</SOURCES>
</library>
</component>

4
.idea/libraries/batik.xml generated
View File

@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="batik" type="repository">
<properties include-transitive-deps="false" maven-id="org.apache.xmlgraphics:batik-all:1.10" />
<properties include-transitive-deps="false" maven-id="org.apache.xmlgraphics:batik-all:1.11" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-all/1.10/batik-all-1.10.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

6
.idea/libraries/bouncy_castle_provider.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="bouncy-castle-provider" type="repository">
<properties maven-id="org.bouncycastle:bcprov-jdk15on:1.60" />
<properties maven-id="org.bouncycastle:bcprov-jdk15on:1.61" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.61/bcprov-jdk15on-1.61.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.61/bcprov-jdk15on-1.61-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/cli_parser.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="cli-parser" type="repository">
<properties maven-id="com.github.spullara.cli-parser:cli-parser:1.1.2" />
<properties maven-id="com.github.spullara.cli-parser:cli-parser:1.1.5" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/cli-parser/cli-parser/1.1.2/cli-parser-1.1.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/cli-parser/cli-parser/1.1.5/cli-parser-1.1.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/cli-parser/cli-parser/1.1.2/cli-parser-1.1.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/spullara/cli-parser/cli-parser/1.1.5/cli-parser-1.1.5-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/commons_codec.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="commons-codec" type="repository">
<properties maven-id="commons-codec:commons-codec:1.10" />
<properties maven-id="commons-codec:commons-codec:1.12" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.12/commons-codec-1.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.12/commons-codec-1.12-sources.jar!/" />
</SOURCES>
</library>
</component>

12
.idea/libraries/delight_rhino_sandbox.xml generated
View File

@@ -1,8 +1,16 @@
<component name="libraryTable">
<library name="delight-rhino-sandbox" type="repository">
<properties include-transitive-deps="false" maven-id="org.javadelight:delight-rhino-sandbox:0.0.9" />
<properties maven-id="org.javadelight:delight-rhino-sandbox:0.0.10">
<exclude>
<dependency maven-id="org.mozilla:rhino" />
<dependency maven-id="com.google.guava:guava" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.9/delight-rhino-sandbox-0.0.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.10/delight-rhino-sandbox-0.0.10.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib/2.14.0/org.eclipse.xtend.lib-2.14.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtext/org.eclipse.xtext.xbase.lib/2.14.0/org.eclipse.xtext.xbase.lib-2.14.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/xtend/org.eclipse.xtend.lib.macro/2.14.0/org.eclipse.xtend.lib.macro-2.14.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

23
.idea/libraries/http_client.xml generated
View File

@@ -1,20 +1,21 @@
<component name="libraryTable">
<library name="http-client" type="repository">
<properties maven-id="org.apache.httpcomponents:httpmime:4.5.6" />
<properties maven-id="org.apache.httpcomponents:httpmime:4.5.7">
<exclude>
<dependency maven-id="commons-logging:commons-logging" />
<dependency maven-id="commons-codec:commons-codec" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.7/httpmime-4.5.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.7/httpclient-4.5.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.10/commons-codec-1.10-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.7/httpmime-4.5.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.7/httpclient-4.5.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/memoryfilesystem.xml generated
View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="memoryfilesystem" type="repository">
<properties maven-id="com.github.marschall:memoryfilesystem:1.3.0" />
<properties maven-id="com.github.marschall:memoryfilesystem:2.1.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/marschall/memoryfilesystem/1.3.0/memoryfilesystem-1.3.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/marschall/memoryfilesystem/2.1.0/memoryfilesystem-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/github/marschall/memoryfilesystem/1.3.0/memoryfilesystem-1.3.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/github/marschall/memoryfilesystem/2.1.0/memoryfilesystem-2.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/mockito.xml generated
View File

@@ -1,17 +1,17 @@
<component name="libraryTable">
<library name="mockito" type="repository">
<properties maven-id="org.mockito:mockito-core:2.21.0" />
<properties maven-id="org.mockito:mockito-core:2.25.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.21.0/mockito-core-2.21.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.8.15/byte-buddy-1.8.15.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.8.15/byte-buddy-agent-1.8.15.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.25.0/mockito-core-2.25.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.7/byte-buddy-1.9.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy-agent-1.9.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.21.0/mockito-core-2.21.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.8.15/byte-buddy-1.8.15-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.8.15/byte-buddy-agent-1.8.15-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.25.0/mockito-core-2.25.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.7/byte-buddy-1.9.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy-agent-1.9.7-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
</SOURCES>
</library>

1
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
View File

@@ -153,7 +153,6 @@ public class ArtifactRepositoryManager {
com.google.common.base.Predicate.class, //guava
org.apache.http.HttpConnection.class, //httpcore
org.apache.http.client.HttpClient.class, //httpclient
org.apache.commons.codec.binary.Base64.class, // commons-codec
org.apache.commons.logging.LogFactory.class, // commons-logging
org.slf4j.Marker.class // slf4j
);

6
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/rest.kt
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.intellij.build.images.sync
import org.apache.commons.codec.binary.Base64
import org.apache.http.HttpEntity
import org.apache.http.HttpHeaders
import org.apache.http.HttpStatus
@@ -11,6 +10,7 @@ import org.apache.http.client.methods.HttpRequestBase
import org.apache.http.entity.StringEntity
import org.apache.http.impl.client.HttpClients
import org.apache.http.util.EntityUtils
import java.util.*
internal fun get(path: String, conf: HttpRequestBase.() -> Unit = {}) = rest(HttpGet(path).apply { conf() })
@@ -27,7 +27,7 @@ private fun rest(request: HttpRequestBase) = HttpClients.createDefault().use {
}
internal fun HttpRequestBase.basicAuth(login: String, password: String) {
addHeader(HttpHeaders.AUTHORIZATION, "Basic ${Base64.encodeBase64String("$login:$password".toByteArray())}")
addHeader(HttpHeaders.AUTHORIZATION, "Basic ${Base64.getEncoder().encodeToString("$login:$password".toByteArray())}")
}
internal fun HttpEntity.asString() = EntityUtils.toString(this, Charsets.UTF_8)