Skip to content

Commit 424ac85

Browse files
iulianaiuliana
committed
upgraded versions to support microbean-helm dependencies
1 parent 638c44a commit 424ac85

7 files changed

Lines changed: 227 additions & 191 deletions

File tree

‎karaf/features/pom.xml‎

Lines changed: 94 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -19,101 +19,102 @@
1919
-->
2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
23-
<modelVersion>4.0.0</modelVersion>
24-
<parent>
25-
<groupId>org.apache.brooklyn</groupId>
26-
<artifactId>brooklyn-karaf</artifactId>
27-
<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
28-
</parent>
2922

30-
<artifactId>brooklyn-features</artifactId>
31-
<name>Brooklyn Karaf Features</name>
32-
<packaging>pom</packaging>
23+
<modelVersion>4.0.0</modelVersion>
24+
<parent>
25+
<groupId>org.apache.brooklyn</groupId>
26+
<artifactId>brooklyn-karaf</artifactId>
27+
<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
28+
</parent>
3329

34-
<build>
35-
<resources>
36-
<resource>
37-
<directory>src/main/feature</directory>
38-
<filtering>true</filtering>
39-
<includes>
40-
<include>**/*</include>
41-
</includes>
42-
</resource>
43-
</resources>
44-
<plugins>
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-resources-plugin</artifactId>
48-
<version>2.6</version>
49-
<configuration>
50-
<useDefaultDelimiters>false</useDefaultDelimiters>
51-
<delimiters>
52-
<delimiter>${*}</delimiter>
53-
</delimiters>
54-
</configuration>
55-
<executions>
56-
<execution>
57-
<id>filter</id>
58-
<phase>generate-resources</phase>
59-
<goals>
60-
<goal>resources</goal>
61-
</goals>
62-
</execution>
63-
</executions>
64-
</plugin>
65-
<plugin>
66-
<groupId>org.codehaus.mojo</groupId>
67-
<artifactId>build-helper-maven-plugin</artifactId>
68-
<executions>
69-
<execution>
70-
<phase>package</phase>
71-
<goals>
72-
<goal>attach-artifact</goal>
73-
</goals>
74-
<configuration>
75-
<artifacts>
76-
<artifact>
77-
<file>target/classes/feature.xml</file>
78-
<classifier>features</classifier>
79-
<type>xml</type>
80-
</artifact>
81-
</artifacts>
82-
</configuration>
83-
</execution>
84-
</executions>
85-
</plugin>
86-
</plugins>
87-
<pluginManagement>
88-
<plugins>
89-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
90-
<plugin>
91-
<groupId>org.eclipse.m2e</groupId>
92-
<artifactId>lifecycle-mapping</artifactId>
93-
<version>1.0.0</version>
94-
<configuration>
95-
<lifecycleMappingMetadata>
96-
<pluginExecutions>
97-
<pluginExecution>
98-
<pluginExecutionFilter>
99-
<groupId>org.apache.karaf.tooling</groupId>
100-
<artifactId>karaf-maven-plugin</artifactId>
101-
<versionRange>[4.1.6,)</versionRange>
102-
<goals>
103-
<goal>verify</goal>
104-
</goals>
105-
</pluginExecutionFilter>
106-
<action>
107-
<ignore></ignore>
108-
</action>
109-
</pluginExecution>
110-
</pluginExecutions>
111-
</lifecycleMappingMetadata>
112-
</configuration>
113-
</plugin>
114-
</plugins>
115-
</pluginManagement>
116-
</build>
30+
<artifactId>brooklyn-features</artifactId>
31+
<name>Brooklyn Karaf Features</name>
32+
<packaging>pom</packaging>
33+
34+
<build>
35+
<resources>
36+
<resource>
37+
<directory>src/main/feature</directory>
38+
<filtering>true</filtering>
39+
<includes>
40+
<include>**/*</include>
41+
</includes>
42+
</resource>
43+
</resources>
44+
<plugins>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-resources-plugin</artifactId>
48+
<version>2.6</version>
49+
<configuration>
50+
<useDefaultDelimiters>false</useDefaultDelimiters>
51+
<delimiters>
52+
<delimiter>${*}</delimiter>
53+
</delimiters>
54+
</configuration>
55+
<executions>
56+
<execution>
57+
<id>filter</id>
58+
<phase>generate-resources</phase>
59+
<goals>
60+
<goal>resources</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.codehaus.mojo</groupId>
67+
<artifactId>build-helper-maven-plugin</artifactId>
68+
<version>3.1.0</version>
69+
<executions>
70+
<execution>
71+
<phase>package</phase>
72+
<goals>
73+
<goal>attach-artifact</goal>
74+
</goals>
75+
<configuration>
76+
<artifacts>
77+
<artifact>
78+
<file>target/classes/feature.xml</file>
79+
<classifier>features</classifier>
80+
<type>xml</type>
81+
</artifact>
82+
</artifacts>
83+
</configuration>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
<pluginManagement>
89+
<plugins>
90+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
91+
<plugin>
92+
<groupId>org.eclipse.m2e</groupId>
93+
<artifactId>lifecycle-mapping</artifactId>
94+
<version>1.0.0</version>
95+
<configuration>
96+
<lifecycleMappingMetadata>
97+
<pluginExecutions>
98+
<pluginExecution>
99+
<pluginExecutionFilter>
100+
<groupId>org.apache.karaf.tooling</groupId>
101+
<artifactId>karaf-maven-plugin</artifactId>
102+
<versionRange>[4.1.6,)</versionRange>
103+
<goals>
104+
<goal>verify</goal>
105+
</goals>
106+
</pluginExecutionFilter>
107+
<action>
108+
<ignore></ignore>
109+
</action>
110+
</pluginExecution>
111+
</pluginExecutions>
112+
</lifecycleMappingMetadata>
113+
</configuration>
114+
</plugin>
115+
</plugins>
116+
</pluginManagement>
117+
</build>
117118

