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.

Sign up for GitHub

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

[not for review] testing old branch with a dependency version #23327

Closed
wants to merge 3 commits into from
Closed

[not for review] testing old branch with a dependency version #23327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99dd9d1
testing an old branch with a dependency version
suztomo Sep 22, 2022
310fd64
[BEAM-14298] resolve dependency org.pentaho:pentaho-aggdesigner-algor…
Abacn May 24, 2022
ec617cc
Add accept-language header for MPL license (#22395)
TheNeuralBit Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ class BeamModulePlugin implements Plugin<Project> {
def postgres_version = "42.2.16"
def powermock_version = "2.0.9"
// Try to keep protobuf_version consistent with the protobuf version in google_cloud_platform_libraries_bom
def protobuf_version = "3.15.8"
def protobuf_version = "3.19.5"
def quickcheck_version = "0.8"
def slf4j_version = "1.7.30"
def spark_version = "2.4.7"
Expand Down
15 changes: 7 additions & 8 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/Repositories.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ class Repositories {
mavenLocal()
jcenter()

// For pentaho dependencies.
maven {
url "https://public.nexus.pentaho.org/repository/proxy-public-3rd-party-release"
content { includeGroup "org.pentaho" }
}

// Release staging repository
maven { url "https://oss.sonatype.org/content/repositories/staging/" }

Expand All @@ -60,6 +54,12 @@ class Repositories {
url "https://packages.confluent.io/maven/"
content { includeGroup "io.confluent" }
}

// For pentaho dependencies.
maven {
url "https://public.nexus.pentaho.org/repository/omni"
content { includeGroup "org.pentaho" }
}
}

// plugin to support repository authentication via ~/.m2/settings.xml
Expand All @@ -81,8 +81,8 @@ class Repositories {
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://repo.spring.io/plugins-release" }
maven { url "https://public.nexus.pentaho.org/repository/proxy-public-3rd-party-release" }
maven { url "https://packages.confluent.io/maven/" }
maven { url "https://public.nexus.pentaho.org/repository/omni" }
maven { url project.offlineRepositoryRoot }
}
includeSources = false
Expand All @@ -91,4 +91,3 @@ class Repositories {
}
}
}

7 changes: 6 additions & 1 deletion sdks/java/container/license_scripts/pull_licenses_java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ def pull_from_url(file_name, url, dep, no_list):
if url == 'skip':
return
try:
url_read = urlopen(url)
url_read = urlopen(Request(url, headers={
'User-Agent': 'Apache Beam',
# MPL license fails to resolve redirects without this header
# see https://github.com/apache/beam/issues/22394
'accept-language': 'en-US,en;q=0.9',
}))
with open(file_name, 'wb') as temp_write:
shutil.copyfileobj(url_read, temp_write)
logging.debug(
Expand Down