Skip to content

Commit 51a07c5

Browse files
split into two artifacts - jakarta and jaxb #70
1 parent 62afc32 commit 51a07c5

Some content is hidden

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

45 files changed

+1500
-153
lines changed

.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

.github/workflows/ci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v2
15+
- name: Setup JDK
16+
uses: actions/setup-java@v2
17+
with:
18+
java-version: 21
19+
distribution: zulu
20+
- name: Setup Maven
21+
uses: stCarolas/[email protected]
22+
- name: Setup Maven caching
23+
uses: actions/cache@v2
24+
with:
25+
path: ~/.m2/**
26+
key: maven_deps
27+
- name: Build and test
28+
run: mvn clean test

CHANGELOG.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
# Changelog
22

3-
## [0.2.0](https://github.com/sokomishalov/jackson-dataformat-soap/tree/0.2.0) (2022-04-17)
3+
## [0.2.0](https://github.com/sokomishalov/jackson-datatype-soap/tree/0.2.0) (2022-04-17)
44

5-
[Full Changelog](https://github.com/sokomishalov/jackson-dataformat-soap/compare/0.1.1...0.2.0)
5+
[Full Changelog](https://github.com/sokomishalov/jackson-datatype-soap/compare/0.1.1...0.2.0)
66

77
**Closed issues:**
88

9-
- does not run with jackson-module-jaxb-annotations 2.13. [\#37](https://github.com/sokomishalov/jackson-dataformat-soap/issues/37)
10-
- Support multiple header classes [\#36](https://github.com/sokomishalov/jackson-dataformat-soap/issues/36)
9+
- does not run with jackson-module-jaxb-annotations 2.13. [\#37](https://github.com/sokomishalov/jackson-datatype-soap/issues/37)
10+
- Support multiple header classes [\#36](https://github.com/sokomishalov/jackson-datatype-soap/issues/36)
1111

1212
**Merged pull requests:**
1313

14-
- fix \#36 [\#40](https://github.com/sokomishalov/jackson-dataformat-soap/pull/40) ([sokomishalov](https://github.com/sokomishalov))
15-
- Fix \#37 [\#39](https://github.com/sokomishalov/jackson-dataformat-soap/pull/39) ([sokomishalov](https://github.com/sokomishalov))
16-
- Bump dokka-maven-plugin from 1.5.0 to 1.5.30 [\#16](https://github.com/sokomishalov/jackson-dataformat-soap/pull/16) ([dependabot[bot]](https://github.com/apps/dependabot))
17-
- Bump maven-javadoc-plugin from 3.3.0 to 3.3.1 [\#15](https://github.com/sokomishalov/jackson-dataformat-soap/pull/15) ([dependabot[bot]](https://github.com/apps/dependabot))
18-
- Bump jackson-bom from 2.12.4 to 2.12.5 [\#14](https://github.com/sokomishalov/jackson-dataformat-soap/pull/14) ([dependabot[bot]](https://github.com/apps/dependabot))
19-
- Bump kotlin.version from 1.5.21 to 1.5.30 [\#13](https://github.com/sokomishalov/jackson-dataformat-soap/pull/13) ([dependabot[bot]](https://github.com/apps/dependabot))
20-
- Bump kotlin.version from 1.5.20 to 1.5.21 [\#12](https://github.com/sokomishalov/jackson-dataformat-soap/pull/12) ([dependabot[bot]](https://github.com/apps/dependabot))
21-
- Bump dokka-maven-plugin from 1.4.32 to 1.5.0 [\#11](https://github.com/sokomishalov/jackson-dataformat-soap/pull/11) ([dependabot[bot]](https://github.com/apps/dependabot))
22-
- Bump jackson-bom from 2.12.3 to 2.12.4 [\#10](https://github.com/sokomishalov/jackson-dataformat-soap/pull/10) ([dependabot[bot]](https://github.com/apps/dependabot))
23-
- Bump kotlin.version from 1.5.10 to 1.5.20 [\#9](https://github.com/sokomishalov/jackson-dataformat-soap/pull/9) ([dependabot[bot]](https://github.com/apps/dependabot))
14+
- fix \#36 [\#40](https://github.com/sokomishalov/jackson-datatype-soap/pull/40) ([sokomishalov](https://github.com/sokomishalov))
15+
- Fix \#37 [\#39](https://github.com/sokomishalov/jackson-datatype-soap/pull/39) ([sokomishalov](https://github.com/sokomishalov))
16+
- Bump dokka-maven-plugin from 1.5.0 to 1.5.30 [\#16](https://github.com/sokomishalov/jackson-datatype-soap/pull/16) ([dependabot[bot]](https://github.com/apps/dependabot))
17+
- Bump maven-javadoc-plugin from 3.3.0 to 3.3.1 [\#15](https://github.com/sokomishalov/jackson-datatype-soap/pull/15) ([dependabot[bot]](https://github.com/apps/dependabot))
18+
- Bump jackson-bom from 2.12.4 to 2.12.5 [\#14](https://github.com/sokomishalov/jackson-datatype-soap/pull/14) ([dependabot[bot]](https://github.com/apps/dependabot))
19+
- Bump kotlin.version from 1.5.21 to 1.5.30 [\#13](https://github.com/sokomishalov/jackson-datatype-soap/pull/13) ([dependabot[bot]](https://github.com/apps/dependabot))
20+
- Bump kotlin.version from 1.5.20 to 1.5.21 [\#12](https://github.com/sokomishalov/jackson-datatype-soap/pull/12) ([dependabot[bot]](https://github.com/apps/dependabot))
21+
- Bump dokka-maven-plugin from 1.4.32 to 1.5.0 [\#11](https://github.com/sokomishalov/jackson-datatype-soap/pull/11) ([dependabot[bot]](https://github.com/apps/dependabot))
22+
- Bump jackson-bom from 2.12.3 to 2.12.4 [\#10](https://github.com/sokomishalov/jackson-datatype-soap/pull/10) ([dependabot[bot]](https://github.com/apps/dependabot))
23+
- Bump kotlin.version from 1.5.10 to 1.5.20 [\#9](https://github.com/sokomishalov/jackson-datatype-soap/pull/9) ([dependabot[bot]](https://github.com/apps/dependabot))
2424

25-
## [0.1.1](https://github.com/sokomishalov/jackson-dataformat-soap/tree/0.1.1) (2021-06-21)
25+
## [0.1.1](https://github.com/sokomishalov/jackson-datatype-soap/tree/0.1.1) (2021-06-21)
2626

27-
[Full Changelog](https://github.com/sokomishalov/jackson-dataformat-soap/compare/0.1.0...0.1.1)
27+
[Full Changelog](https://github.com/sokomishalov/jackson-datatype-soap/compare/0.1.0...0.1.1)
2828

2929
**Merged pull requests:**
3030

31-
- remove collection setters [\#8](https://github.com/sokomishalov/jackson-dataformat-soap/pull/8) ([sokomishalov](https://github.com/sokomishalov))
32-
- Bump maven-gpg-plugin from 1.6 to 3.0.1 [\#4](https://github.com/sokomishalov/jackson-dataformat-soap/pull/4) ([dependabot[bot]](https://github.com/apps/dependabot))
31+
- remove collection setters [\#8](https://github.com/sokomishalov/jackson-datatype-soap/pull/8) ([sokomishalov](https://github.com/sokomishalov))
32+
- Bump maven-gpg-plugin from 1.6 to 3.0.1 [\#4](https://github.com/sokomishalov/jackson-datatype-soap/pull/4) ([dependabot[bot]](https://github.com/apps/dependabot))
3333

34-
## [0.1.0](https://github.com/sokomishalov/jackson-dataformat-soap/tree/0.1.0) (2021-06-09)
34+
## [0.1.0](https://github.com/sokomishalov/jackson-datatype-soap/tree/0.1.0) (2021-06-09)
3535

36-
[Full Changelog](https://github.com/sokomishalov/jackson-dataformat-soap/compare/e943b1bc112c28c6c04f09ccecbfc6e8d20f294b...0.1.0)
36+
[Full Changelog](https://github.com/sokomishalov/jackson-datatype-soap/compare/e943b1bc112c28c6c04f09ccecbfc6e8d20f294b...0.1.0)
3737

3838
**Merged pull requests:**
3939

40-
- Bump cxf-codegen-plugin from 3.4.3 to 3.4.4 [\#7](https://github.com/sokomishalov/jackson-dataformat-soap/pull/7) ([dependabot[bot]](https://github.com/apps/dependabot))
41-
- Bump kotlin.version from 1.4.32 to 1.5.10 [\#6](https://github.com/sokomishalov/jackson-dataformat-soap/pull/6) ([dependabot[bot]](https://github.com/apps/dependabot))
42-
- Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 [\#5](https://github.com/sokomishalov/jackson-dataformat-soap/pull/5) ([dependabot[bot]](https://github.com/apps/dependabot))
43-
- Bump cxf-codegen-plugin from 3.3.7 to 3.4.3 [\#3](https://github.com/sokomishalov/jackson-dataformat-soap/pull/3) ([dependabot[bot]](https://github.com/apps/dependabot))
40+
- Bump cxf-codegen-plugin from 3.4.3 to 3.4.4 [\#7](https://github.com/sokomishalov/jackson-datatype-soap/pull/7) ([dependabot[bot]](https://github.com/apps/dependabot))
41+
- Bump kotlin.version from 1.4.32 to 1.5.10 [\#6](https://github.com/sokomishalov/jackson-datatype-soap/pull/6) ([dependabot[bot]](https://github.com/apps/dependabot))
42+
- Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 [\#5](https://github.com/sokomishalov/jackson-datatype-soap/pull/5) ([dependabot[bot]](https://github.com/apps/dependabot))
43+
- Bump cxf-codegen-plugin from 3.3.7 to 3.4.3 [\#3](https://github.com/sokomishalov/jackson-datatype-soap/pull/3) ([dependabot[bot]](https://github.com/apps/dependabot))
4444

4545

4646

README.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
jackson-dataformat-soap
1+
jackson-datatype-soap
22
========
3+
~~Here should be some fancy logo~~
34

45
[![Apache License 2](https://img.shields.io/badge/license-ASF2-blue.svg)](https://choosealicense.com/licenses/apache-2.0/)
5-
[![](https://img.shields.io/maven-central/v/ru.sokomishalov.jackson/jackson-dataformat-soap)](https://mvnrepository.com/artifact/ru.sokomishalov.jackson/jackson-dataformat-soap)
6-
[![](https://img.shields.io/jitpack/v/github/sokomishalov/jackson-dataformat-soap)](https://jitpack.io/#sokomishalov/jackson-dataformat-soap)
6+
[![](https://img.shields.io/maven-central/v/ru.sokomishalov.jackson/jackson-datatype-soap)](https://mvnrepository.com/artifact/ru.sokomishalov.jackson/jackson-datatype-soap-jakarta)
7+
[![](https://img.shields.io/jitpack/v/github/sokomishalov/jackson-datatype-soap)](https://jitpack.io/#sokomishalov/jackson-datatype-soap)
78

89
## Overview
910

@@ -14,18 +15,29 @@ Jackson SOAP implementation over jackson-dataformat-xml
1415
Maven:
1516

1617
```xml
17-
18+
<!-- Legacy (JAXB) artifact -->
19+
<dependency>
20+
<groupId>ru.sokomishalov.jackson</groupId>
21+
<artifactId>jackson-datatype-soap-jaxb</artifactId>
22+
<version>x.y.z</version>
23+
</dependency>
24+
```
25+
```xml
26+
<!-- New (Jakarta) artifact -->
1827
<dependency>
1928
<groupId>ru.sokomishalov.jackson</groupId>
20-
<artifactId>jackson-dataformat-soap</artifactId>
29+
<artifactId>jackson-datatype-soap-jakarta</artifactId>
2130
<version>x.y.z</version>
2231
</dependency>
2332
```
2433

2534
Gradle kotlin dsl:
2635

2736
```kotlin
28-
implementation("ru.sokomishalov.jackson:jackson-dataformat-soap:x.y.z")
37+
// Legacy (JAXB) artifact
38+
implementation("ru.sokomishalov.jackson:jackson-datatype-soap-jaxb:x.y.z")
39+
// New (Jakarta) artifact
40+
implementation("ru.sokomishalov.jackson:jackson-datatype-soap-jakarta:x.y.z")
2941
```
3042

3143
## Usage

jackson-datatype-soap-common/pom.xml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>ru.sokomishalov.jackson</groupId>
9+
<artifactId>jackson-datatype-soap-parent</artifactId>
10+
<version>${revision}</version>
11+
</parent>
12+
13+
<artifactId>jackson-datatype-soap-common</artifactId>
14+
<version>${revision}</version>
15+
16+
<dependencies>
17+
<!-- COMPILE -->
18+
<dependency>
19+
<groupId>org.jetbrains.kotlin</groupId>
20+
<artifactId>kotlin-stdlib</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>com.fasterxml.jackson.dataformat</groupId>
24+
<artifactId>jackson-dataformat-xml</artifactId>
25+
</dependency>
26+
</dependencies>
27+
28+
<build>
29+
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
30+
<plugins>
31+
<plugin>
32+
<groupId>org.jetbrains.kotlin</groupId>
33+
<artifactId>kotlin-maven-plugin</artifactId>
34+
<version>${kotlin.version}</version>
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.jetbrains.kotlin</groupId>
38+
<artifactId>kotlin-maven-allopen</artifactId>
39+
<version>${kotlin.version}</version>
40+
</dependency>
41+
</dependencies>
42+
<configuration>
43+
<jvmTarget>${java.version}</jvmTarget>
44+
</configuration>
45+
<executions>
46+
<execution>
47+
<id>compile</id>
48+
<phase>process-sources</phase>
49+
<goals>
50+
<goal>compile</goal>
51+
</goals>
52+
</execution>
53+
<execution>
54+
<id>test-compile</id>
55+
<phase>test-compile</phase>
56+
<goals>
57+
<goal>test-compile</goal>
58+
</goals>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
65+
66+
</project>

src/main/kotlin/ru/sokomishalov/jackson/dataformat/soap/SoapAddressingHeaders.kt renamed to jackson-datatype-soap-common/src/main/kotlin/ru/sokomishalov/jackson/datatype/soap/SoapAddressingHeaders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package ru.sokomishalov.jackson.dataformat.soap
16+
package ru.sokomishalov.jackson.datatype.soap
1717

1818
/**
1919
* @author sokomishalov

src/main/kotlin/ru/sokomishalov/jackson/dataformat/soap/SoapConstants.kt renamed to jackson-datatype-soap-common/src/main/kotlin/ru/sokomishalov/jackson/datatype/soap/SoapConstants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"HttpUrlsUsage"
1919
)
2020

21-
package ru.sokomishalov.jackson.dataformat.soap
21+
package ru.sokomishalov.jackson.datatype.soap
2222

2323
/**
2424
* @author sokomishalov

src/main/kotlin/ru/sokomishalov/jackson/dataformat/soap/SoapEnvelope.kt renamed to jackson-datatype-soap-common/src/main/kotlin/ru/sokomishalov/jackson/datatype/soap/SoapEnvelope.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
@file:Suppress("unused")
1717

18-
package ru.sokomishalov.jackson.dataformat.soap
18+
package ru.sokomishalov.jackson.datatype.soap
1919

2020
/**
2121
* @author sokomishalov

src/main/kotlin/ru/sokomishalov/jackson/dataformat/soap/SoapFault.kt renamed to jackson-datatype-soap-common/src/main/kotlin/ru/sokomishalov/jackson/datatype/soap/SoapFault.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package ru.sokomishalov.jackson.dataformat.soap
16+
package ru.sokomishalov.jackson.datatype.soap
1717

1818
/**
1919
* @author sokomishalov

src/main/kotlin/ru/sokomishalov/jackson/dataformat/soap/SoapMultipleHeaders.kt renamed to jackson-datatype-soap-common/src/main/kotlin/ru/sokomishalov/jackson/datatype/soap/SoapMultipleHeaders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package ru.sokomishalov.jackson.dataformat.soap
16+
package ru.sokomishalov.jackson.datatype.soap
1717

1818
/**
1919
* @author sokomishalov

0 commit comments

Comments
 (0)