Skip to content

Commit f99c7bf

Browse files
sinattiengparerworkeractions-user
authored
Release 3.1.0 (#3)
* [skip ci] Update project to latest tag preingest-xml-3.1.0 * Update pom.xml * Update CI * Update SNAPSHOT version * [maven-release-plugin] prepare release preingest-xml-3.1.0 * [maven-release-plugin] prepare for next development iteration --------- Co-authored-by: parerworker <DevPARER@regione.emilia-romagna.it> Co-authored-by: GitHub Actions <actions@github.com>
1 parent 305570a commit f99c7bf

5 files changed

Lines changed: 83 additions & 74 deletions

File tree

‎.github/workflows/compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ jobs:
44
compile:
55
uses: RegioneER/parer-github-template/.github/workflows/compile.yml@v1
66
with:
7-
java: '8'
7+
java: '11'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
uses: RegioneER/parer-github-template/.github/workflows/release.yml@v1
1212
with:
1313
version: ${{ inputs.version }}
14-
java: '8'
14+
java: '11'

‎pom.xml‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<parent>
55
<groupId>it.eng.parer</groupId>
66
<artifactId>parer-pom</artifactId>
7-
<version>4.2.0</version>
7+
<version>6.4.0</version>
88
</parent>
9-
<groupId>it.eng.parer</groupId>
109
<artifactId>preingest-xml</artifactId>
11-
<version>3.0.18-SNAPSHOT</version>
10+
<version>3.1.1-SNAPSHOT</version>
1211
<name>preingest-xml</name>
1312
<description>Progetto PREINGEST-XML</description>
1413

@@ -36,28 +35,40 @@
3635
<sonar.projectVersion>${project.version}</sonar.projectVersion>
3736
<!-- Skiptests by default : esecuzione su CI -->
3837
<skipTests>true</skipTests>
38+
<junit-jupiter.version>5.10.3</junit-jupiter.version>
39+
<jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
3940
</properties>
4041

4142
<dependencies>
4243
<dependency>
43-
<groupId>com.sun.xml.bind</groupId>
44-
<artifactId>jaxb-impl</artifactId>
45-
<version>2.2.5.redhat-9</version>
46-
</dependency>
44+
<groupId>javax.xml.bind</groupId>
45+
<artifactId>jaxb-api</artifactId>
46+
<version>${jaxb.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.sun.xml.bind</groupId>
50+
<artifactId>jaxb-core</artifactId>
51+
<version>${jaxb.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.sun.xml.bind</groupId>
55+
<artifactId>jaxb-impl</artifactId>
56+
<version>${jaxb.version}</version>
57+
</dependency>
4758
<dependency>
48-
<groupId>junit</groupId>
49-
<artifactId>junit</artifactId>
50-
<version>4.11</version>
51-
<scope>test</scope>
52-
</dependency>
59+
<groupId>org.junit.jupiter</groupId>
60+
<artifactId>junit-jupiter-api</artifactId>
61+
<version>${junit-jupiter.version}</version>
62+
<scope>test</scope>
63+
</dependency>
5364
</dependencies>
5465

5566
<build>
5667
<plugins>
5768
<plugin>
5869
<groupId>org.codehaus.mojo</groupId>
5970
<artifactId>jaxb2-maven-plugin</artifactId>
60-
<version>2.2</version>
71+
<version>${jaxb2-maven-plugin.version}</version>
6172
<executions>
6273
<execution>
6374
<id>datispecdicom</id>
@@ -66,7 +77,7 @@
6677
</goals>
6778
<configuration>
6879
<sources>
69-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecDicom/WSMetadatiSpecificiDICOM.xsd</source>
80+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecDicom/WSMetadatiSpecificiDICOM.xsd</source>
7081
</sources>
7182
<packageName>it.eng.sacerasi.ws.xml.datiSpecDicom</packageName>
7283
</configuration>
@@ -79,7 +90,7 @@
7990
</goals>
8091
<configuration>
8192
<sources>
82-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecFiltri/WSDatiSpecificiDiarioFiltri.xsd</source>
93+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecFiltri/WSDatiSpecificiDiarioFiltri.xsd</source>
8394
</sources>
8495
<packageName>it.eng.sacerasi.ws.xml.datiSpecFiltri</packageName>
8596
</configuration>
@@ -91,7 +102,7 @@
91102
</goals>
92103
<configuration>
93104
<sources>
94-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecOrder/WSDatiSpecificiDiarioOrder.xsd</source>
105+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecOrder/WSDatiSpecificiDiarioOrder.xsd</source>
95106
</sources>
96107
<packageName>it.eng.sacerasi.ws.xml.datiSpecOrder</packageName>
97108
</configuration>
@@ -103,7 +114,7 @@
103114
</goals>
104115
<configuration>
105116
<sources>
106-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecOut/WSDatiSpecificiDiarioOut.xsd</source>
117+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecOut/WSDatiSpecificiDiarioOut.xsd</source>
107118
</sources>
108119
<packageName>it.eng.sacerasi.ws.xml.datiSpecOut</packageName>
109120
</configuration>
@@ -115,7 +126,7 @@
115126
</goals>
116127
<configuration>
117128
<sources>
118-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecResult/WSDatiSpecificiDiarioResult.xsd</source>
129+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/datiSpecResult/WSDatiSpecificiDiarioResult.xsd</source>
119130
</sources>
120131
<packageName>it.eng.sacerasi.ws.xml.datiSpecResult</packageName>
121132
</configuration>
@@ -127,7 +138,7 @@
127138
</goals>
128139
<configuration>
129140
<sources>
130-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/invioAsync/WSInvioAsync.xsd</source>
141+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/invioAsync/WSInvioAsync.xsd</source>
131142
</sources>
132143
<packageName>it.eng.sacerasi.ws.xml.invioAsync</packageName>
133144
</configuration>
@@ -139,7 +150,7 @@
139150
</goals>
140151
<configuration>
141152
<sources>
142-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/ws/xml/invioDaTrasf/WSInvioDaTrasf.xsd</source>
153+
<source>src/main/resources/xsd/it/eng/sacerasi/ws/xml/invioDaTrasf/WSInvioDaTrasf.xsd</source>
143154
</sources>
144155
<packageName>it.eng.sacerasi.ws.xml.invioDaTrasf</packageName>
145156
</configuration>
@@ -151,7 +162,7 @@
151162
</goals>
152163
<configuration>
153164
<sources>
154-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/su/xml/invioSU/InvioSU.xsd</source>
165+
<source>src/main/resources/xsd/it/eng/sacerasi/su/xml/invioSU/InvioSU.xsd</source>
155166
</sources>
156167
<packageName>it.eng.sacerasi.su.xml.invioSU</packageName>
157168
</configuration>
@@ -163,7 +174,7 @@
163174
</goals>
164175
<configuration>
165176
<sources>
166-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/sisma/xml/invioSisma/InvioSisma.xsd</source>
177+
<source>src/main/resources/xsd/it/eng/sacerasi/sisma/xml/invioSisma/InvioSisma.xsd</source>
167178
</sources>
168179
<packageName>it.eng.sacerasi.sisma.xml.invioSisma</packageName>
169180
</configuration>
@@ -175,7 +186,7 @@
175186
</goals>
176187
<configuration>
177188
<sources>
178-
<source>${project.basedir}/src/main/resources/xsd/it/eng/sacerasi/xml/unitaDocumentaria/UnitaDocumentaria.xsd</source>
189+
<source>src/main/resources/xsd/it/eng/sacerasi/xml/unitaDocumentaria/UnitaDocumentaria.xsd</source>
179190
</sources>
180191
<packageName>it.eng.sacerasi.xml.unitaDocumentaria</packageName>
181192
</configuration>
@@ -184,11 +195,9 @@
184195

185196
<configuration>
186197
<xjbSources>
187-
<xjbSource>${project.basedir}/src/main/xjb/conf.xjb</xjbSource>
198+
<xjbSource>src/main/xjb/conf.xjb</xjbSource>
188199
</xjbSources>
189-
<removeOldOutput>false</removeOldOutput>
190200
<clearOutputDir>false</clearOutputDir>
191-
<forceRegenerate>true</forceRegenerate>
192201
</configuration>
193202
</plugin>
194203

‎src/main/java/it/eng/sacerasixml/xsd/FileXSDUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* Classe che restituisce i nomi dei file XSD
24-
*
24+
*
2525
* In questo modo gli utilizzatori della libreria non devono conoscere i path dei file
2626
*
2727
* @author Moretti_Lum, Iacolucci_Ma

0 commit comments

Comments
 (0)