Skip to content

Commit

Permalink
prepare release 4.9.1
Browse files Browse the repository at this point in the history
Signed-off-by: David Bernard <[email protected]>
  • Loading branch information
davidB committed Feb 25, 2024
1 parent 13a45d0 commit 0393319
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
6 changes: 4 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<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">
<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>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.9.1-SNAPSHOT</version>
<version>4.9.1</version>
<packaging>maven-plugin</packaging>

<name>scala-maven-plugin</name>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/sbt_inc/CompilerBridgeFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ private static File getScala2CompilerBridgeJar(
resolver.getJar(SBT_GROUP_ID, bridgeArtifactId, zincVersion, "sources").getFile();

Set<Path> bridgeSourcesDependencies =
resolver.getJarAndDependencies(SBT_GROUP_ID, bridgeArtifactId, zincVersion, "sources")
resolver
.getJarAndDependencies(SBT_GROUP_ID, bridgeArtifactId, zincVersion, "sources")
.stream()
.filter(
artifact ->
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/scala_maven/ScalaMojoSupport.java
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,9 @@ private void checkArtifactForScalaVersion(Context scalaContext, DependencyNode r
}
}

/** @return A filter to only extract artifacts deployed from scala distributions */
/**
* @return A filter to only extract artifacts deployed from scala distributions
*/
private DependencyNodeFilter createScalaDistroDependencyFilter() throws Exception {
List<DependencyNodeFilter> filters = new ArrayList<>();
filters.add(new ScalaDistroArtifactFilter(findScalaContext()));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/scala_maven/ScalaSourceMojoSupport.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
import scala_maven_executions.MainHelper;
import util.FileUtils;

/** @author david.bernard */
/**
* @author david.bernard
*/
public abstract class ScalaSourceMojoSupport extends ScalaMojoSupport {

/** Enables/Disables sending java source to the scala compiler. */
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/scala_maven_executions/MainWithArgsInFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
*/
public class MainWithArgsInFile {

/** @param args */
/**
* @param args
*/
public static void main(String[] args) {
try {
String mainClassName = args[0];
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/scala_maven/MiscTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import org.codehaus.plexus.util.StringUtils;
import org.junit.Test;

/** @author david bernard */
/**
* @author david bernard
*/
public class MiscTest {

// TODO not use String.split, it is not consistent across jdk version
Expand Down

0 comments on commit 0393319

Please sign in to comment.