Skip to content

Commit 895ccaf

Browse files
#55 Replace ivy with maven resolver (#61)
1 parent 11a7cf9 commit 895ccaf

File tree

7 files changed

+185
-622
lines changed

7 files changed

+185
-622
lines changed

jjava/pom.xml

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -24,13 +25,21 @@
2425
<version>${project.version}</version>
2526
</dependency>
2627
<dependency>
27-
<groupId>org.apache.ivy</groupId>
28-
<artifactId>ivy</artifactId>
28+
<groupId>eu.maveniverse.maven.mima</groupId>
29+
<artifactId>context</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>eu.maveniverse.maven.mima.runtime</groupId>
33+
<artifactId>standalone-static</artifactId>
2934
</dependency>
3035
<dependency>
3136
<groupId>org.apache.maven</groupId>
3237
<artifactId>maven-model-builder</artifactId>
3338
</dependency>
39+
<dependency>
40+
<groupId>org.apache.maven</groupId>
41+
<artifactId>maven-model</artifactId>
42+
</dependency>
3443
<dependency>
3544
<groupId>org.junit.jupiter</groupId>
3645
<artifactId>junit-jupiter-api</artifactId>
@@ -76,17 +85,13 @@
7685
<shadedPattern>org.dflib.jjava.shaded.com.google</shadedPattern>
7786
</relocation>
7887
<relocation>
79-
<pattern>com.neilalexander.jnacl</pattern>
80-
<shadedPattern>org.dflib.jjava.shaded.com.neilalexander.jnacl</shadedPattern>
88+
<pattern>eu.neilalexander.jnacl</pattern>
89+
<shadedPattern>org.dflib.jjava.shaded.eu.neilalexander.jnacl</shadedPattern>
8190
</relocation>
8291
<relocation>
8392
<pattern>org.apache.commons.lang3</pattern>
8493
<shadedPattern>org.dflib.jjava.shaded.org.apache.commons.lang3</shadedPattern>
8594
</relocation>
86-
<relocation>
87-
<pattern>org.apache.ivy</pattern>
88-
<shadedPattern>org.dflib.jjava.shaded.org.apache.ivy</shadedPattern>
89-
</relocation>
9095
<relocation>
9196
<!-- multiple maven dependencies -->
9297
<pattern>org.apache.maven</pattern>
@@ -110,7 +115,7 @@
110115
<filter>
111116
<artifact>*</artifact>
112117
<excludes>
113-
<exclude>module-info.class</exclude>
118+
<exclude>**/module-info.class</exclude>
114119
<exclude>META-INF/*.MF</exclude>
115120
<exclude>META-INF/DEPENDENCIES</exclude>
116121
</excludes>
@@ -121,6 +126,9 @@
121126
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
122127
<addHeader>false</addHeader>
123128
</transformer>
129+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
130+
<resource>META-INF/sisu/javax.inject.Named</resource>
131+
</transformer>
124132
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
125133
<manifestEntries>
126134
<Main-Class>org.dflib.jjava.JJava</Main-Class>

0 commit comments

Comments
 (0)