Skip to content

Commit b288184

Browse files
grgrzybekgrgrzybek
committed
[build] Fix the assembly after changing artifacts
1 parent a056f15 commit b288184

5 files changed

Lines changed: 81 additions & 20 deletions

File tree

‎assembly/pom.xml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,32 @@
8484
<groupId>org.jolokia</groupId>
8585
<artifactId>jolokia-client-java</artifactId>
8686
</dependency>
87+
<dependency>
88+
<groupId>org.jolokia</groupId>
89+
<artifactId>jolokia-client-java-httpclient4</artifactId>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.jolokia</groupId>
93+
<artifactId>jolokia-client-java-httpclient5</artifactId>
94+
</dependency>
95+
96+
<dependency>
97+
<groupId>org.jolokia</groupId>
98+
<artifactId>jolokia-client-jmx-adapter</artifactId>
99+
<classifier>standalone</classifier>
100+
</dependency>
87101

88102
<dependency>
89103
<groupId>org.jolokia</groupId>
90104
<artifactId>jolokia-support-jmx</artifactId>
91105
</dependency>
92106
<dependency>
93107
<groupId>org.jolokia</groupId>
94-
<artifactId>jolokia-support-spring</artifactId>
108+
<artifactId>jolokia-support-springboot</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.jolokia</groupId>
112+
<artifactId>jolokia-support-springboot3</artifactId>
95113
</dependency>
96114

97115
</dependencies>

‎assembly/src/assembly/dist-bin.xml‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,36 @@
7777
<useTransitiveDependencies>false</useTransitiveDependencies>
7878
<useProjectArtifact>false</useProjectArtifact>
7979
</dependencySet>
80+
<dependencySet>
81+
<includes>
82+
<include>org.jolokia:jolokia-client-java-httpclient4</include>
83+
</includes>
84+
<outputFileNameMapping>jolokia-client-java-httpclient4.jar</outputFileNameMapping>
85+
<outputDirectory>clients/java</outputDirectory>
86+
<unpack>false</unpack>
87+
<useTransitiveDependencies>false</useTransitiveDependencies>
88+
<useProjectArtifact>false</useProjectArtifact>
89+
</dependencySet>
90+
<dependencySet>
91+
<includes>
92+
<include>org.jolokia:jolokia-client-java-httpclient5</include>
93+
</includes>
94+
<outputFileNameMapping>jolokia-client-java-httpclient5.jar</outputFileNameMapping>
95+
<outputDirectory>clients/java</outputDirectory>
96+
<unpack>false</unpack>
97+
<useTransitiveDependencies>false</useTransitiveDependencies>
98+
<useProjectArtifact>false</useProjectArtifact>
99+
</dependencySet>
100+
<dependencySet>
101+
<includes>
102+
<include>org.jolokia:jolokia-client-jmx-adapter:jar:standalone</include>
103+
</includes>
104+
<outputFileNameMapping>jolokia-client-jmx-adapter-standalone.jar</outputFileNameMapping>
105+
<outputDirectory>clients/jmx</outputDirectory>
106+
<unpack>false</unpack>
107+
<useTransitiveDependencies>false</useTransitiveDependencies>
108+
<useProjectArtifact>false</useProjectArtifact>
109+
</dependencySet>
80110
<!-- support -->
81111
<dependencySet>
82112
<includes>
@@ -90,9 +120,19 @@
90120
</dependencySet>
91121
<dependencySet>
92122
<includes>
93-
<include>org.jolokia:jolokia-support-spring</include>
123+
<include>org.jolokia:jolokia-support-springboot</include>
124+
</includes>
125+
<outputFileNameMapping>jolokia-support-springboot.jar</outputFileNameMapping>
126+
<outputDirectory>support</outputDirectory>
127+
<unpack>false</unpack>
128+
<useTransitiveDependencies>false</useTransitiveDependencies>
129+
<useProjectArtifact>false</useProjectArtifact>
130+
</dependencySet>
131+
<dependencySet>
132+
<includes>
133+
<include>org.jolokia:jolokia-support-springboot3</include>
94134
</includes>
95-
<outputFileNameMapping>jolokia-support-spring.jar</outputFileNameMapping>
135+
<outputFileNameMapping>jolokia-support-springboot3.jar</outputFileNameMapping>
96136
<outputDirectory>support</outputDirectory>
97137
<unpack>false</unpack>
98138
<useTransitiveDependencies>false</useTransitiveDependencies>

