Skip to content

Commit cf0b566

Browse files
mihxilmihxil
committed
Just changed to pom of the xalan subdir so we can release it ourselves. REAME.adoc about this. I'll publish locally, so for now the github action just builds.
1 parent 4ae5502 commit cf0b566

3 files changed

Lines changed: 94 additions & 96 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ on:
1111
permissions:
1212
contents: read
1313

14-
# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners
15-
# GitHub Actions does not support Docker, PostgreSQL server on Windows, macOS :(
1614

1715
concurrency:
1816
# On master/release, we don't want any jobs cancelled so the sha is used to name the group
@@ -33,41 +31,7 @@ jobs:
3331
with:
3432
distribution: zulu
3533
java-version: 8
36-
- name: 'Build Xalan jars'
34+
- name: 'Build Xalan jar'
3735
run: |
38-
mvn --no-transfer-progress clean compile site verify
39-
- uses: actions/checkout@v3
40-
name: 'Checkout xalan-test'
41-
with:
42-
repository: apache/xalan-test
43-
path: xalan-test
44-
ref: master
45-
- name: 'Cheat xalan-test up to be sibling of xalan-java'
46-
run: |
47-
mv xalan-test ..; ls ..
48-
- name: 'Run xalan-test tests'
49-
working-directory: ../xalan-test
50-
# NOTE: "alltest" target includes conformance tests known not to run in Xalan,
51-
# as well as having dependencies on some targets which have since been edited
52-
# out. The following is our typical minimal build test as documented in README,
53-
# minus conf.xsltc since that one is currently throwing four known failures and
54-
# isn't set up to say "but that's not a regression".
55-
56-
# NOTE: Adjustments made for mvn build leaving things in a slightly different
57-
# place than ant build did (and recreating /lib).
58-
run: |
59-
ls; ant -debug jar extensions.classes smoketest apitest -Dxalan.relpath=../xalan-java -Dparserjar=../xalan-java/lib/xercesImpl-2.12.2.jar -Dxml-apis.jar=../xalan-java/lib/xml-apis-1.4.01.jar
60-
61-
# Build distribution artifacts: Used to pull xalan-test back down as child and
62-
# run fulldist:
63-
# run: |
64-
# ant fulldist
65-
# fulldist isn't currently a separate target in the mvn build process
66-
# A near-equivalent is being performed every time to build the .tar.gz
67-
# and .zip distribution files.
68-
#
69-
# BUT NOTE that the binary distro has traditionally included
70-
# xalan-test as a subdirectory; maven build doesn't yet pull that in.
71-
# Discussion is in progress about whether it is (a) necessary, (b) a good
72-
# idea.
73-
# TODO: REVIEW.
36+
cd xalan
37+
mvn --no-transfer-progress clean package

‎README.adoc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
= This fork
2+
3+
We just use this fork to publish a build of the xalan jar with the latest bug fixes.
4+
5+
Xalan is very seldomly released. We just publish a build with different coordinates (and version post fixed with a -<number>). So that we can use it in other projects (well, in this case just MMBase).
6+
7+
[source, xml]
8+
----
9+
<dependency>
10+
<groupId>org.mmbase.xalan</groupId>
11+
<artifactId>xalan</artifactId>
12+
<version>2.7.3-1</version>
13+
</dependency>
14+
----

‎xalan/pom.xml‎

Lines changed: 77 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,31 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>xalan</groupId>
7-
<artifactId>xalan-j</artifactId>
8-
<version>2.7.3</version>
9-
</parent>
105
<groupId>org.mmbase.xalan</groupId>
116
<artifactId>xalan</artifactId>
7+
<version>2.7.3-1</version>
8+
129
<name>Apache Xalan-Java</name>
1310
<description>Apache's XSLT processor</description>
11+
<url>https://github.com/mmbase/xalan-java/</url>
12+
<scm>
13+
<url>${project.url}</url>
14+
</scm>
15+
<developers>
16+
<developer>
17+
<id>michiel</id>
18+
<name>Michiel Meeuwissen</name>
19+
</developer>
20+
</developers>
21+
<licenses>
22+
<license>
23+
<name>Apache License, Version 2.0</name>
24+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
25+
<distribution>repo</distribution>
26+
</license>
27+
</licenses>
1428
<properties>
29+
<xalan.version>2.7.3</xalan.version>
1530
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1631
</properties>
1732
<build>
@@ -32,10 +47,6 @@
3247
</resources>
3348

3449
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-surefire-plugin</artifactId>
38-
</plugin>
3950
<!-- https://github.com/vbmacher/cup-maven-plugin
4051
4152
NOTE: There is an XPathParser.java in both xalan/xsltc/compiler/ and
@@ -87,54 +98,34 @@
8798