118119
</project>
119120

‎karaf/features/src/main/feature/feature.xml‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<feature>brooklyn-camp-brooklyn</feature>
203203
<feature>brooklyn-camp-base</feature>
204204

205-
<feature>cxf-jaxrs-with-optional-dependencies</feature>
205+
<feature>cxf-jaxrs</feature>
206206
<bundle dependency="true">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle>
207207
<bundle dependency="true">mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${cxf.version}</bundle>
208208
<bundle dependency="true">mvn:org.apache.cxf.karaf/cxf-karaf-commands/${cxf.version}</bundle>
@@ -218,14 +218,6 @@
218218
</config>
219219
</feature>
220220

221-
<feature name="cxf-jaxrs-with-optional-dependencies" version="${project.version}" description="cxf-jaxrs with optional dependencies">
222-
<feature>cxf-jaxrs</feature>
223-
224-
<!-- otherwise causes jackson-jaxrs-json-provider to be rewired when this optional dep is installed -->
225-
<bundle dependency="true" start-level="35">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle>
226-
</feature>
227-
228-
229221
<feature name="brooklyn-rest-resources" version="${project.version}" description="Brooklyn REST Resources">
230222
<feature>brooklyn-rest-resources-prereqs</feature>
231223
<bundle>mvn:org.apache.brooklyn/brooklyn-rest-resources/${project.version}</bundle>
@@ -301,6 +293,8 @@
301293

302294
<feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets">
303295
<feature>brooklyn-core</feature>
296+
<feature>brooklyn-utils-common</feature>
297+
<feature>brooklyn-locations-jclouds</feature>
304298

305299
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle>
306300
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle>
@@ -315,16 +309,55 @@
315309
<!-- (3) -->
316310
<bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&amp;Bundle-Version=3.12.6&amp;Import-Package=okio;version=1.15,*;resolution:=optional</bundle>
317311
<bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptor&amp;Bundle-Version=3.12.6&amp;Import-Package=*;resolution:=mandatory</bundle>
312+
318313
<!-- (4) -->
319314
<!-- these are the main required bundles for these features above -->
320315
<bundle>mvn:io.fabric8/zjsonpatch/0.3.0</bundle>
321316
<bundle>mvn:io.fabric8/kubernetes-model/${kubernetes-client.version}</bundle>
322317
<bundle>mvn:io.fabric8/kubernetes-client/${kubernetes-client.version}/jar/bundle</bundle>
323318
<bundle>mvn:io.fabric8/openshift-client/${kubernetes-client.version}/jar/bundle</bundle>
324319

