Skip to content

Commit afed9fe

Browse files
ake2lake2l
authored
Merge pull request #5 from rapiddweller/checkstyle_update
(style, dependencies)
2 parents fc6558c + 64aacda commit afed9fe

File tree

101 files changed

+13211
-9163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+13211
-9163
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Release 1.1.2-jdk-11
2+
3+
## Release Highlights
4+
5+
* introduce checkstyle
6+
* update dependencies (junit, log4j, rd-lib-common)
7+
8+

‎checkstyle.xml‎

Lines changed: 337 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.rapiddweller</groupId>
66
<artifactId>rd-lib-script</artifactId>
7-
<version>1.1.2-jdk-11-SNAPSHOT</version>
7+
<version>1.1.3-jdk-11-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>rapiddweller Script</name>
1010
<description>'rapiddweller Script' is an open source software library for resolving Java-like script expressions,
@@ -14,23 +14,21 @@
1414
<inceptionYear>2011</inceptionYear>
1515

1616
<properties>
17-
<_rd_common_version>1.1.1-jdk-11</_rd_common_version>
17+
<maven.compiler.source>11</maven.compiler.source>
18+
<maven.compiler.target>11</maven.compiler.target>
19+
<_rd_common_version>1.1.2-jdk-11</_rd_common_version>
1820
<buildnumber-maven-plugin.version>1.0</buildnumber-maven-plugin.version>
1921
<dependency_antlr-runtime.version>3.3</dependency_antlr-runtime.version>
20-
<dependency_junit.version>4.13.1</dependency_junit.version>
21-
<dependency_log4j-api.version>2.14.0</dependency_log4j-api.version>
22-
<dependency_log4j-core.version>2.14.0</dependency_log4j-core.version>
22+
<dependency_junit.version>4.13.2</dependency_junit.version>
23+
<dependency_log4j-api.version>2.14.1</dependency_log4j-api.version>
24+
<dependency_log4j-core.version>2.14.1</dependency_log4j-core.version>
2325
<dependency_poi.version>5.0.0</dependency_poi.version>
24-
<java_source_version>11</java_source_version>
25-
<java_target_version>11</java_target_version>
2626
<plugin_jacoco-maven-plugin.version>0.8.6</plugin_jacoco-maven-plugin.version>
2727
<plugin_maven-assembly-plugin.version>3.3.0</plugin_maven-assembly-plugin.version>
2828
<plugin_maven-compiler-plugin.version>3.8.1</plugin_maven-compiler-plugin.version>
2929
<plugin_maven-gpg-plugin.version>1.6</plugin_maven-gpg-plugin.version>
3030
<plugin_maven-jar-plugin.version>2.5</plugin_maven-jar-plugin.version>
3131
<plugin_maven-javadoc-plugin.version>3.2.0</plugin_maven-javadoc-plugin.version>
32-
<plugin_maven-jxr-plugin.version>3.0.0</plugin_maven-jxr-plugin.version>
33-
<plugin_maven-pmd-plugin.version>3.14.0</plugin_maven-pmd-plugin.version>
3432
<plugin_maven-project-info-reports-plugin.version>3.1.1</plugin_maven-project-info-reports-plugin.version>
3533
<plugin_maven-resources-plugin.version>2.6</plugin_maven-resources-plugin.version>
3634
<plugin_maven-site-plugin.version>3.9.1</plugin_maven-site-plugin.version>
@@ -222,8 +220,8 @@
222220
<artifactId>maven-compiler-plugin</artifactId>
223221
<version>${plugin_maven-compiler-plugin.version}</version>
224222
<configuration>
225-
<source>${java_source_version}</source>
226-
<target>${java_target_version}</target>
223+
<source>${maven.compiler.source}</source>
224+
<target>${maven.compiler.target}</target>
227225
</configuration>
228226
</plugin>
229227
<plugin>
@@ -232,7 +230,7 @@
232230
<version>${plugin_maven-javadoc-plugin.version}</version>
233231
<configuration>
234232
<doclint>none</doclint>
235-
<source>${java_source_version}</source>
233+
<source>${maven.compiler.source}</source>
236234
<detectJavaApiLink>false</detectJavaApiLink>
237235
</configuration>
238236
<executions>
@@ -353,23 +351,13 @@
353351
<artifactId>maven-surefire-report-plugin</artifactId>
354352
<version>${plugin_maven-surefire-report-plugin.version}</version>
355353
</plugin>
356-
<plugin>
357-
<groupId>org.apache.maven.plugins</groupId>
358-
<artifactId>maven-pmd-plugin</artifactId>
359-
<version>${plugin_maven-pmd-plugin.version}</version>
360-
</plugin>
361-
<plugin>
362-
<groupId>org.apache.maven.plugins</groupId>
363-
<artifactId>maven-jxr-plugin</artifactId>
364-
<version>${plugin_maven-jxr-plugin.version}</version>
365-
</plugin>
366354
<plugin>
367355
<groupId>org.apache.maven.plugins</groupId>
368356
<artifactId>maven-javadoc-plugin</artifactId>
369357
<version>${plugin_maven-javadoc-plugin.version}</version>
370358
<configuration>
371359
<doclint>none</doclint>
372-
<source>${java_source_version}</source>
360+
<source>${maven.compiler.source}</source>
373361
<detectJavaApiLink>false</detectJavaApiLink>
374362
</configuration>
375363
</plugin>

