Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit 21ba9e6

Browse files
AB-xdevAB-xdev
authored
Merge pull request #23 from xdev-software/develop
Release 6.0.1
2 parents 9cadf10 + ad255fd commit 21ba9e6

File tree

4 files changed

+97
-8
lines changed

4 files changed

+97
-8
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ bin/
44
.classpath
55
.project
66
.checkstyle
7+
dependency-reduced-pom.xml

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 6.0.1
2+
* Updated xapi to ``6.0.1``
3+
* Updated maven plugins
4+
15
## 6.0.0
26
* Published this library as open source
37
* Ensured build compatibility with Java 8, 11 and 17

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ Mail: opensource@xdev-software.de
3737
We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
3838

3939
## Dependencies and Licenses
40-
The XDEV csapi is released under [GNU Lesser General Public License version 3](https://www.gnu.org/licenses/lgpl-3.0.en.html) aka LGPL 3
41-
40+
The XDEV csapi is released under [GNU Lesser General Public License version 3](https://www.gnu.org/licenses/lgpl-3.0.en.html) aka LGPL 3<br/>
4241
View the [summary of all dependencies online](https://xdev-software.github.io/csapi/dependencies/)
4342

4443
## Releasing [![Build](https://img.shields.io/github/workflow/status/xdev-software/csapi/Release?label=Release)](https://github.com/xdev-software/csapi/actions/workflows/release.yml)

‎pom.xml

Lines changed: 91 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.xdev-software</groupId>
9292
<artifactId>xapi</artifactId>
93-
<version>6.0.0</version>
93+
<version>6.0.1</version>
9494
</dependency>
9595

9696
<dependency>
@@ -167,7 +167,7 @@
167167
<plugin>
168168
<groupId>org.apache.maven.plugins</groupId>
169169
<artifactId>maven-deploy-plugin</artifactId>
170-
<version>3.0.0-M1</version>
170+
<version>3.0.0-M2</version>
171171
</plugin>
172172
<plugin>
173173
<groupId>org.apache.maven.plugins</groupId>
@@ -177,7 +177,7 @@
177177
<plugin>
178178
<groupId>org.apache.maven.plugins</groupId>
179179
<artifactId>maven-jar-plugin</artifactId>
180-
<version>3.2.0</version>
180+
<version>3.2.2</version>
181181
</plugin>
182182
<plugin>
183183
<groupId>org.apache.maven.plugins</groupId>
@@ -187,7 +187,7 @@
187187
<plugin>
188188
<groupId>org.apache.maven.plugins</groupId>
189189
<artifactId>maven-site-plugin</artifactId>
190-
<version>3.9.1</version>
190+
<version>3.10.0</version>
191191
</plugin>
192192

193193
<plugin>
@@ -197,7 +197,7 @@
197197

198198
<plugin>
199199
<artifactId>maven-compiler-plugin</artifactId>
200-
<version>3.8.1</version>
200+
<version>3.9.0</version>
201201
</plugin>
202202
</plugins>
203203
</pluginManagement>
@@ -259,7 +259,6 @@
259259
<root>src/main/java</root>
260260
<root>src/test/java</root>
261261
</roots>
262-
<canUpdateCopyright>true</canUpdateCopyright>
263262
</configuration>
264263
</execution>
265264
</executions>
@@ -376,6 +375,92 @@
376375
</repositories>
377376
</profile>
378377

378+
<profile>
379+
<id>xdev-ide</id>
380+
<build>
381+
<plugins>
382+
<plugin>
383+
<groupId>org.apache.maven.plugins</groupId>
384+
<artifactId>maven-shade-plugin</artifactId>
385+
<version>3.2.4</version>
386+
<executions>
387+
<execution>
388+
<goals>
389+
<goal>shade</goal>
390+
</goals>
391+
<configuration>
392+
<artifactSet>
393+
<excludes>
394+
<!-- XDEV IDE does not need xapi in the fat jar -->
395+
<exclude>com.xdev-software:xapi</exclude>
396+
</excludes>
397+
</artifactSet>
398+
<filters>
399+
<filter>
400+
<artifact>*:*</artifact>
401+
<excludes>
402+
<exclude>module-info.class</exclude>
403+
<exclude>META-INF/*.SF</exclude>
404+
<exclude>META-INF/*.DSA</exclude>
405+
<exclude>META-INF/*.RSA</exclude>
406+
<exclude>MANIFEST.MF</exclude>
407+
</excludes>
408+
</filter>
409+
</filters>
410+
411+
<createSourcesJar>true</createSourcesJar>
412+
<transformers>
413+
414+
<!-- we don't include the MANIFEST.MF files from other jar to avoid
415+
them from overriding ours -->
416+
<transformer
417+
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
418+
<resource>MANIFEST.MF</resource>
419+
</transformer>
420+
421+
<!-- make sure Apache Licenses files are not overridden. -->
422+
<transformer
423+
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
424+
425+
</transformer>
426+
427+
<!-- make sure Apache NOTICE files are not overridden. -->
428+
<transformer
429+
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
430+
<addHeader>false</addHeader>
431+
</transformer>
432+
433+
<!-- append overlapping files -->
434+
<transformer
435+
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
436+
<resource>META-INF/LICENSE.APACHE2</resource>
437+
</transformer>
438+
439+
<!-- append overlapping files -->
440+
<transformer
441+
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
442+
<resource>overview.html</resource>
443+
</transformer>
444+
445+
<!-- adding some infos to the MANIFEST.MF -->
446+
<transformer
447+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
448+
<manifestEntries>
449+
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
450+
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
451+
</manifestEntries>
452+
</transformer>
453+
454+
</transformers>
455+
</configuration>
456+
</execution>
457+
</executions>
458+
</plugin>
459+
460+
</plugins>
461+
</build>
462+
</profile>
463+
379464
<profile>
380465
<id>ossrh</id>
381466
<build>

0 commit comments

Comments
 (0)