320+
<bundle dependency='true'>wrap:mvn:org.microbean/microbean-helm/2.12.4-SNAPSHOT/jar/$Bundle-SymbolicName=microbean-helm&amp;Bundle-Version=2.12.4-SNAPSHOT&amp;Import-Package=*;resolution:=mandatory</bundle>
321+
322+
<bundle dependency='true'>wrap:mvn:org.microbean/microbean-development-annotations/0.1.3$Bundle-SymbolicName=microbean-development-annotations&amp;Bundle-Version=0.1.3&amp;Import-Package=*;resolution:=mandatory</bundle>
323+
<bundle dependency='true'>wrap:mvn:org.kamranzafar/jtar/2.3$Bundle-SymbolicName=jtar&amp;Bundle-Version=2.3&amp;Import-Package=*;resolution:=mandatory</bundle>
324+
<bundle dependency='true'>wrap:mvn:com.github.zafarkhaja/java-semver/0.9.0$Bundle-SymbolicName=java-semver&amp;Bundle-Version=0.9.0&amp;Import-Package=*;resolution:=mandatory</bundle>
325+
<bundle dependency='true'>wrap:mvn:org.microbean/microbean-kubernetes/0.1.3$Bundle-SymbolicName=microbean-kubernetes&amp;Bundle-Version=0.1.3&amp;Import-Package=*;resolution:=mandatory</bundle>
326+
327+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-netty/1.23.0$Bundle-SymbolicName=grpc-netty&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
328+
<bundle dependency='true'>mvn:io.netty/netty-codec-http2/4.1.38.Final</bundle>
329+
<bundle dependency='true'>mvn:io.netty/netty-resolver/4.1.38.Final</bundle>
330+
<bundle dependency='true'>mvn:io.netty/netty-common/4.1.38.Final</bundle>
331+
<bundle dependency='true'>mvn:io.netty/netty-buffer/4.1.38.Final</bundle>
332+
<bundle dependency='true'>mvn:io.netty/netty-codec/4.1.38.Final</bundle>
333+
<bundle dependency='true'>mvn:io.netty/netty-transport/4.1.38.Final</bundle>
334+
<bundle dependency='true'>mvn:io.netty/netty-codec-http/4.1.38.Final</bundle>
335+
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/4.1.38.Final</bundle>
336+
<bundle dependency='true'>mvn:io.netty/netty-handler/4.1.38.Final</bundle>
337+
<bundle dependency='true'>mvn:io.netty/netty-handler-proxy/4.1.38.Final</bundle>
338+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-core/1.23.0$Bundle-SymbolicName=grpc-core&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
339+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-context/1.23.0$Bundle-SymbolicName=grpc-context&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
340+
<bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.11.0$Bundle-SymbolicName=opencensus-api&amp;Bundle-Version=0.11.0&amp;Import-Package=*;resolution:=mandatory</bundle>
341+
<bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-grpc-metrics/0.11.0$Bundle-SymbolicName=opencensus-contrib-grpc-metrics&amp;Bundle-Version=0.11.0&amp;Import-Package=*;resolution:=mandatory</bundle>
342+
343+
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/3.9.0</bundle>
344+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-protobuf/1.23.0$Bundle-SymbolicName=grpc-protobuf&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
345+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-services/1.23.0$Bundle-SymbolicName=grpc-services&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
346+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-stub/1.23.0$Bundle-SymbolicName=grpc-stub&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
347+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-protobuf-lite/1.23.0$Bundle-SymbolicName=grpc-protobuf-lite&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
348+
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java-util/3.9.0</bundle>
349+
<bundle dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-common-protos/1.12.0$Bundle-SymbolicName=proto-google-common-protos&amp;Bundle-Version=1.12.0&amp;Import-Package=*;resolution:=mandatory</bundle>
350+
<bundle dependency='true'>wrap:mvn:io.grpc/grpc-core/1.23.0$Bundle-SymbolicName=grpc-core&amp;Bundle-Version=1.23.0&amp;Import-Package=*;resolution:=mandatory</bundle>
351+
<bundle dependency='true'>wrap:mvn:com.google.instrumentation/instrumentation-api/0.4.3$Bundle-SymbolicName=instrumentation-api&amp;Bundle-Version=0.4.3&amp;Import-Package=*;resolution:=mandatory</bundle>
352+
353+
<bundle dependency='true'>wrap:mvn:com.google.errorprone/error_prone_annotations/2.3.2$Bundle-SymbolicName=error_prone_annotations&amp;Bundle-Version=2.3.2&amp;Import-Package=*;resolution:=optional</bundle>
354+
<bundle dependency='true'>wrap:mvn:io.perfmark/perfmark-api/0.17.0$Bundle-SymbolicName=perfmark-api&amp;Bundle-Version=0.17.0&amp;Import-Package=*;resolution:=optional</bundle>
355+
<bundle>mvn:io.netty/netty-tcnative-boringssl-static/2.0.30.Final/jar/${os.detected.classifier}</bundle>
356+
325357
<bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-container/${project.version}</bundle>
326358
</feature>
327359