‎releasenotes/releasenotes-0.7.3.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
release notes DatabeneScript 0.7.3
2-
----------------------------------
3-
4-
Summary
5-
-------
1+
release notes DatabeneScript 0.7.3
2+
----------------------------------
3+
4+
Summary
5+
-------
66
First release after spin-off from Benerator project

‎releasenotes/releasenotes-0.7.7.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
release notes DatabeneScript 0.7.7
2-
----------------------------------
3-
4-
Changes
5-
-------
6-
- Using newer libraries
7-
- slf4j 1.6.4
8-
- log4j 1.2.16
9-
- junit 4.10
1+
release notes DatabeneScript 0.7.7
2+
----------------------------------
3+
4+
Changes
5+
-------
6+
- Using newer libraries
7+
- slf4j 1.6.4
8+
- log4j 1.2.16
9+
- junit 4.10
1010
- databene commons 0.5.16

‎src/main/assembly/dist-assembly.xml‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
<assembly>
2-
<id>dist</id>
3-
<formats>
4-
<format>zip</format>
5-
<format>tar.gz</format>
6-
</formats>
7-
<includeBaseDirectory>true</includeBaseDirectory>
8-
<fileSets>
9-
<!-- license files and release notes -->
10-
<fileSet>
11-
<directory></directory>
12-
<outputDirectory>/</outputDirectory>
13-
<includes>
14-
<include>LICENSE.TXT</include>
15-
</includes>
16-
</fileSet>
17-
<fileSet>
18-
<directory>releasenotes</directory>
19-
<outputDirectory>releasenotes</outputDirectory>
20-
<includes>
21-
<include>releasenotes*.txt</include>
22-
</includes>
23-
</fileSet>
24-
<!-- doc -->
25-
<fileSet>
26-
<directory>target/site/apidocs</directory>
27-
<outputDirectory>doc/api</outputDirectory>
28-
<excludes>
29-
<exclude>__MACOSX</exclude>
30-
</excludes>
31-
</fileSet>
32-
<!-- main -->
33-
<fileSet>
34-
<directory>src/main/java</directory>
35-
<outputDirectory>src</outputDirectory>
36-
<excludes>
37-
<exclude>__MACOSX</exclude>
38-
</excludes>
39-
</fileSet>
40-
<fileSet>
41-
<directory>src/main/resources</directory>
42-
<outputDirectory>src</outputDirectory>
43-
<excludes>
44-
<exclude>__MACOSX</exclude>
45-
</excludes>
46-
</fileSet>
47-
<!-- test -->
48-
<fileSet>
49-
<directory>src/test/java</directory>
50-
<outputDirectory>test</outputDirectory>
51-
<excludes>
52-
<exclude>__MACOSX</exclude>
53-
</excludes>
54-
</fileSet>
55-
<fileSet>
56-
<directory>src/test/resources</directory>
57-
<outputDirectory>test</outputDirectory>
58-
<excludes>
59-
<exclude>__MACOSX</exclude>
60-
</excludes>
61-
</fileSet>
62-
<fileSet>
63-
<directory>target</directory>
64-
<outputDirectory>lib</outputDirectory>
65-
<includes>
66-
<include>*.jar</include>
67-
</includes>
68-
<excludes>
69-
<exclude>*-sources.jar</exclude>
70-
</excludes>
71-
</fileSet>
72-
</fileSets>
73-
74-
<dependencySets>
75-
<dependencySet>
76-
<useProjectArtifact>false</useProjectArtifact>
77-
<outputDirectory>lib</outputDirectory>
78-
<unpack>false</unpack>
79-
</dependencySet>
80-
</dependencySets>
1+
<assembly>
2+
<id>dist</id>
3+
<formats>
4+
<format>zip</format>
5+
<format>tar.gz</format>
6+
</formats>
7+
<includeBaseDirectory>true</includeBaseDirectory>
8+
<fileSets>
9+
<!-- license files and release notes -->
10+
<fileSet>
11+
<directory></directory>
12+
<outputDirectory>/</outputDirectory>
13+
<includes>
14+
<include>LICENSE.TXT</include>
15+
</includes>
16+
</fileSet>
17+
<fileSet>
18+
<directory>releasenotes</directory>
19+
<outputDirectory>releasenotes</outputDirectory>
20+
<includes>
21+
<include>releasenotes*.txt</include>
22+
</includes>
23+
</fileSet>
24+
<!-- doc -->
25+
<fileSet>
26+
<directory>target/site/apidocs</directory>
27+
<outputDirectory>doc/api</outputDirectory>
28+
<excludes>
29+
<exclude>__MACOSX</exclude>
30+
</excludes>
31+
</fileSet>
32+
<!-- main -->
33+
<fileSet>
34+
<directory>src/main/java</directory>
35+
<outputDirectory>src</outputDirectory>
36+
<excludes>
37+
<exclude>__MACOSX</exclude>
38+
</excludes>
39+
</fileSet>
40+
<fileSet>
41+
<directory>src/main/resources</directory>
42+
<outputDirectory>src</outputDirectory>
43+
<excludes>
44+
<exclude>__MACOSX</exclude>
45+
</excludes>
46+
</fileSet>
47+
<!-- test -->
48+
<fileSet>
49+
<directory>src/test/java</directory>
50+
<outputDirectory>test</outputDirectory>
51+
<excludes>
52+
<exclude>__MACOSX</exclude>
53+
</excludes>
54+
</fileSet>
55+
<fileSet>
56+
<directory>src/test/resources</directory>
57+
<outputDirectory>test</outputDirectory>
58+
<excludes>
59+
<exclude>__MACOSX</exclude>
60+
</excludes>
61+
</fileSet>
62+
<fileSet>
63+
<directory>target</directory>
64+
<outputDirectory>lib</outputDirectory>
65+
<includes>
66+
<include>*.jar</include>
67+
</includes>
68+
<excludes>
69+
<exclude>*-sources.jar</exclude>
70+
</excludes>
71+
</fileSet>
72+
</fileSets>
73+
74+
<dependencySets>
75+
<dependencySet>
76+
<useProjectArtifact>false</useProjectArtifact>
77+
<outputDirectory>lib</outputDirectory>
78+
<unpack>false</unpack>
79+
</dependencySet>
80+
</dependencySets>
8181
</assembly>

