Skip to content

Commit

Permalink
[maven-release-plugin] prepare for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Dec 18, 2024
1 parent 0c98ffd commit 1634144
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<groupId>com.vegardit.maven</groupId>
<artifactId>vegardit-maven-parent</artifactId>
<version>6.1.5</version>
<version>6.1.6-SNAPSHOT</version>
<packaging>pom</packaging>


Expand Down Expand Up @@ -53,7 +53,7 @@
<url>https://github.com/vegardit/vegardit-maven-parent</url>
<connection>scm:git:https://github.com/vegardit/vegardit-maven-parent.git</connection>
<developerConnection>scm:git:https://github.com/vegardit/vegardit-maven-parent.git</developerConnection>
<tag>6.1.5</tag>
<tag>HEAD</tag>
</scm>


Expand Down Expand Up @@ -89,7 +89,7 @@
Use the Maven Build Timestamp as modification timestamp for all entries in the produced JAR file.
See https://maven.apache.org/guides/mini/guide-reproducible-builds.html
-->
<project.build.outputTimestamp>2024-12-18T21:40:04Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-12-18T21:40:34Z</project.build.outputTimestamp>

<java.version>17</java.version>
<java.vendor>default</java.vendor>
Expand Down Expand Up @@ -291,8 +291,7 @@
*/
def javaVersion = getProjectProp("java.version");
def javaMajorVersion = Integer.parseInt(javaVersion.indexOf(".") > -1 ? javaVersion.substring(0, javaVersion.indexOf(".")) : javaVersion);
def ecjVersion = javaMajorVersion < 17 ? "3.33.0" : project.properties["eclipse-java-compiler.version"]; def ecjArtifactMeta = artifactFactory.createArtifactWithClassifier("org.eclipse.jdt", "ecj", ecjVersion, "jar", null);
def ecjArtifact = artifactResolver.resolve(new org.apache.maven.artifact.resolver.ArtifactResolutionRequest()
def ecjVersion = javaMajorVersion < 17 ? "3.33.0" : project.properties["eclipse-java-compiler.version"]; def ecjArtifactMeta = artifactFactory.createArtifactWithClassifier("org.eclipse.jdt", "ecj", ecjVersion, "jar", null); def ecjArtifact = artifactResolver.resolve(new org.apache.maven.artifact.resolver.ArtifactResolutionRequest()
.setArtifact(ecjArtifactMeta)
.setLocalRepository(session.localRepository)
.setRemoteRepositories(project.remoteArtifactRepositories)
Expand Down
2 changes: 1 addition & 1 deletion src/test/project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.vegardit.maven</groupId>
<artifactId>vegardit-maven-parent</artifactId>
<version>6.1.5</version>
<version>6.1.6-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 1634144

Please sign in to comment.