Skip to content

Commit 685c1a9

Browse files
costas80costas80
committed
Pull request #40: Development
Merge in ITB/gitb-types from development to master * commit '954cc0f4f3674eacca104d8fa5508a525810d72d': [ITB-1842] Migrate Maven artifact publishing to Maven Central from Legacy OSSRH [ITB-1842] Migrate Maven artifact publishing to Maven Central from Legacy OSSRH [ITB-1842] Migrate Maven artifact publishing to Maven Central from Legacy OSSRH [ITB-1842] Migrate Maven artifact publishing to Maven Central from Legacy OSSRH [ITB-1853] Extend the assign step to allow an assignment by value for container types (maps and lists) [ITB-1836] Allow the interact step to define requested inputs as required (with forced completion by the user) [ITB-1829] Consider the type of test case and scriptlet imports optional, with "binary" as the default [ITB-1770] Support custom handlers for interact steps that are optionally activated for alternate user input methods [ITB-1822] Support 'skipped' attribute for all test steps to conditionally skip their execution [ITB-1819] Allow interact steps containing only instructions to be non-blocking [ITB-1820, ITB-1821] Consider the receive/step step "from"/"to" actor to be by default the SUT, and the "to"/"from" as the non-SUT actor (if only two actors are defined) README update Removed unnecessary dependencies Included gitb-specs as a transitive dependency of the javax and jakarta variants [ITB-1765] Support multiple test session output messages [ITB-1530] Support use of configuration parameters in dynamic scriptlets values and static ifs Third party licences Third party licences
2 parents d822940 + 954cc0f commit 685c1a9

9 files changed

Lines changed: 146 additions & 18 deletions

File tree

‎etc/licence/third-party-licence-template.ftl‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<#-- To render the third-party file.
2+
Available context :
3+
4+
- dependencyMap a collection of Map.Entry with
5+
key are dependencies (as a MavenProject) (from the maven project)
6+
values are licenses of each dependency (array of string)
7+
8+
- licenseMap a collection of Map.Entry with
9+
key are licenses of each dependency (array of string)
10+
values are all dependencies using this license
11+
-->
12+
<#function licenseFormat licenses>
13+
<#assign result = "|"/>
14+
<#list licenses as license>
15+
<#assign result = result + " " + license + ","/>
16+
</#list>
17+
<#assign result = result?remove_ending(",")/>
18+
<#return result>
19+
</#function>
20+
<#function artifactFormat p>
21+
<#if p.name?index_of('Unnamed') &gt; -1>
22+
<#return p.artifactId + " | " + p.groupId + ":" + p.artifactId + " | " + p.version + " | " + (p.url!"no url defined") + "|">
23+
<#else>
24+
<#return p.name + " | " + p.groupId + ":" + p.artifactId + " | " + p.version + " | " + (p.url!"no url defined") + " |">
25+
</#if>
26+
</#function>
27+
28+
# Third-party library licences and attributions
29+
30+
The current section includes all third party libraries used as binary distributions in the current software's executable
31+
build. These libraries are used as-is, with no modifications to source code.
32+
33+
## Licence overview
34+
35+
| Licence type | Name | Dependency | Version | Link |
36+
| :----------- | :--- | :--------- | :------ | :--- |
37+
<#list dependencyMap as e><#t>
38+
<#assign project = e.getKey()/><#t>
39+
<#assign licenses = e.getValue()/><#t>
40+
<#lt>${licenseFormat(licenses)} | ${artifactFormat(project)}
41+
</#list><#t>
42+
43+
## Specific licences
44+
45+
This section includes the full text of licences that require their listing (see mapping to libraries in the previous
46+
section). Furthermore, licence texts and copyright attributions are included for specific libraries that require this.
47+
48+
### Eclipse Distribution License - v1.0
49+
50+
```
51+
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
52+
53+
All rights reserved.
54+
55+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
56+
57+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
58+
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
59+
Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
60+
61+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
62+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
63+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
64+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
65+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
66+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
67+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68+
```

‎gitb-types-jakarta/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.25.2</version>
9+
<version>1.26.0</version>
1010
</parent>
1111
<artifactId>gitb-types-jakarta</artifactId>
12+
<name>${project.groupId}:${project.artifactId}</name>
1213
<description>Type definitions for GITB types and services. This library includes classes annotated using Jakarta APIs (JAXB, JAX-WS) for use in Jakarta EE projects.</description>
1314

1415
<properties>

