You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2021/08/26 08:25:18 UTC
[camel-k] branch main updated (3404a8b -> 45bcecb)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 3404a8b Updated CHANGELOG.md
new 6684929 chore(jolokia): upgrade to Jolokia 1.7.0
new 45bcecb fix(jolokia): exclude com.sun:tools for broken jolokia-jvm pom
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pkg/trait/jolokia.go | 4 ++--
pkg/trait/jolokia_test.go | 6 +++---
pkg/util/camel/camel_dependencies.go | 11 +++++++++++
pkg/util/maven/maven_project.go | 11 +++++++++--
4 files changed, 25 insertions(+), 7 deletions(-)
[camel-k] 02/02: fix(jolokia): exclude com.sun:tools for broken
jolokia-jvm pom
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 45bcecbeec7684a04434b8f999f1706f84f51617
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Thu Aug 26 17:22:13 2021 +0900
fix(jolokia): exclude com.sun:tools for broken jolokia-jvm pom
---
pkg/util/camel/camel_dependencies.go | 11 +++++++++++
pkg/util/maven/maven_project.go | 11 +++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pkg/util/camel/camel_dependencies.go b/pkg/util/camel/camel_dependencies.go
index 9f2c439..44b523e 100644
--- a/pkg/util/camel/camel_dependencies.go
+++ b/pkg/util/camel/camel_dependencies.go
@@ -89,6 +89,17 @@ func ManageIntegrationDependencies(
gav := strings.TrimPrefix(d, "mvn:")
project.AddEncodedDependencyGAV(gav)
+ // TODO hack for tools.jar dependency issue in jolokia-jvm
+ // this block should be removed once the jolokia-jvm pom issue
+ // is resolved
+ // https://github.com/rhuss/jolokia/issues/473
+ if strings.Contains(gav, "org.jolokia:jolokia-jvm") {
+ me := maven.Exclusion{
+ GroupID: "com.sun",
+ ArtifactID: "tools",
+ }
+ project.AddEncodedDependencyExclusion(gav, me)
+ }
default:
if dep := jitpack.ToDependency(d); dep != nil {
project.AddDependency(*dep)
diff --git a/pkg/util/maven/maven_project.go b/pkg/util/maven/maven_project.go
index e9ed19d..ac1b86e 100644
--- a/pkg/util/maven/maven_project.go
+++ b/pkg/util/maven/maven_project.go
@@ -109,12 +109,12 @@ func (p *Project) AddDependencies(deps ...Dependency) {
}
}
-// AddDependencyGAV a dependency to maven's dependencies
+// AddDependencyGAV adds a dependency to maven's dependencies
func (p *Project) AddDependencyGAV(groupID string, artifactID string, version string) {
p.AddDependency(NewDependency(groupID, artifactID, version))
}
-// AddEncodedDependencyGAV a dependency to maven's dependencies
+// AddEncodedDependencyGAV adds a dependency in GAV format to maven's dependencies
func (p *Project) AddEncodedDependencyGAV(gav string) {
if d, err := ParseGAV(gav); err == nil {
// TODO: error handling
@@ -145,6 +145,13 @@ func (p *Project) AddDependencyExclusions(dep Dependency, exclusions ...Exclusio
}
}
+func (p *Project) AddEncodedDependencyExclusion(gav string, exclusion Exclusion) {
+ if d, err := ParseGAV(gav); err == nil {
+ // TODO: error handling
+ p.AddDependencyExclusion(d, exclusion)
+ }
+}
+
type propertiesEntry struct {
XMLName xml.Name
Value string `xml:",chardata"`
[camel-k] 01/02: chore(jolokia): upgrade to Jolokia 1.7.0
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 66849293107ec1f3280af40ed70e92f68ac7c218
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Wed Aug 25 16:06:01 2021 +0900
chore(jolokia): upgrade to Jolokia 1.7.0
Fix #2593
---
pkg/trait/jolokia.go | 4 ++--
pkg/trait/jolokia_test.go | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index f06bda8..9579d7c 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -94,7 +94,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
}
// TODO: We may want to make the Jolokia version configurable
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.jolokia:jolokia-jvm:jar:agent:1.6.2")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.jolokia:jolokia-jvm:jar:1.7.0")
return nil
}
@@ -153,7 +153,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
optionValues[i] = k + "=" + options[k]
}
- container.Args = append(container.Args, "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.6.2-agent.jar="+strings.Join(optionValues, ","))
+ container.Args = append(container.Args, "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.0.jar="+strings.Join(optionValues, ","))
containerPort := corev1.ContainerPort{
Name: "jolokia",
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index c3b4a4e..0551d6f 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -51,7 +51,7 @@ func TestApplyJolokiaTraitNominalShouldSucceed(t *testing.T) {
assert.NotNil(t, container)
assert.Equal(t, container.Args, []string{
- "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.6.2-agent.jar=discoveryEnabled=false,host=*,port=8778",
+ "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.0.jar=discoveryEnabled=false,host=*,port=8778",
})
assert.Len(t, container.Ports, 1)
@@ -78,7 +78,7 @@ func TestApplyJolokiaTraitForOpenShiftProfileShouldSucceed(t *testing.T) {
assert.NotNil(t, container)
assert.Equal(t, container.Args, []string{
- "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.6.2-agent.jar=caCert=/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt," +
+ "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.0.jar=caCert=/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt," +
"clientPrincipal.1=cn=system:master-proxy,clientPrincipal.2=cn=hawtio-online.hawtio.svc," +
"clientPrincipal.3=cn=fuse-console.fuse.svc,discoveryEnabled=false,extendedClientCheck=true," +
"host=*,port=8778,protocol=https,useSslClientAuthentication=true",
@@ -128,7 +128,7 @@ func TestApplyJolokiaTraitWithOptionShouldOverrideDefault(t *testing.T) {
container := environment.Resources.GetContainerByName(defaultContainerName)
assert.Equal(t, container.Args, []string{
- "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.6.2-agent.jar=caCert=.cacert,clientPrincipal=cn:any," +
+ "-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.0.jar=caCert=.cacert,clientPrincipal=cn:any," +
"discoveryEnabled=true,extendedClientCheck=false,host=explicit-host,port=8778,protocol=http," +
"useSslClientAuthentication=false",
})