8899
<plugin>
89100
<groupId>org.apache.maven.plugins</groupId>
90-
<artifactId>maven-shade-plugin</artifactId>
101+
<artifactId>maven-resources-plugin</artifactId>
102+
<version>3.3.1</version>
103+
</plugin>
104+
<plugin>
105+
<groupId>org.sonatype.central</groupId>
106+
<artifactId>central-publishing-maven-plugin</artifactId>
107+
<version>0.9.0</version>
108+
<extensions>true</extensions>
109+
<configuration>
110+
<publishingServerId>central</publishingServerId>
111+
<autoPublish>true</autoPublish>
112+
<waitUntil>published</waitUntil>
113+
<ignorePublishedComponents>true</ignorePublishedComponents>
114+
</configuration>
115+
</plugin>
116+
<plugin>
117+
<artifactId>maven-gpg-plugin</artifactId>
118+
<version>3.2.8</version>
91119
<executions>
92120
<execution>
93-
<phase>package</phase>
121+
<id>sign-artifacts</id>
122+
<phase>verify</phase>
94123
<goals>
95-
<goal>shade</goal>
124+
<goal>sign</goal>
96125
</goals>
97-
<configuration>
98-
<artifactSet>
99-
<excludes>
100-
<exclude>com.github.vbmacher:java-cup</exclude>
101-
<exclude>commons-logging:commons-logging</exclude>
102-
<exclude>org.apache.commons:commons-lang3</exclude>
103-
<exclude>org.apache.ant:ant</exclude>
104-
<exclude>org.apache.ant:ant-launcher</exclude>
105-
<exclude>xalan:serializer</exclude>
106-
<exclude>de.jflex:jflex</exclude>
107-
</excludes>
108-
</artifactSet>
109-
<relocations>
110-
<!-- We could instead make java-cup-runtime another dependency
111-
provided externally, and perhaps should, but this
112-
replicates the ant build's practice of including it
113-
while keeping it from interfering with a user instance.
114-
TODO: REVIEW.
115-
-->
116-
<relocation>
117-
<pattern>java_cup.runtime</pattern>
118-
<shadedPattern>org.apache.xalan.shaded.java_cup.runtime</shadedPattern>
119-
</relocation>
120-
</relocations>
121-
</configuration>
122126
</execution>
123127
</executions>
124128
</plugin>
125-
126-
<!-- Copy generated jarfile up to xalan-java/build/,
127-
for backward compatibility with Ant builds. -->
128-
<plugin>
129-
<groupId>org.apache.maven.plugins</groupId>
130-
<artifactId>maven-dependency-plugin</artifactId>
131-
</plugin>
132-
<!-- And -source.jar -->
133-
<plugin>
134-
<groupId>org.apache.maven.plugins</groupId>
135-
<artifactId>maven-resources-plugin</artifactId>
136-
</plugin>
137-
138129
</plugins>
139130

140131
</build>
@@ -143,12 +134,7 @@
143134
<dependency>
144135
<groupId>xalan</groupId>
145136
<artifactId>serializer</artifactId>
146-
</dependency>
147-
<!-- For javadoc generation only, hence 'provided' scope -->
148-
<dependency>
149-
<groupId>xalan</groupId>
150-
<artifactId>${xalan.taglet.artifactId}</artifactId>
151-
<scope>provided</scope>
137+
<version>${xalan.version}</version>
152138
</dependency>
153139

154140
<!-- https://mvnrepository.com/artifact/org.apache.bcel/bcel -->
@@ -237,21 +223,25 @@
237223
<dependency>
238224
<groupId>org.junit.jupiter</groupId>
239225
<artifactId>junit-jupiter-engine</artifactId>
226+
<version>5.14.1</version>
240227
<scope>test</scope>
241228
</dependency>
242229
<dependency>
243230
<groupId>org.junit.jupiter</groupId>
244231
<artifactId>junit-jupiter-params</artifactId>
232+
<version>5.14.1</version>
245233
<scope>test</scope>
246234
</dependency>
247235
<dependency>
248236
<groupId>org.mockito</groupId>
249237
<artifactId>mockito-inline</artifactId>
238+
<version>5.2.0</version>
250239
<scope>test</scope>
251240
</dependency>
252241
<dependency>
253242
<groupId>org.mockito</groupId>
254243
<artifactId>mockito-junit-jupiter</artifactId>
244+
<version>5.3.0</version>
255245
<scope>test</scope>
256246
</dependency>
257247

@@ -263,7 +253,7 @@
263253
<activation>
264254
<!--
265255
Activate by default. Workaround for 'activeByDefault', which is broken
266-
by design, see https://issues.apache.org/jira/browse/MNG-4917.
256+
by design, see
267257
-->
268258
<jdk>[1,)</jdk>
269259
</activation>
@@ -272,6 +262,27 @@
272262
<plugin>
273263
<groupId>org.apache.maven.plugins</groupId>
274264
<artifactId>maven-javadoc-plugin</artifactId>
265+
<version>3.12.0</version>
266+
<configuration>
267+
<excludePackageNames>xalan2jtaglet</excludePackageNames>
268+
<doclint>none</doclint>
269+
<tags>
270+
<tag>
271+
<name>xsl.usage</name>
272+
<placement>a</placement>
273+
<head>XSL Usage:</head>
274+
</tag>
275+
</tags>
276+
</configuration>
277+
278+
<executions>
279+
<execution>
280+
<id>attach-javadocs</id>
281+
<goals>
282+
<goal>jar</goal>
283+
</goals>
284+
</execution>
285+
</executions>
275286
</plugin>
276287
</plugins>
277288
</build>
@@ -290,6 +301,15 @@
290301
<plugin>
291302
<groupId>org.apache.maven.plugins</groupId>
292303
<artifactId>maven-source-plugin</artifactId>
304+
<version>3.4.0</version>
305+
<executions>
306+
<execution>
307+
<id>attach-sources</id>
308+
<goals>
309+
<goal>jar-no-fork</goal>
310+
</goals>
311+
</execution>
312+
</executions>
293313
</plugin>
294314
</plugins>
295315
</build>

0 commit comments

Comments
 (0)