Skip to content

Commit 9f90253

Browse files
cowtowncodercowtowncoder
committed
Chanage pom back to pre-shaded, to release 5.3.0 first
1 parent 17c6fb6 commit 9f90253

File tree

1 file changed

+14
-102
lines changed

1 file changed

+14
-102
lines changed

‎pom.xml‎

Lines changed: 14 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -94,63 +94,42 @@
9494
For now, we'll just use "msv", which does not properly define
9595
dependencies...
9696
97-
Also: keep `optional` (`provided` will not work for some reason
98-
with shade plugin?) to prevent dependency
97+
Also: make these 'provided', since user needs to include them
98+
directly. Not sure what OSGi thinks about that but...
9999
-->
100100
<dependency>
101101
<groupId>net.java.dev.msv</groupId>
102102
<artifactId>msv-core</artifactId>
103103
<version>${version.msv}</version>
104-
<!--
105104
<scope>provided</scope>
106-
-->
107105
<optional>true</optional>
108106
</dependency>
109-
110107
<dependency>
111108
<groupId>net.java.dev.msv</groupId>
112-
<artifactId>xsdlib</artifactId>
109+
<artifactId>msv-rngconverter</artifactId>
113110
<version>${version.msv}</version>
114-
<!--
115111
<scope>provided</scope>
116-
-->
117112
<optional>true</optional>
118113
</dependency>
119-
120-
<dependency>
121-
<groupId>relaxngDatatype</groupId>
122-
<artifactId>relaxngDatatype</artifactId>
123-
<version>20020414</version>
124-
<!--
125-
<scope>provided</scope>
126-
-->
127-
</dependency>
128-
129-
<!-- 03-Jun-2019, tatu: Not sure why this was added as a dep as it's only one class,
130-
`com.sun.msv.writer.relaxng.Driver`, and some metadata. I assumed it was needed by MSV
131-
but at least unit tests do not cache issues. So, will remove from 5.3.0
132-
-->
133-
134-
<!--
135114
<dependency>
136115
<groupId>net.java.dev.msv</groupId>
137-
<artifactId>msv-rngconverter</artifactId>
116+
<artifactId>xsdlib</artifactId>
138117
<version>${version.msv}</version>
139118
<scope>provided</scope>
140119
<optional>true</optional>
141120
</dependency>
142-
-->
143121

144122
<!-- Then OSGi, needed if using OSGi discovery -->
145123
<dependency>
146124
<groupId>org.apache.felix</groupId>
147125
<artifactId>org.osgi.core</artifactId>
148126
<version>1.4.0</version>
149127
<optional>true</optional>
150-
<scope>provided</scope>
128+
<scope>provided</scope>
151129
</dependency>
152130

153-
<!-- Then test deps -->
131+
<!-- Then test jars
132+
-->
154133

155134
<dependency>
156135
<groupId>junit</groupId>
@@ -200,76 +179,9 @@
200179
</configuration>
201180
</plugin>
202181

203-
<plugin>
204-
<!-- We will shade MSV, partly to simplify deployment, but also to work
205-
around Java 9+ module-info issues (MSV not retrofitted)
206-
-->
207-
<groupId>org.apache.maven.plugins</groupId>
208-
<artifactId>maven-shade-plugin</artifactId>
209-
<executions>
210-
<execution>
211-
<phase>package</phase>
212-
<goals>
213-
<goal>shade</goal>
214-
</goals>
215-
<configuration>
216-
<!-- Too many dynamically resolved dependencies (via class names)
217-
so can not do this, alas:
218-
-->
219-
<minimizeJar>false</minimizeJar>
220-
<artifactSet>
221-
<includes>
222-
<!-- the bundle plugin already did the pulling-in, all we need is the renaming! -->
223-
<include>net.java.dev.msv:msv-core</include>
224-
<include>net.java.dev.msv:xsdlib</include>
225-
<include>relaxngDatatype:relaxngDatatype</include>
226-
<include>com.sun.xml.bind.jaxb:isorelax</include>
227-
</includes>
228-
</artifactSet>
229-
<relocations>
230-
<!-- First, xsdlib (must order first) -->
231-
<relocation>
232-
<pattern>com.sun.msv.xsd</pattern>
233-
<shadedPattern>com.ctc.wstx.shaded.msv.xsd</shadedPattern>
234-
</relocation>
235-
<relocation> <!-- and one stupid little class xsdlib has for reasons -->
236-
<pattern>com.sun.xml.util</pattern>
237-
<shadedPattern>com.ctc.wstx.shaded.msv.xsd_util</shadedPattern>
238-
</relocation>
239-
<relocation>
240-
<pattern>org.relaxng.datatype</pattern>
241-
<shadedPattern>com.ctc.wstx.shaded.msv.relaxng_datatype</shadedPattern>
242-
</relocation>
243-
<relocation>
244-
<pattern>org.iso_relax</pattern>
245-
<shadedPattern>com.ctc.wstx.shaded.msv.org_isorelax</shadedPattern>
246-
</relocation>
247-
<relocation>
248-
<pattern>jp.gr.xml.relax</pattern>
249-
<shadedPattern>com.ctc.wstx.shaded.msv.org_jp_gr_xml</shadedPattern>
250-
</relocation>
251-
252-
<!-- then msv-core -->
253-
<relocation>
254-
<pattern>com.sun.msv</pattern>
255-
<shadedPattern>com.ctc.wstx.shaded.msv-core</shadedPattern>
256-
</relocation>
257-
</relocations>
258-
<!-- Need to ensure class names for services get translated as well... -->
259-
<transformers>
260-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
261-
</transformers>
262-
</configuration>
263-
</execution>
264-
</executions>
265-
</plugin>
266-
267-
268-
<!-- 03-Jun-2019, tatu: Trying to rudimentary JDK9+ module info. To build with JDK 8
182+
<!-- 12-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
269183
will have to use `moduleInfoFile` which is crappy but anything else requires
270-
JDK 9+.
271-
272-
... does not yet work tho, commented out
184+
JDK 9+. With Jackson 3.0 will upgrade.
273185
-->
274186
<!--
275187
<plugin>
@@ -297,13 +209,13 @@
297209

298210
<reporting>
299211
<plugins>
212+
<!--
213+
<plugin>
214+
<artifactId>maven-changelog-plugin</artifactId>
215+
</plugin>
216+
-->
300217
<plugin>
301218
<artifactId>maven-javadoc-plugin</artifactId>
302-
<!--
303-
<plugin>
304-
<artifactId>maven-changelog-plugin</artifactId>
305-
</plugin>
306-
-->
307219
<configuration>
308220
<show>private</show>
309221
<serialwarn>true</serialwarn>

0 commit comments

Comments
 (0)