Skip to content

Commit

Permalink
split into two artifacts - jakarta and jaxb #70
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikhael Sokolov committed Jan 31, 2024
1 parent 62afc32 commit 8a1bfe0
Show file tree
Hide file tree
Showing 45 changed files with 1,510 additions and 153 deletions.
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup JDK
uses: actions/setup-java@v2
with:
java-version: 21
distribution: zulu
- name: Setup Maven
uses: stCarolas/setup-maven@v4.2
- name: Setup Maven caching
uses: actions/cache@v2
with:
path: ~/.m2/**
key: maven_deps
- name: Build and test
run: mvn clean test
48 changes: 24 additions & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
# Changelog

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

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

**Closed issues:**

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

**Merged pull requests:**

- fix \#36 [\#40](https://github.com/sokomishalov/jackson-dataformat-soap/pull/40) ([sokomishalov](https://github.com/sokomishalov))
- Fix \#37 [\#39](https://github.com/sokomishalov/jackson-dataformat-soap/pull/39) ([sokomishalov](https://github.com/sokomishalov))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- fix \#36 [\#40](https://github.com/sokomishalov/jackson-datatype-soap/pull/40) ([sokomishalov](https://github.com/sokomishalov))
- Fix \#37 [\#39](https://github.com/sokomishalov/jackson-datatype-soap/pull/39) ([sokomishalov](https://github.com/sokomishalov))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))

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

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

**Merged pull requests:**

- remove collection setters [\#8](https://github.com/sokomishalov/jackson-dataformat-soap/pull/8) ([sokomishalov](https://github.com/sokomishalov))
- 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))
- remove collection setters [\#8](https://github.com/sokomishalov/jackson-datatype-soap/pull/8) ([sokomishalov](https://github.com/sokomishalov))
- 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))

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

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

**Merged pull requests:**

- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))
- 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))



Expand Down
24 changes: 18 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
jackson-dataformat-soap
jackson-datatype-soap
========
~~Here should be some fancy logo~~

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

## Overview

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

```xml

<!-- Legacy (JAXB) artifact -->
<dependency>
<groupId>ru.sokomishalov.jackson</groupId>
<artifactId>jackson-datatype-soap-jaxb</artifactId>
<version>x.y.z</version>
</dependency>
```
```xml
<!-- New (Jakarta) artifact -->
<dependency>
<groupId>ru.sokomishalov.jackson</groupId>
<artifactId>jackson-dataformat-soap</artifactId>
<artifactId>jackson-datatype-soap-jakarta</artifactId>
<version>x.y.z</version>
</dependency>
```

Gradle kotlin dsl:

```kotlin
implementation("ru.sokomishalov.jackson:jackson-dataformat-soap:x.y.z")
// Legacy (JAXB) artifact
implementation("ru.sokomishalov.jackson:jackson-datatype-soap-jaxb:x.y.z")
// New (Jakarta) artifact
implementation("ru.sokomishalov.jackson:jackson-datatype-soap-jakarta:x.y.z")
```

## Usage
Expand Down
66 changes: 66 additions & 0 deletions jackson-datatype-soap-common/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>ru.sokomishalov.jackson</groupId>
<artifactId>jackson-datatype-soap-parent</artifactId>
<version>${revision}</version>
</parent>

<artifactId>jackson-datatype-soap-common</artifactId>
<version>${revision}</version>

<dependencies>
<!-- COMPILE -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
</dependencies>

<build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-allopen</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
<configuration>
<jvmTarget>${java.version}</jvmTarget>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ru.sokomishalov.jackson.dataformat.soap
package ru.sokomishalov.jackson.datatype.soap

/**
* @author sokomishalov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"HttpUrlsUsage"
)

package ru.sokomishalov.jackson.dataformat.soap
package ru.sokomishalov.jackson.datatype.soap

/**
* @author sokomishalov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
@file:Suppress("unused")

package ru.sokomishalov.jackson.dataformat.soap
package ru.sokomishalov.jackson.datatype.soap

/**
* @author sokomishalov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ru.sokomishalov.jackson.dataformat.soap
package ru.sokomishalov.jackson.datatype.soap

/**
* @author sokomishalov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ru.sokomishalov.jackson.dataformat.soap
package ru.sokomishalov.jackson.datatype.soap

/**
* @author sokomishalov
Expand Down
Loading

0 comments on commit 8a1bfe0

Please sign in to comment.