Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
vegegoku committed Nov 27, 2023
2 parents a133ee4 + 5ad603c commit 8f85e27
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.gpg_private_key }}") | gpg --batch --import
- name: publish to snapshot
- name: publish
run: mvn --no-transfer-progress clean deploy -B -e -Dci=true -Dgpg.passphrase=${{ secrets.gpg_passphrase }}
env:
SONATYPE_USERNAME: ${{ secrets.nexus_username }}
Expand Down
33 changes: 25 additions & 8 deletions domino-jackson-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dominokit</groupId>
<artifactId>domino-jackson-parent</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
</parent>

<artifactId>domino-jackson-processor</artifactId>
Expand All @@ -18,26 +18,43 @@

<dependencyManagement>
<dependencies>
<!-- fix dependency conflicts between compile-testing and auto-service, auto-common -->
<!-- https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations -->
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.3.1</version>
<version>2.23.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
<version>32.1.3-jre</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<version>3.14.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.google.auto/auto-common -->
<dependency>
<groupId>com.google.auto</groupId>
<artifactId>auto-common</artifactId>
<version>0.11</version>
<version>1.2.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.truth/truth -->
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>1.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.35.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -46,7 +63,7 @@
<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-apt-commons</artifactId>
<version>1.0.3</version>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.gwtproject</groupId>
Expand Down Expand Up @@ -76,7 +93,7 @@
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<version>0.19</version>
<version>0.21.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion domino-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dominokit</groupId>
<artifactId>domino-jackson-parent</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
</parent>

<artifactId>domino-jackson</artifactId>
Expand Down
13 changes: 7 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.dominokit</groupId>
<artifactId>domino-jackson-parent</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>pom</packaging>

<name>domino-jackson-parent</name>
Expand Down Expand Up @@ -66,14 +66,12 @@

<properties>
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
<next.release.version>1.0.2</next.release.version>
<next.release.version>1.0.3</next.release.version>
<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>

<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>
Expand All @@ -85,6 +83,8 @@
<maven.license.plugin>3.0</maven.license.plugin>
<maven.surfire.plugin>3.0.0-M1</maven.surfire.plugin>
<maven.gwt.plugin>1.1.0</maven.gwt.plugin>

<jackson.version>2.16.0</jackson.version>
<elemental2.version>1.2.1</elemental2.version>
<gwt.i18n.version>1.0.2</gwt.i18n.version>
</properties>
Expand All @@ -98,12 +98,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- fix inconsistent versions in gwt-dev -->
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
<version>1.16.0</version>
</dependency>

<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
Expand Down

0 comments on commit 8f85e27

Please sign in to comment.