‎gitb-types-javax/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.25.2</version>
9+
<version>1.26.0</version>
1010
</parent>
1111
<artifactId>gitb-types</artifactId>
12+
<name>${project.groupId}:${project.artifactId}</name>
1213
<description>Type definitions for GITB types and services. This library includes classes annotated using javax APIs (JAXB, JAX-WS) for use in Java EE (pre-Jakarta) projects.</description>
1314

1415
<properties>

‎gitb-types-specs/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<parent>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.25.2</version>
9+
<version>1.26.0</version>
1010
</parent>
1111
<artifactId>gitb-types-specs</artifactId>
12+
<name>${project.groupId}:${project.artifactId}</name>
1213
<description>Specifications (WSDLs and XSDs) for GITB types and services.</description>
1314
</project>

‎gitb-types-specs/src/main/resources/schema/gitb_tbs.xsd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<xsd:extension base="BasicRequest">
4343
<xsd:sequence>
4444
<xsd:element name="tcInstanceId" type="xsd:string" minOccurs="0"/>
45+
<xsd:element name="configs" type="gitb:ActorConfiguration" maxOccurs="unbounded"/>
4546
</xsd:sequence>
4647
</xsd:extension>
4748
</xsd:complexContent>
@@ -159,6 +160,7 @@
159160
<xsd:attribute name="multiple" type="xsd:boolean"/>
160161
<xsd:attribute name="inputType" type="gitb:InputRequestInputType"/>
161162
<xsd:attribute name="mimeType" type="xsd:string"/>
163+
<xsd:attribute name="required" type="xsd:boolean" default="false"/>
162164
</xsd:complexType>
163165
<xsd:complexType name="TestStepStatus">
164166
<xsd:sequence>

