Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[activemq-cpp,apr,arrow] Switch apache urls to pull from "archive" #29388

Merged
merged 1 commit into from
Feb 2, 2023

Conversation

GordonSmith
Copy link
Contributor

Signed-off-by: Gordon Smith GordonJSmith@gmail.com

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
index f947400..1ade01d 100644
--- a/ports/activemq-cpp/vcpkg.json
+++ b/ports/activemq-cpp/vcpkg.json
@@ -11,4 +11,4 @@
       "platform": "!windows & !osx"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index 38fdecc..870fae2 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -23,4 +23,4 @@
       "description": "Install non-standard files required for building Apache httpd"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
index 8d2d49a..74cb06d 100644
--- a/ports/arrow/vcpkg.json
+++ b/ports/arrow/vcpkg.json
@@ -125,4 +125,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a548ef52e5b6b4b92de09fd0efdeaa95c745e2a0 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
index 6403895..524b10a 100644
--- a/versions/a-/activemq-cpp.json
+++ b/versions/a-/activemq-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e16ff2b553f834036260add285319ec97f575917",
+      "version-semver": "3.9.5",
+      "port-version": 10
+    },
     {
       "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e",
       "version-semver": "3.9.5",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 22d2fcf..f85ab44 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "beb9b88a2d3bcc63f32177c58622d7ad4b6717cf",
+      "version": "1.7.0",
+      "port-version": 12
+    },
     {
       "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9",
       "version": "1.7.0",
diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
index 832f5bf..797f4ff 100644
--- a/versions/a-/arrow.json
+++ b/versions/a-/arrow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04944a4d39fe590b7fed071475502fa8bcfe5a27",
+      "version": "10.0.1",
+      "port-version": 4
+    },
     {
       "git-tree": "3829a0697ffe3ba8cb1274e2edd7cfbcbc48482b",
       "version": "10.0.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index ef16682..0eafc39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -30,7 +30,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 9
+      "port-version": 10
     },
     "ade": {
       "baseline": "0.1.1f",
@@ -134,7 +134,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 11
+      "port-version": 12
     },
     "apr-util": {
       "baseline": "1.6.1",
@@ -198,7 +198,7 @@
     },
     "arrow": {
       "baseline": "10.0.1",
-      "port-version": 3
+      "port-version": 4
     },
     "ashes": {
       "baseline": "2022-06-08",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/activemq-cpp/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout a548ef52e5b6b4b92de09fd0efdeaa95c745e2a0 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
index 6403895..524b10a 100644
--- a/versions/a-/activemq-cpp.json
+++ b/versions/a-/activemq-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e16ff2b553f834036260add285319ec97f575917",
+      "version-semver": "3.9.5",
+      "port-version": 10
+    },
     {
       "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e",
       "version-semver": "3.9.5",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 22d2fcf..f85ab44 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "beb9b88a2d3bcc63f32177c58622d7ad4b6717cf",
+      "version": "1.7.0",
+      "port-version": 12
+    },
     {
       "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9",
       "version": "1.7.0",
diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
index 832f5bf..797f4ff 100644
--- a/versions/a-/arrow.json
+++ b/versions/a-/arrow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04944a4d39fe590b7fed071475502fa8bcfe5a27",
+      "version": "10.0.1",
+      "port-version": 4
+    },
     {
       "git-tree": "3829a0697ffe3ba8cb1274e2edd7cfbcbc48482b",
       "version": "10.0.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index ef16682..0eafc39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -30,7 +30,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 9
+      "port-version": 10
     },
     "ade": {
       "baseline": "0.1.1f",
@@ -134,7 +134,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 11
+      "port-version": 12
     },
     "apr-util": {
       "baseline": "1.6.1",
@@ -198,7 +198,7 @@
     },
     "arrow": {
       "baseline": "10.0.1",
-      "port-version": 3
+      "port-version": 4
     },
     "ashes": {
       "baseline": "2022-06-08",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/activemq-cpp/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Feb 2, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/activemq-cpp/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for activemq-cpp have changed but the version was not updated
version: 3.9.5#10
old SHA: e16ff2b553f834036260add285319ec97f575917
new SHA: 2cf2310a238e646e62043be2f553332d8bd4c171
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for activemq-cpp have changed but the version was not updated
version: 3.9.5#10
old SHA: e16ff2b553f834036260add285319ec97f575917
new SHA: 2cf2310a238e646e62043be2f553332d8bd4c171
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

github-actions[bot]
github-actions bot previously approved these changes Feb 2, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
@GordonSmith GordonSmith changed the title fix: Switch apache projects to pull from archive URL [activemq-cpp,apr,arrow] Switch apache urls to pull from "archive" Feb 2, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/activemq-cpp/portfile.cmake
  • ports/apr/portfile.cmake

@LilyWangLL LilyWangLL self-assigned this Feb 2, 2023
@LilyWangLL LilyWangLL added the category:port-update The issue is with a library, which is requesting update new revision label Feb 2, 2023
@BillyONeal
Copy link
Member

Can you explain the reason for this change?

@GordonSmith
Copy link
Contributor Author

Sure - APR 1.7.0 will no longer build, because the download no longer exists here:

But the download does exist here:

So I did a search for other apache ports which pointed to "www" or "download" and replaced them with the more commonly used "archive" url as its only a matter of time until those stop to work as well...

@BillyONeal
Copy link
Member

I see, that makes sense. Thanks!

@BillyONeal BillyONeal merged commit f7ada2a into microsoft:master Feb 2, 2023
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Feb 3, 2023
@GordonSmith GordonSmith deleted the APACHE_DOWNLOAD_URL branch February 3, 2023 09:22
ooeygui pushed a commit to ms-iot/vcpkg that referenced this pull request Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants