Skip to content

Commit d13ce93

Browse files
authored
Merge pull request #2 from rapiddweller/release-prep
build(adjust): adjustments for version 3.0.0
2 parents 1aafe2f + 7452217 commit d13ce93

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.rapiddweller</groupId>
77
<artifactId>benerator-maven-plugin</artifactId>
8-
<version>2.0.0-jdk-11</version>
8+
<version>3.0.0-jdk-11</version>
99
<packaging>maven-plugin</packaging>
1010

1111
<name>rapiddweller-benerator maven plugin</name>
@@ -15,11 +15,11 @@
1515
</description>
1616

1717
<properties>
18-
<benerator_version>${project.version}</benerator_version>
18+
<benerator_version>3.0.0-jdk-11</benerator_version>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<maven.compiler.source>11</maven.compiler.source>
2121
<maven.compiler.target>11</maven.compiler.target>
22-
<dependency_graalvm.version>21.1.0</dependency_graalvm.version>
22+
<dependency_graalvm.version>22.2.0</dependency_graalvm.version>
2323
<plugin_maven-plugin-plugin.version>3.6.1</plugin_maven-plugin-plugin.version>
2424
<plugin_maven-project-info-reports-plugin.version>2.9</plugin_maven-project-info-reports-plugin.version>
2525
<plugin_maven-site-plugin.version>3.7</plugin_maven-site-plugin.version>

src/main/java/com/rapiddweller/benerator/maven/AbstractBeneratorMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public abstract class AbstractBeneratorMojo extends AbstractMojo {
5656
*
5757
* @parameter property="file.encoding"
5858
*/
59-
protected String encoding;
59+
protected String encoding ="UTF-8";
6060

6161
/**
6262
* The scope of which dependencies should be resolved.

src/main/java/com/rapiddweller/benerator/maven/AssemblyMojo.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,14 @@ private void createClasspathFile(File assemblyDir) throws IOException {
7373
}
7474
}
7575

76-
private void copyBeneratorInstallation(File assemblyDir) throws IOException {
76+
private void copyBeneratorInstallation(File assemblyDir) {
7777
String beneratorHome = System.getenv("BENERATOR_HOME");
7878
if (StringUtil.isEmpty(beneratorHome)) {
7979
getLog().error("BENERATOR_HOME not defined");
8080
return;
8181
}
82-
try {
83-
File installationDir = new File(beneratorHome);
84-
FileUtil.copy(installationDir, assemblyDir, true);
85-
} catch (FileNotFoundException e) {
86-
getLog().error("benerator installation not found at BENERATOR_HOME: " + beneratorHome + ". " +
87-
"Copying dependencies without benerator files", e);
88-
} catch (IOException e) {
89-
throw e;
90-
}
82+
File installationDir = new File(beneratorHome);
83+
FileUtil.copy(installationDir, assemblyDir, true);
9184
}
9285

9386
private void copyDependencies(File assemblyDir)

src/main/java/com/rapiddweller/benerator/maven/BeneratorMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void execute() throws MojoExecutionException {
107107
setupClasspath();
108108
try {
109109
Benerator.main(new String[] {descriptor.getAbsolutePath()});
110-
} catch (IOException e) {
110+
} catch (Exception e) {
111111
throw new MojoExecutionException("Error in generation", e);
112112
}
113113
}

0 commit comments

Comments
 (0)