‎gitb-types-specs/src/main/resources/schema/gitb_tdl.xsd‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<xsd:simpleContent>
8484
<xsd:extension base="gitb:StringOrVariable">
8585
<xsd:attribute name="name" type="xsd:string" use="required"/>
86-
<xsd:attribute name="type" type="xsd:string" use="required"/>
86+
<xsd:attribute name="type" type="xsd:string" default="binary"/>
8787
<xsd:attribute name="encoding" type="xsd:string"/>
8888
<xsd:attribute name="from" type="xsd:string"/>
8989
</xsd:extension>
@@ -183,6 +183,7 @@
183183
<xsd:complexType name="TestConstruct">
184184
<xsd:attribute name="id" type="xsd:string"/>
185185
<xsd:attribute name="stopOnError" type="xsd:boolean"/>
186+
<xsd:attribute name="skipped" type="gitb:BooleanOrVariable"/>
186187
</xsd:complexType>
187188
<xsd:complexType name="TestStep">
188189
<xsd:complexContent>
@@ -203,8 +204,8 @@
203204
<xsd:element name="config" type="gitb:Configuration" minOccurs="0" maxOccurs="unbounded"/>
204205
<xsd:element name="input" type="Binding" minOccurs="0" maxOccurs="unbounded"/>
205206
</xsd:sequence>
206-
<xsd:attribute name="from" type="gitb:StringOrVariable" use="required"/>
207-
<xsd:attribute name="to" type="gitb:StringOrVariable" use="required"/>
207+
<xsd:attribute name="from" type="gitb:StringOrVariable"/>
208+
<xsd:attribute name="to" type="gitb:StringOrVariable"/>
208209
<xsd:attribute name="txnId" type="xsd:string"/>
209210
<xsd:attribute name="handler" type="gitb:StringOrVariable"/>
210211
<xsd:attribute name="reply" type="gitb:BooleanOrVariable" default="false"/>
@@ -343,13 +344,16 @@
343344
<xsd:attribute name="to" type="xsd:string" use="required"/>
344345
<xsd:attribute name="append" type="xsd:boolean" default="false"/>
345346
<xsd:attribute name="type" type="xsd:string" />
347+
<xsd:attribute name="skipped" type="gitb:BooleanOrVariable"/>
348+
<xsd:attribute name="byValue" type="xsd:boolean" default="false"/>
346349
</xsd:extension>
347350
</xsd:complexContent>
348351
</xsd:complexType>
349352
<xsd:complexType name="Log">
350353
<xsd:complexContent>
351354
<xsd:extension base="Expression">
352355
<xsd:attribute name="level" type="LogLevelOrVariable" default="INFO"/>
356+
<xsd:attribute name="skipped" type="gitb:BooleanOrVariable"/>
353357
</xsd:extension>
354358
</xsd:complexContent>
355359
</xsd:complexType>
@@ -401,16 +405,26 @@
401405
<xsd:element name="instruct" type="Instruction"/>
402406
<xsd:element name="request" type="UserRequest"/>
403407
</xsd:choice>
408+
<xsd:element name="handlerConfig" type="HandlerConfiguration" minOccurs="0"/>
404409
</xsd:sequence>
405410
<xsd:attribute name="with" type="xsd:string"/>
406411
<xsd:attribute name="title" type="gitb:StringOrVariable" default="interact"/>
407412
<xsd:attribute name="inputTitle" type="gitb:StringOrVariable"/>
408413
<xsd:attribute name="collapsed" type="xsd:boolean" default="false"/>
409414
<xsd:attribute name="admin" type="xsd:boolean" default="false"/>
410415
<xsd:attribute name="timeout" type="gitb:NumberOrVariable"/>
416+
<xsd:attribute name="blocking" type="gitb:BooleanOrVariable" default="true"/>
417+
<xsd:attribute name="handlerEnabled" type="gitb:BooleanOrVariable" default="false"/>
418+
<xsd:attribute name="handler" type="gitb:StringOrVariable"/>
411419
</xsd:extension>
412420
</xsd:complexContent>
413421
</xsd:complexType>
422+
<xsd:complexType name="HandlerConfiguration">
423+
<xsd:sequence>
424+
<xsd:element name="property" type="gitb:Configuration" minOccurs="0" maxOccurs="unbounded"/>
425+
<xsd:element name="input" type="Binding" minOccurs="0" maxOccurs="unbounded"/>
426+
</xsd:sequence>
427+
</xsd:complexType>
414428
<xsd:complexType name="BeginProcessingTransaction">
415429
<xsd:complexContent>
416430
<xsd:extension base="TestConstruct">
@@ -464,6 +478,7 @@
464478
<xsd:attribute name="inputType" type="gitb:InputRequestInputType"/>
465479
<xsd:attribute name="report" type="xsd:boolean" default="true"/>
466480
<xsd:attribute name="fileName" type="gitb:StringOrVariable"/>
481+
<xsd:attribute name="required" type="gitb:BooleanOrVariable" default="false"/>
467482
</xsd:extension>
468483
</xsd:complexContent>
469484
</xsd:complexType>
@@ -551,11 +566,19 @@
551566
<xsd:element name="case" type="OutputCase" minOccurs="0" maxOccurs="unbounded"/>
552567
<xsd:element name="default" type="Expression" minOccurs="0"/>
553568
</xsd:sequence>
569+
<xsd:attribute name="match" type="OutputMessageMatchApproach"/>
554570
</xsd:complexType>
555571
<xsd:complexType name="OutputCase">
556572
<xsd:sequence>
557573
<xsd:element name="cond" type="Expression"/>
558574
<xsd:element name="message" type="Expression"/>
559575
</xsd:sequence>
560576
</xsd:complexType>
577+
<xsd:simpleType name="OutputMessageMatchApproach">
578+
<xsd:restriction base="xsd:string">
579+
<xsd:enumeration value="first"/>
580+
<xsd:enumeration value="all"/>
581+
<xsd:enumeration value="cascade"/>
582+
</xsd:restriction>
583+
</xsd:simpleType>
561584
</xsd:schema>

‎gitb-types-specs/src/main/resources/schema/gitb_tpl.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<xsd:element name="actors" type="gitb:Roles"/>
99
<xsd:element name="preliminary" type="Preliminary" minOccurs="0"/>
1010
<xsd:element name="steps" type="Sequence"/>
11-
<xsd:element name="output" type="xsd:string" minOccurs="0"/>
11+
<xsd:element name="output" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
1212
</xsd:sequence>
1313
<xsd:attribute name="id" type="xsd:string" use="required"/>
1414
<xsd:attribute name="supportsParallelExecution" type="xsd:boolean" default="true"/>

‎gitb-types-specs/src/main/resources/schema/gitb_tr.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
<xsd:element name="startTime" type="xsd:dateTime"/>
340340
<xsd:element name="endTime" type="xsd:dateTime" minOccurs="0"/>
341341
<xsd:element name="result" type="TestResultType"/>
342-
<xsd:element name="message" type="xsd:string" minOccurs="0"/>
342+
<xsd:element name="message" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
343343
<xsd:element name="steps" type="TestCaseStepsType" minOccurs="0"/>
344344
</xsd:sequence>
345345
<xsd:attribute name="id" type="xsd:string" use="required"/>

