Skip to content

Commit

Permalink
refactor how we handle super source
Browse files Browse the repository at this point in the history
  • Loading branch information
vegegoku committed Nov 21, 2023
1 parent 5e74be5 commit cbe7a04
Show file tree
Hide file tree
Showing 33 changed files with 70 additions and 93 deletions.
41 changes: 23 additions & 18 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,41 @@ on:

jobs:
verify:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
java-version: [ 8, 11 ]
java-version: [ 11 ]
steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Java and Maven
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
- run: mvn verify
distribution: 'temurin'
- run: mvn verify -B -e

release:
needs: verify
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Check out Git repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install Java and Maven
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 1.8

- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
with:
gpg_private_key: ${{ secrets.gpg_private_key }}
gpg_passphrase: ${{ secrets.gpg_passphrase }}
nexus_username: ${{ secrets.nexus_username }}
nexus_password: ${{ secrets.nexus_password }}
maven_args: -Dci=true
java-version: 11
distribution: 'temurin'
server-id: ossrh
server-username: SONATYPE_USERNAME
server-password: SONATYPE_PASSWORD
- id: install-secret-key
name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.gpg_private_key }}") | gpg --batch --import
- name: publish to snapshot
run: mvn --no-transfer-progress clean deploy -B -e -Dci=true -Dgpg.passphrase=${{ secrets.gpg_passphrase }}
env:
SONATYPE_USERNAME: ${{ secrets.nexus_username }}
SONATYPE_PASSWORD: ${{ secrets.nexus_password }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

Domino-jackson
=====
Domino-jackson is an annotation processor based JSON mapper that works on both the client side - [GWT](http://www.gwtproject.org/) and [J2CL](https://github.com/google/j2cl) - and on JVM side based, the library is based on [gwt-jackson](https://github.com/nmorel/gwt-jackson) the original thanks goes to [Nicolas Morel](https://github.com/nmorel) for building gwt-jackson library.
[Domino-jackson](https://dominokit.com/solutions/domino-jackson/v1) is an annotation processor based JSON mapper that works on both the client side - [GWT](http://www.gwtproject.org/) and [J2CL](https://github.com/google/j2cl) - and on JVM side based, the library is based on [gwt-jackson](https://github.com/nmorel/gwt-jackson) the original thanks goes to [Nicolas Morel](https://github.com/nmorel) for building gwt-jackson library.

The library is future proofed and allows the user to use the same mapper to be used in a pure JVM environment such as Android or in the client side of the browser which enables easier testing and more code sharing between client and server.

Checkout the [Quick start guide](https://github.com/DominoKit/domino-jackson/wiki/Quick-start) and visit our [documentation](https://github.com/DominoKit/domino-jackson/wiki) in the wiki for more details.
Checkout the [Quick start guide](https://dominokit.com/solutions/domino-jackson/v1/docs/getting-started/quick-start) and visit our [documentation](https://dominokit.com/solutions/domino-jackson/v1/docs/getting-started) in the wiki for more details.



Expand Down
16 changes: 11 additions & 5 deletions domino-jackson-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,24 @@
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-jackson-super</artifactId>
<version>${project.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.dominokit</groupId>
Expand Down Expand Up @@ -101,6 +106,7 @@
<exclude>com.google.code.findbugs:jsr305</exclude>
<exclude>com.google.j2objc:j2objc-annotations</exclude>
<exclude>com.google.errorprone:error_prone_annotations</exclude>
<exclude>com.fasterxml.jackson.core:*</exclude>
</excludes>
</artifactSet>
<relocations>
Expand Down
49 changes: 0 additions & 49 deletions domino-jackson-super/pom.xml

This file was deleted.

14 changes: 6 additions & 8 deletions domino-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<scope>test</scope>
</dependency>
Expand All @@ -38,14 +38,12 @@
</dependency>

<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-jackson-super</artifactId>
<version>${project.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.dominokit.i18n</groupId>
<artifactId>gwt-cldr</artifactId>
<version>1.0</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.dominokit.i18n</groupId>
Expand Down
39 changes: 28 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,19 @@
<modules>
<module>domino-jackson</module>
<module>domino-jackson-processor</module>
<module>domino-jackson-super</module>
</modules>

<properties>
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
<next.release.version>1.0.2</next.release.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.plugin>3.8.1</maven.compiler.plugin>
<jackson.version>2.16.0</jackson.version>

<maven.compiler.plugin>3.11.0</maven.compiler.plugin>
<maven.source.plugin>3.0.1</maven.source.plugin>
<maven.javadoc.plugin>2.10.4</maven.javadoc.plugin>
<maven.gpg.plugin>1.6</maven.gpg.plugin>
Expand All @@ -85,15 +86,15 @@
<maven.surfire.plugin>3.0.0-M1</maven.surfire.plugin>
<maven.gwt.plugin>1.1.0</maven.gwt.plugin>
<elemental2.version>1.2.1</elemental2.version>
<gwt.i18n.version>1.0.1</gwt.i18n.version>
<gwt.i18n.version>1.0.2</gwt.i18n.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt</artifactId>
<version>2.9.0</version>
<version>2.10.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -113,7 +114,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>com.google.elemental2</groupId>
Expand All @@ -125,6 +126,23 @@
<artifactId>elemental2-dom</artifactId>
<version>${elemental2.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -135,8 +153,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<release>11</release>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -319,7 +336,7 @@
<plugin>
<groupId>net.ltgt.gwt.maven</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
<extensions>true</extensions>
<configuration>
<!--Only required due to a GWT DateTimeFormat issue see https://github.com/gwtproject/gwt/issues/8259-->
Expand Down

0 comments on commit cbe7a04

Please sign in to comment.