‎src/main/java/com/rapiddweller/script/Assignment.java‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,53 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15+
1516
package com.rapiddweller.script;
1617

1718
/**
1819
* Represents an assignment of an expression (result) to a target name.<br/><br/>
1920
* Created at 08.10.2009 19:06:08
20-
* @since 0.6.0
21+
*
2122
* @author Volker Bergmann
23+
* @since 0.6.0
2224
*/
23-
2425
public class Assignment {
25-
26-
private final String name;
27-
private final Expression<?> expression;
28-
29-
public Assignment(String name, Expression<?> expression) {
30-
this.name = name;
31-
this.expression = expression;
32-
}
33-
34-
public String getName() {
35-
return name;
36-
}
37-
38-
public Expression<?> getExpression() {
39-
return expression;
40-
}
41-
42-
@Override
43-
public String toString() {
44-
return name + "=" + expression;
45-
}
46-
26+
27+
private final String name;
28+
private final Expression<?> expression;
29+
30+
/**
31+
* Instantiates a new Assignment.
32+
*
33+
* @param name the name
34+
* @param expression the expression
35+
*/
36+
public Assignment(String name, Expression<?> expression) {
37+
this.name = name;
38+
this.expression = expression;
39+
}
40+
41+
/**
42+
* Gets name.
43+
*
44+
* @return the name
45+
*/
46+
public String getName() {
47+
return name;
48+
}
49+
50+
/**
51+
* Gets expression.
52+
*
53+
* @return the expression
54+
*/
55+
public Expression<?> getExpression() {
56+
return expression;
57+
}
58+
59+
@Override
60+
public String toString() {
61+
return name + "=" + expression;
62+
}
63+
4764
}

0 commit comments

Comments
 (0)