diff --git a/.idea/libraries/miglayout_swing.xml b/.idea/libraries/miglayout_swing.xml
index 9f4cc9e88800..9de05a00b893 100644
--- a/.idea/libraries/miglayout_swing.xml
+++ b/.idea/libraries/miglayout_swing.xml
@@ -1,13 +1,14 @@
-
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml
index 5bafa0222a4a..ccea3a44b23f 100644
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -24,6 +24,7 @@
+
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
index de0239f009b0..c8e23e374026 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// 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.
package com.intellij.facet.impl.ui.libraries;
@@ -22,13 +8,13 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
-import org.apache.commons.codec.binary.Hex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.List;
/**
@@ -90,7 +76,7 @@ public class RequiredLibrariesInfo {
md5.update(file.contentsToByteArray());
final byte[] digest = md5.digest();
- return new String(Hex.encodeHex(digest));
+ return Base64.getEncoder().encodeToString(digest);
}
catch (Exception e) {
return null;
diff --git a/lib/miglayout-core-5.0.jar b/lib/miglayout-core-5.0.jar
deleted file mode 100644
index 1089b5101719..000000000000
Binary files a/lib/miglayout-core-5.0.jar and /dev/null differ
diff --git a/lib/miglayout-swing-5.0.jar b/lib/miglayout-swing-5.0.jar
deleted file mode 100644
index 6a4df9687c87..000000000000
Binary files a/lib/miglayout-swing-5.0.jar and /dev/null differ
diff --git a/lib/src/miglayout-core-5.0-sources.jar b/lib/src/miglayout-core-5.0-sources.jar
deleted file mode 100644
index 6b11f6eee233..000000000000
Binary files a/lib/src/miglayout-core-5.0-sources.jar and /dev/null differ
diff --git a/lib/src/miglayout-swing-5.0-sources.jar b/lib/src/miglayout-swing-5.0-sources.jar
deleted file mode 100644
index 9804a9b63bcb..000000000000
Binary files a/lib/src/miglayout-swing-5.0-sources.jar and /dev/null differ
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 1205d1e68e47..2ac884ec15fc 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -258,7 +258,7 @@ class CommunityLibraryLicenses {
licenseUrl: "https://github.com/willemv/mercurial_prompthooks/blob/master/LICENSE.txt"),
new LibraryLicense(name: "Microba", libraryName: "microba", version: "0.4.2", license: "BSD", url: "http://microba.sourceforge.net/",
licenseUrl: "http://microba.sourceforge.net/license.txt"),
- new LibraryLicense(name: "MigLayout", libraryName: "miglayout-swing", version: "5.0.0", license: "BSD", url: "http://www.miglayout.com/",
+ new LibraryLicense(name: "MigLayout", libraryName: "miglayout-swing", version: "5.1.0", license: "BSD", url: "http://www.miglayout.com/",
licenseUrl: "http://www.miglayout.com/mavensite/license.html"),
new LibraryLicense(name: "minlog", libraryName: "minlog-1.2.jar", version: "1.2", license: "BSD",
url: "https://github.com/EsotericSoftware/minlog", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
index affa567fc8f0..0d3c1d55e05a 100644
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -22,5 +22,6 @@
+
\ No newline at end of file
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 628bcade54e5..a1198d96a90b 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -32,5 +32,6 @@
+
\ No newline at end of file
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 224dec829025..c8f573e6bdea 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -13,7 +13,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index f0c15190c2f6..692c1367c1f5 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -38,5 +38,6 @@
+
\ No newline at end of file
diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index 25355ed49fa4..3f5bbbc32606 100644
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -22,5 +22,6 @@
+
\ No newline at end of file
diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
index 91d9e20a4e00..eaff7787ac7d 100644
--- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
+++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
@@ -26,5 +26,6 @@
+
\ No newline at end of file
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index a26eab731534..52593711ae41 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -45,5 +45,6 @@
+
\ No newline at end of file
diff --git a/plugins/hg4idea/intellij.vcs.hg.iml b/plugins/hg4idea/intellij.vcs.hg.iml
index ada4871019dd..5c6520e0ac30 100644
--- a/plugins/hg4idea/intellij.vcs.hg.iml
+++ b/plugins/hg4idea/intellij.vcs.hg.iml
@@ -23,5 +23,6 @@
+
\ No newline at end of file
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
index 6256f50d0e66..77ddd182cd36 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// 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.
package org.zmlx.hg4idea.repo;
import com.intellij.dvcs.DvcsUtil;
@@ -25,7 +11,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.Hash;
import com.intellij.vcs.log.VcsLogObjectsFactory;
-import org.apache.commons.codec.binary.Hex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgNameWithHashInfo;
@@ -119,7 +104,7 @@ public class HgRepositoryReader {
public String readCurrentRevision() {
if (!isDirStateInfoAvailable()) return null;
try {
- return Hex.encodeHexString(readHashBytesFromFile(myDirStateFile));
+ return Base64.getEncoder().encodeToString(readHashBytesFromFile(myDirStateFile));
}
catch (IOException e) {
// dirState exists if not fresh, if we could not load dirState info repository must be corrupted
diff --git a/plugins/stats-collector/intellij.statsCollector.iml b/plugins/stats-collector/intellij.statsCollector.iml
index b59c8a8103eb..5928131a0b62 100644
--- a/plugins/stats-collector/intellij.statsCollector.iml
+++ b/plugins/stats-collector/intellij.statsCollector.iml
@@ -19,5 +19,6 @@
+
\ No newline at end of file
diff --git a/spellchecker/testSrc/com/intellij/spellchecker/dictionary/AppDictionaryTest.java b/spellchecker/testSrc/com/intellij/spellchecker/dictionary/AppDictionaryTest.java
index 80624dca0067..23bf24670c31 100644
--- a/spellchecker/testSrc/com/intellij/spellchecker/dictionary/AppDictionaryTest.java
+++ b/spellchecker/testSrc/com/intellij/spellchecker/dictionary/AppDictionaryTest.java
@@ -1,9 +1,8 @@
-// Copyright 2000-2017 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-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.
package com.intellij.spellchecker.dictionary;
import com.intellij.spellchecker.inspection.SpellcheckerInspectionTestCase;
-import com.intellij.util.containers.HashSet;
import java.util.*;
@@ -29,7 +28,7 @@ public class AppDictionaryTest extends SpellcheckerInspectionTestCase {
private static void doContainTest(String wordToCheck, Boolean expected) {
assertEquals(expected, APP_DICTIONARY.contains(wordToCheck));
}
-
+
public void testContainsProject() {
doContainTest(BBBB);
}
@@ -120,7 +119,7 @@ public class AppDictionaryTest extends SpellcheckerInspectionTestCase {
public void testGetSuggestions(){
final List suggestions = new ArrayList<>();
APP_DICTIONARY.getSuggestions("AAAB", suggestions::add);
- assert suggestions.isEmpty(); // TODO: change current behavior
+ assert suggestions.isEmpty(); // TODO: change current behavior
}
public void testNoSuggestions(){
diff --git a/spellchecker/testSrc/com/intellij/spellchecker/dictionary/ProjectDictionaryTest.java b/spellchecker/testSrc/com/intellij/spellchecker/dictionary/ProjectDictionaryTest.java
index 5b62e1bdd7fd..4c03bedde0a0 100644
--- a/spellchecker/testSrc/com/intellij/spellchecker/dictionary/ProjectDictionaryTest.java
+++ b/spellchecker/testSrc/com/intellij/spellchecker/dictionary/ProjectDictionaryTest.java
@@ -1,9 +1,7 @@
-// Copyright 2000-2017 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-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.
package com.intellij.spellchecker.dictionary;
-
import com.intellij.spellchecker.inspection.SpellcheckerInspectionTestCase;
-import com.intellij.util.containers.HashSet;
import java.util.*;
@@ -31,7 +29,7 @@ public class ProjectDictionaryTest extends SpellcheckerInspectionTestCase {
private static void doContainTest(String wordToCheck, Boolean expected) {
assertEquals(expected, myProjectDictionary.contains(wordToCheck));
}
-
+
public void testContainsProject() {
doContainTest(BBBB);
}
@@ -122,7 +120,7 @@ public class ProjectDictionaryTest extends SpellcheckerInspectionTestCase {
public void testGetSuggestions(){
final List suggestions = new ArrayList<>();
myProjectDictionary.getSuggestions("AAAB", suggestions::add);
- assert suggestions.isEmpty(); // TODO: change current behavior
+ assert suggestions.isEmpty(); // TODO: change current behavior
}
public void testNoSuggestions(){