Mercurial > hg > mercurial

changeset 1117:c1a251997254 TW-83599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TW-835999: forward integrate with default branch
author Andreas Eisele <andreas.eisele@jetbrains.com>
date Mon, 09 Oct 2023 18:18:26 +0200
parents 7b244aaead2e (current diff) ea93ee9dec68 (diff)
children 54472aa4b7b2
files
diffstat 8 files changed, 13 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/artifacts/mercurial_vcs_worker.xml	Mon Oct 09 17:48:08 2023 +0200
+++ b/.idea/artifacts/mercurial_vcs_worker.xml	Mon Oct 09 18:18:26 2023 +0200
@@ -12,8 +12,6 @@
         <element id="artifact" artifact-name="mercurial-common.jar" />
         <element id="artifact" artifact-name="mercurial-server.jar" />
         <element id="library" level="project" name="quartz-2.3.2" />
-        <element id="library" level="project" name="commons-compress-1.5" />
-        <element id="library" level="project" name="commons-codec-1.4" />
       </element>
       <element id="file-copy" path="$PROJECT_DIR$/teamcity-plugin.xml" />
     </root>
--- a/.idea/artifacts/plugin.xml	Mon Oct 09 17:48:08 2023 +0200
+++ b/.idea/artifacts/plugin.xml	Mon Oct 09 18:18:26 2023 +0200
@@ -13,8 +13,6 @@
         <element id="artifact" artifact-name="mercurial-common.jar" />
         <element id="artifact" artifact-name="mercurial-server-tc.jar" />
         <element id="library" level="project" name="quartz-2.3.2" />
-        <element id="library" level="project" name="commons-compress-1.5" />
-        <element id="library" level="project" name="commons-codec-1.4" />
       </element>
       <element id="directory" name="agent">
         <element id="archive" name="mercurial.zip">
@@ -22,8 +20,6 @@
             <element id="directory" name="lib">
               <element id="artifact" artifact-name="mercurial-common.jar" />
               <element id="artifact" artifact-name="mercurial-agent.jar" />
-              <element id="library" level="project" name="commons-codec-1.4" />
-              <element id="library" level="project" name="commons-compress-1.5" />
             </element>
           </element>
         </element>
--- a/.idea/libraries/TeamCityAPI_agent.xml	Mon Oct 09 17:48:08 2023 +0200
+++ b/.idea/libraries/TeamCityAPI_agent.xml	Mon Oct 09 18:18:26 2023 +0200
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="jar://$TeamCityDistribution$/devPackage/agent-api.jar!/" />
       <root url="jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/" />
+      <root url="jar://$TeamCityDistribution$/buildAgent/lib/agent-core.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/commons_codec_1_16_0.xml	Mon Oct 09 18:18:26 2023 +0200
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="commons-codec-1.16.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.16.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-codec.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
--- a/.idea/libraries/commons_codec_1_4.xml	Mon Oct 09 17:48:08 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-codec-1.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-codec.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
Binary file lib/commons-codec-1.16.0.jar has changed
Binary file lib/commons-codec-1.4.jar has changed
--- a/mercurial-common/mercurial-common.iml	Mon Oct 09 17:48:08 2023 +0200
+++ b/mercurial-common/mercurial-common.iml	Mon Oct 09 18:18:26 2023 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -11,6 +11,6 @@
     <orderEntry type="library" exported="" name="TeamCityAPI-common" level="project" />
     <orderEntry type="library" exported="" name="IDEA-openapi" level="project" />
     <orderEntry type="library" name="jdom" level="project" />
-    <orderEntry type="library" name="commons-codec-1.4" level="project" />
+    <orderEntry type="library" name="commons-codec-1.16.0" level="project" />
   </component>
 </module>
\ No newline at end of file