‎pom.xml‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>eu.europa.ec.itb</groupId>
88
<artifactId>gitb-types-parent</artifactId>
9-
<version>1.25.2</version>
9+
<version>1.26.0</version>
1010
<packaging>pom</packaging>
1111
<name>${project.groupId}:${project.artifactId}</name>
1212
<description>Type definitions, WSDLs and XSDs for GITB types and services.</description>
13-
<url>https://joinup.ec.europa.eu/solution/interoperability-test-bed/about</url>
13+
<url>https://interoperable-europe.ec.europa.eu/collection/interoperability-test-bed-repository/solution/interoperability-test-bed</url>
1414

1515
<licenses>
1616
<license>
1717
<name>European Union Public Licence (EUPL) Version 1.2</name>
18-
<url>https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12</url>
18+
<url>https://interoperable-europe.ec.europa.eu/collection/eupl/eupl-text-eupl-12</url>
1919
</license>
2020
</licenses>
2121

@@ -43,6 +43,7 @@
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
<specsRoot>${basedir}/../gitb-types-specs</specsRoot>
4545
<java.release>8</java.release>
46+
<autoPublish>true</autoPublish>
4647
<!-- API library versions -->
4748
<jaxb.version>2.3.1</jaxb.version>
4849
<jaxws.version>2.3.1</jaxws.version>
@@ -53,7 +54,8 @@
5354
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
5455
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
5556
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
56-
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
57+
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
58+
<license-maven-plugin.version>2.5.0</license-maven-plugin.version>
5759
</properties>
5860

5961
<dependencyManagement>
@@ -102,6 +104,36 @@
102104
<url>${itbRepoWriteUrl}</url>
103105
</snapshotRepository>
104106
</distributionManagement>
107+
<build>
108+
<pluginManagement>
109+
<plugins>
110+
<plugin>
111+
<groupId>org.codehaus.mojo</groupId>
112+
<artifactId>license-maven-plugin</artifactId>
113+
<version>${license-maven-plugin.version}</version>
114+
<configuration>
115+
<fileTemplate>${project.basedir}/etc/licence/third-party-licence-template.ftl</fileTemplate>
116+
<thirdPartyFilename>THIRD_PARTY_LICENCES.md</thirdPartyFilename>
117+
<excludedScopes>test</excludedScopes>
118+
<failOnMissing>true</failOnMissing>
119+
<licenseMerges>
120+
<licenseMerge>Eclipse Distribution License - v1.0|EDL 1.0|Eclipse Distribution License - v 1.0</licenseMerge>
121+
<licenseMerge>Common Development and Distribution License 1.0|CDDL 1.1</licenseMerge>
122+
<licenseMerge>GNU General Public License (GPL), Version 2 (with Classpath Exception)|GPL2 w/ CPE</licenseMerge>
123+
<licenseMerge>Common Development and Distribution License 1.0, GNU General Public License (GPL), Version 2 (with Classpath Exception)|CDDL/GPLv2+CE|CDDL + GPLv2 with classpath exception|</licenseMerge>
124+
</licenseMerges>
125+
</configuration>
126+
<!--
127+
To generate the complete third party licence file run `mvn license:aggregate-add-third-party`
128+
The resulting licence file is prepared in target/generated-sources/license/THIRD_PARTY_LICENCES.md
129+
In case specific licences and attributions need to be included, these need to be added to etc/licence/third-party-licence-template.ftl
130+
131+
In specific validator projects based on the itb-commons, similarly use `mvn license:aggregate-add-third-party`
132+
-->
133+
</plugin>
134+
</plugins>
135+
</pluginManagement>
136+
</build>
105137
</profile>
106138
<profile>
107139
<id>release</id>
@@ -163,14 +195,14 @@
163195
</executions>
164196
</plugin>
165197
<plugin>
166-
<groupId>org.sonatype.plugins</groupId>
167-
<artifactId>nexus-staging-maven-plugin</artifactId>
168-
<version>${nexus-staging-maven-plugin.version}</version>
198+
<groupId>org.sonatype.central</groupId>
199+
<artifactId>central-publishing-maven-plugin</artifactId>
200+
<version>${central-publishing-maven-plugin.version}</version>
169201
<extensions>true</extensions>
170202
<configuration>
171-
<serverId>ossrh</serverId>
172-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
173-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
203+
<publishingServerId>central</publishingServerId>
204+
<autoPublish>${autoPublish}</autoPublish>
205+
<waitUntil>published</waitUntil>
174206
</configuration>
175207
</plugin>
176208
</plugins>

0 commit comments

Comments
 (0)