‎bom/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@
303303
<dependency>
304304
<groupId>org.jolokia</groupId>
305305
<artifactId>jolokia-agent-jvm</artifactId>
306-
<version>${project.version}</version>
307306
<classifier>javaagent</classifier>
307+
<version>${project.version}</version>
308308
</dependency>
309309
<dependency>
310310
<groupId>org.jolokia</groupId>
@@ -332,8 +332,8 @@
332332
<dependency>
333333
<groupId>org.jolokia</groupId>
334334
<artifactId>jolokia-client-java</artifactId>
335-
<version>${project.version}</version>
336335
<classifier>tests</classifier>
336+
<version>${project.version}</version>
337337
</dependency>
338338
<dependency>
339339
<groupId>org.jolokia</groupId>
@@ -366,6 +366,12 @@
366366
<artifactId>jolokia-client-jmx-adapter</artifactId>
367367
<version>${project.version}</version>
368368
</dependency>
369+
<dependency>
370+
<groupId>org.jolokia</groupId>
371+
<artifactId>jolokia-client-jmx-adapter</artifactId>
372+
<classifier>standalone</classifier>
373+
<version>${project.version}</version>
374+
</dependency>
369375
<dependency>
370376
<groupId>org.jolokia</groupId>
371377
<artifactId>jolokia-client-kubernetes</artifactId>

‎pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,8 @@
760760
<dependency>
761761
<groupId>org.jolokia</groupId>
762762
<artifactId>jolokia-agent-jvm</artifactId>
763-
<version>${project.version}</version>
764763
<classifier>javaagent</classifier>
764+
<version>${project.version}</version>
765765
</dependency>
766766
<dependency>
767767
<groupId>org.jolokia</groupId>
@@ -830,6 +830,12 @@
830830
<artifactId>jolokia-client-jmx-adapter</artifactId>
831831
<version>${project.version}</version>
832832
</dependency>
833+
<dependency>
834+
<groupId>org.jolokia</groupId>
835+
<artifactId>jolokia-client-jmx-adapter</artifactId>
836+
<classifier>standalone</classifier>
837+
<version>${project.version}</version>
838+
</dependency>
833839
<dependency>
834840
<groupId>org.jolokia</groupId>
835841
<artifactId>jolokia-client-kubernetes</artifactId>

‎src/site/asciidoc/download.adoc‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,7 @@ The Jolokia JavaScript client library comes in two variants:
7272
with its `request()` for sending JSON
7373
requests. `jolokia-simple.js` adds on this code
7474
and provides a simplified API for Jolokia request, but is
75-
slightly less powerful. Finally,
76-
`jolokia-cubism.js` contains the Jolokia
77-
https://square.github.com/cubism/[Cubism,role=externalLink,window=_blank] integration which adds Jolokia as a data
78-
source. The `-min` versions are
75+
slightly less powerful. The `-min` versions are
7976
compressed with all documentation stripped off and
8077
recommended for production use.
8178
@@ -85,22 +82,16 @@ recommended for production use.
8582
|Download
8683
8784
|Base script
88-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia.js[jolokia.js,role=externalLink,window=_blank]
85+
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia.cjs[jolokia.cjs,role=externalLink,window=_blank]
8986
9087
|Base script, compressed
91-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-min.js[jolokia-min.js,role=externalLink,window=_blank]
88+
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia.min.cjs[jolokia.min.cjs,role=externalLink,window=_blank]
9289
9390
|Simplified API
94-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-simple.js[jolokia-simple.js,role=externalLink,window=_blank]
91+
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-simple.cjs[jolokia-simple.cjs,role=externalLink,window=_blank]
9592
9693
|Simplified API, compressed
97-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-simple-min.js[jolokia-simple-min.js,role=externalLink,window=_blank]
98-
99-
|Jolokia Cubism Integration
100-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-cubism.js[jolokia-cubism.js,role=externalLink,window=_blank]
101-
102-
|Jolokia Cubism Integration, compressed
103-
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-cubism-min.js[jolokia-cubism-min.js,role=externalLink,window=_blank]
94+
|https://github.com/jolokia/jolokia/releases/download/v{jolokia-version}/jolokia-simple.min.cjs[jolokia-simple.min.cjs,role=externalLink,window=_blank]
10495
|===
10596
10697
Jolokia JavaScript library is also available in https://www.npmjs.com/package/jolokia.js[NPM Registry,role=externalLink,window=_blank]. In your project you just need to use `npm` or `yarn`

0 commit comments

Comments
 (0)