Skip to content

Commit 199933c

Browse files
nilsaellennilsaellen
authored
Feature/dependencies update (#2)
* Update dependencies versions * Prepare github action to deploy to OSS * Prepare release
1 parent 3372ed0 commit 199933c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+225
-240
lines changed

‎.github/workflows/maven-publish.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Publish release to the Maven Central Repository
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: Set up then Maven Central Repository
13+
uses: actions/setup-java@v3
14+
with:
15+
java-version: '17'
16+
distribution: 'temurin'
17+
server-id: ossrh
18+
server-username: MAVEN_USERNAME
19+
server-password: MAVEN_PASSWORD
20+
21+
- name: Publish to OSS with maven
22+
run: mvn --batch-mode clean deploy -Dgpg.passphrase=${{ secrets.CI_GPG_PASSPHRASE }} -Psonatype-oss-release
23+
env:
24+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
25+
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
26+
MAVEN_OPTS: --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED

‎pom.xml‎

Lines changed: 126 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,176 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ch.galinet.xml</groupId>
77
<artifactId>xml-merge</artifactId>
8-
<version>0.2-SNAPSHOT</version>
8+
<version>0.2</version>
99
<packaging>jar</packaging>
10+
1011
<name>EL4J module XmlMerge common</name>
11-
<description>
12-
Module XmlMerge, common parts of the EL4J framework.
13-
</description>
12+
<description>Module XmlMerge, common parts of the EL4J framework.</description>
13+
<url>https://github.com/nilsaellen/xml-merge</url>
14+
15+
<developers>
16+
<developer>
17+
<name>Nils Aellen</name>
18+
<email>[email protected]</email>
19+
</developer>
20+
</developers>
21+
22+
<licenses>
23+
<license>
24+
<name>GNU General Lesser Public License (LGPL) version 2.1</name>
25+
<url>https://www.gnu.org/licenses/lgpl-2.1.html</url>
26+
<distribution>repo</distribution>
27+
</license>
28+
</licenses>
29+
30+
<scm>
31+
<connection>scm:git:git://github.com/nilsaellen/xml-merge.git</connection>
32+
<developerConnection>scm:git:ssh://github.com:nilsaellen/xml-merge.git</developerConnection>
33+
<url>http://github.com/nilsaellen/xml-merge/tree/master</url>
34+
</scm>
35+
36+
<properties>
37+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38+
<jaxen.version>2.0.0</jaxen.version>
39+
<jdom2.version>2.0.6.1</jdom2.version>
40+
<junit-jupiter-engine.version>5.9.2</junit-jupiter-engine.version>
41+
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
42+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
43+
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
44+
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
45+
<nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
46+
<slf4j.version>2.0.6</slf4j.version>
47+
<xsd-hierarchy.version>0.2</xsd-hierarchy.version>
48+
</properties>
1449

1550
<build>
1651
<plugins>
1752
<plugin>
1853
<artifactId>maven-compiler-plugin</artifactId>
54+
<version>${maven-compiler-plugin.version}</version>
1955
<configuration>
20-
<source>1.8</source>
21-
<target>1.8</target>
56+
<source>17</source>
57+
<target>17</target>
2258
</configuration>
2359
</plugin>
2460
</plugins>
2561
</build>
2662

2763
<distributionManagement>
28-
<repository>
29-
<id>artifactory-releases</id>
30-
<name>artifactory.pnet.ch-releases</name>
31-
<url>http://artifactory.pnet.ch/artifactory/libs-release-local</url>
32-
</repository>
3364
<snapshotRepository>
34-
<id>artifactory-snapshots</id>
35-
<name>artifactory.pnet.ch-snapshots</name>
36-
<url>http://artifactory.pnet.ch/artifactory/libs-snapshot-local</url>
65+
<id>ossrh</id>
66+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
3767
</snapshotRepository>
3868
</distributionManagement>
3969

4070
<dependencies>
4171
<!-- Third party tools -->
4272
<dependency>
43-
<groupId>com.wutka</groupId>
44-
<artifactId>dtdparser</artifactId>
45-
<version>1.21</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>jdom</groupId>
49-
<artifactId>jdom</artifactId>
50-
<version>1.0</version>
73+
<groupId>org.jdom</groupId>
74+
<artifactId>jdom2</artifactId>
75+
<version>${jdom2.version}</version>
5176
</dependency>
5277
<dependency>
5378
<groupId>jaxen</groupId>
5479
<artifactId>jaxen</artifactId>
55-
<version>1.2.0-atlassian-2</version>
80+
<version>${jaxen.version}</version>
5681
</dependency>
5782
<dependency>
5883
<groupId>org.slf4j</groupId>
5984
<artifactId>slf4j-api</artifactId>
60-
<version>RELEASE</version>
85+
<version>${slf4j.version}</version>
6186
</dependency>
6287
<dependency>
6388
<groupId>org.slf4j</groupId>
6489
<artifactId>slf4j-simple</artifactId>
65-
<version>RELEASE</version>
90+
<version>${slf4j.version}</version>
6691
</dependency>
6792
<dependency>
68-
<groupId>junit</groupId>
69-
<artifactId>junit</artifactId>
70-
<version>4.12</version>
93+
<groupId>org.junit.jupiter</groupId>
94+
<artifactId>junit-jupiter-engine</artifactId>
95+
<version>${junit-jupiter-engine.version}</version>
96+
<scope>test</scope>
7197
</dependency>
7298
<dependency>
7399
<groupId>ch.galinet.xml</groupId>
74100
<artifactId>xsd-hierarchy</artifactId>
75-
<version>0.1</version>
101+
<version>${xsd-hierarchy.version}</version>
76102
</dependency>
77103
</dependencies>
78-
<licenses>
79-
<license>
80-
<name>GNU General Lesser Public License (LGPL) version 2.1</name>
81-
<url>https://www.gnu.org/licenses/lgpl-2.1.html</url>
82-
<distribution>repo</distribution>
83-
</license>
84-
</licenses>
85-
</project>
86104

105+
<profiles>
106+
<profile>
107+
<id>sonatype-oss-release</id>
108+
<build>
109+
<plugins>
110+
111+
<!-- Generate source attachment -->
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-source-plugin</artifactId>
115+
<version>${maven-source-plugin.version}</version>
116+
<executions>
117+
<execution>
118+
<id>attach-sources</id>
119+
<goals>
120+
<goal>jar-no-fork</goal>
121+
</goals>
122+
</execution>
123+
</executions>
124+
</plugin>
87125

126+
<!-- Generate javadoc attachment -->
127+
<plugin>
128+
<groupId>org.apache.maven.plugins</groupId>
129+
<artifactId>maven-javadoc-plugin</artifactId>
130+
<version>${maven-javadoc-plugin.version}</version>
131+
<executions>
132+
<execution>
133+
<id>attach-javadocs</id>
134+
<goals>
135+
<goal>jar</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
88140

141+
<!-- Sign the artifacts -->
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-gpg-plugin</artifactId>
145+
<version>${maven-gpg-plugin.version}</version>
146+
<executions>
147+
<execution>
148+
<id>sign-artifacts</id>
149+
<phase>verify</phase>
150+
<goals>
151+
<goal>sign</goal>
152+
</goals>
153+
<configuration>
154+
<homedir>${session.executionRootDirectory}</homedir>
155+
<keyname>eb11bc74</keyname>
156+
</configuration>
157+
</execution>
158+
</executions>
159+
</plugin>
160+
<plugin>
161+
<groupId>org.sonatype.plugins</groupId>
162+
<artifactId>nexus-staging-maven-plugin</artifactId>
163+
<version>${nexus-staging-maven-plugin.version}</version>
164+
<extensions>true</extensions>
165+
<configuration>
166+
<serverId>ossrh</serverId>
167+
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
168+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
169+
</configuration>
170+
</plugin>
171+
</plugins>
172+
</build>
173+
</profile>
174+
</profiles>
89175

176+
</project>

‎pubring.gpg‎

1.21 KB
Binary file not shown.

‎secring.gpg‎

2.57 KB
Binary file not shown.

‎src/main/java/ch/galinet/xml/xmlmerge/AbstractXmlMergeException.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Base class for all exceptions thrown by XmlMerge.
2121
*
22-
* @svnLink $Revision$;$Date$;$Author$;$URL$
23-
*
2422
* @author Laurent Bovet (LBO)
2523
* @author Alex Mathey (AMA)
2624
*/

‎src/main/java/ch/galinet/xml/xmlmerge/Action.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
*/
1717
package ch.galinet.xml.xmlmerge;
1818

19-
import org.jdom.Element;
19+
import org.jdom2.Element;
2020

2121
/**
2222
* Operation on two nodes creating a third node.
2323
*
24-
* @svnLink $Revision$;$Date$;$Author$;$URL$
25-
*
2624
* @author Laurent Bovet (LBO)
2725
* @author Alex Mathey (AMA)
2826
*/

‎src/main/java/ch/galinet/xml/xmlmerge/ConfigurationException.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Thrown when something wrong happens in the XmlMerge configuration.
2121
*
22-
* @svnLink $Revision$;$Date$;$Author$;$URL$
23-
*
2422
* @author Laurent Bovet (LBO)
2523
* @author Alex Mathey (AMA)
2624
*/

‎src/main/java/ch/galinet/xml/xmlmerge/Configurer.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Applies a configuration to an XmlMerge instance.
2121
*
22-
* @svnLink $Revision$;$Date$;$Author$;$URL$
23-
*
2422
* @author Laurent Bovet (LBO)
2523
* @author Alex Mathey (AMA)
2624
*/

‎src/main/java/ch/galinet/xml/xmlmerge/DocumentException.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
*/
1717
package ch.galinet.xml.xmlmerge;
1818

19-
import org.jdom.Document;
19+
import org.jdom2.Document;
2020

2121
/**
2222
* Thrown when something is wrong with a source or output document.
2323
*
24-
* @svnLink $Revision$;$Date$;$Author$;$URL$
25-
*
2624
* @author Laurent Bovet (LBO)
2725
* @author Alex Mathey (AMA)
2826
*/

‎src/main/java/ch/galinet/xml/xmlmerge/ElementException.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
*/
1717
package ch.galinet.xml.xmlmerge;
1818

19-
import org.jdom.Element;
19+
import org.jdom2.Element;
2020

2121
/**
2222
* Thrown when there is something wrong with an element.
2323
*
24-
* @svnLink $Revision$;$Date$;$Author$;$URL$
25-
*
2624
* @author Laurent Bovet (LBO)
2725
* @author Alex Mathey (AMA)
2826
*/

0 commit comments

Comments
 (0)