Skip to content

[pull] master from java-diff-utils:master #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 17 commits into from
Nov 24, 2024
Merged

[pull] master from java-diff-utils:master #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ace11bc
[maven-release-plugin] prepare release java-diff-utils-parent-4.13
wumpz Nov 23, 2024
0f7c32b
[maven-release-plugin] prepare for next development iteration
wumpz Nov 23, 2024
dad4315
[maven-release-plugin] rollback the release of java-diff-utils-parent…
wumpz Nov 23, 2024
52e61d6
upgraded some plugins and dependencies
wumpz Nov 23, 2024
23c80bc
[maven-release-plugin] prepare release java-diff-utils-parent-4.13
wumpz Nov 23, 2024
94aafa7
[maven-release-plugin] prepare for next development iteration
wumpz Nov 23, 2024
509d507
added missing sources plugin
wumpz Nov 23, 2024
1fdcf13
added missing sources plugin
wumpz Nov 23, 2024
1560c22
[maven-release-plugin] prepare release java-diff-utils-parent-4.14
wumpz Nov 23, 2024
b7c1aae
[maven-release-plugin] prepare for next development iteration
wumpz Nov 23, 2024
5245ee8
[maven-release-plugin] rollback the release of java-diff-utils-parent…
wumpz Nov 23, 2024
0307c80
downgraded plugins again, certificate problems for java 8
wumpz Nov 23, 2024
1d8148a
[maven-release-plugin] prepare release java-diff-utils-parent-4.14
wumpz Nov 23, 2024
af9d84c
[maven-release-plugin] prepare for next development iteration
wumpz Nov 23, 2024
71981d8
[maven-release-plugin] prepare release java-diff-utils-parent-4.15
wumpz Nov 23, 2024
4b33676
[maven-release-plugin] prepare for next development iteration
wumpz Nov 23, 2024
0f8365b
Update README.md
wumpz Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Just add the code below to your maven dependencies:
<dependency>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils</artifactId>
<version>4.12</version>
<version>4.15</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils-jgit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils-parent</artifactId>
<version>4.13-SNAPSHOT</version>
<version>4.16-SNAPSHOT</version>
</parent>
<artifactId>java-diff-utils-jgit</artifactId>
<name>java-diff-utils-jgit</name>
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils-parent</artifactId>
<version>4.13-SNAPSHOT</version>
<version>4.16-SNAPSHOT</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils-parent</artifactId>
<version>4.13-SNAPSHOT</version>
<version>4.16-SNAPSHOT</version>
<name>java-diff-utils-parent</name>
<packaging>pom</packaging>
<modules>
Expand Down Expand Up @@ -81,11 +81,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<version>2.5.3</version>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<mavenExecutorId>forked-path</mavenExecutorId>
<releaseProfiles>sign-release-artifacts</releaseProfiles>
</configuration>
</plugin>
<plugin>
Expand All @@ -105,7 +106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.1</version>
<version>3.1.1</version>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
<doclint>none</doclint>
Expand Down Expand Up @@ -199,7 +200,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.7</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Loading