360+
328361
<feature name="brooklyn-test-framework" version="${project.version}" description="Brooklyn Test Framework" >
329362
<bundle>mvn:org.apache.brooklyn/brooklyn-test-framework/${project.version}</bundle>
330363
</feature>

‎locations/container/pom.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,29 @@
3535
<dependency>
3636
<groupId>org.microbean</groupId>
3737
<artifactId>microbean-helm</artifactId>
38-
<version>2.8.2.1.1.1</version>
38+
<version>2.12.4-SNAPSHOT</version>
3939
<exclusions>
40+
<exclusion>
41+
<groupId>org.yaml</groupId>
42+
<artifactId>snakeyaml</artifactId>
43+
</exclusion>
4044
<exclusion>
4145
<groupId>com.google.errorprone</groupId>
4246
<artifactId>error_prone_annotations</artifactId>
4347
</exclusion>
48+
<exclusion>
49+
<groupId>io.netty</groupId>
50+
<artifactId>netty-tcnative-boringssl-static</artifactId>
51+
</exclusion>
4452
</exclusions>
4553
</dependency>
54+
<!-- Added this dependency explicitly, to calm down IntelliJ IDEA and also upgrade this -->
55+
<dependency>
56+
<groupId>io.netty</groupId>
57+
<artifactId>netty-tcnative-boringssl-static</artifactId>
58+
<version>2.0.30.Final</version>
59+
<classifier>${os.detected.classifier}</classifier>
60+
</dependency>
4661
<dependency>
4762
<groupId>io.fabric8</groupId>
4863
<artifactId>openshift-client</artifactId>
@@ -164,12 +179,12 @@
164179

165180

166181
<build>
182+
<!-- Use os-maven-plugin to initialize the "os.detected" properties -->
167183
<extensions>
168-
<!-- Use os-maven-plugin to initialize the "os.detected" properties -->
169184
<extension>
170185
<groupId>kr.motd.maven</groupId>
171186
<artifactId>os-maven-plugin</artifactId>
172-
<version>1.5.0.Final</version>
187+
<version>1.6.2</version>
173188
</extension>
174189
</extensions>
175190
<plugins>

‎locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChart.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.brooklyn.config.ConfigKey;
2121
import org.apache.brooklyn.core.config.ConfigKeys;
2222
import org.apache.brooklyn.entity.software.base.SoftwareProcess;
23-
import org.apache.brooklyn.util.core.ResourcePredicates;
2423

2524
@ImplementedBy(KubernetesHelmChartImpl.class)
2625
public interface KubernetesHelmChart extends SoftwareProcess {

‎locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesHelmChartImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ public void init() {
3131
config().set(PROVISIONING_PROPERTIES.subKey("pollForFirstReachableAddress"), false);
3232
config().set(EmptySoftwareProcessImpl.USE_SSH_MONITORING, false);
3333
}
34-
34+
3535
}

0 commit comments

Comments
 (0)