Skip to content

Commit 6875868

Browse files
committed
Merge branch 'auxclasspath' into master
Support build-command and auxclasspath-command #72
2 parents 8ad3d58 + bf102f1 commit 6875868

27 files changed

+468
-78
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ Gemfile.lock
66
.bundle
77
target/
88
vendor/
9+
localtests/

.hoerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
exclude: !ruby/regexp /tmp$|\.(git|idea)\/|\.project|target|test\/|Gemfile\.lock|\.bundle\/|install-jdk.sh|vendor\/cache/
1+
exclude: !ruby/regexp /tmp$|\.(git|idea)\/|\.project|target|test\/|Gemfile\.lock|\.bundle\/|install-jdk.sh|vendor\/cache|localtests/

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
inherit_from: .rubocop_todo.yml
22

33
AllCops:
4-
TargetRubyVersion: 2.4
4+
TargetRubyVersion: 2.7
55
Include:
66
- 'lib/**/*'
77
- 'test/**/*'

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ before_install:
44
- TARGET_DIR=${HOME}/openjdk11
55
- mkdir -p ${LOCAL_DIR}
66
- mkdir -p ${TARGET_DIR}
7-
- DOWNLOAD_URL="https://pmd-code.org/openjdk/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz"
7+
- DOWNLOAD_URL="https://pmd-code.org/openjdk/latest/jdk-11-linux64.tar.gz"
88
- OPENJDK_ARCHIVE=$(basename $DOWNLOAD_URL)
99
- if [ ! -e ${LOCAL_DIR}/${OPENJDK_ARCHIVE} ]; then wget --directory-prefix ${LOCAL_DIR} --timestamping --continue ${DOWNLOAD_URL}; fi
1010
- tar --extract --file ${LOCAL_DIR}/${OPENJDK_ARCHIVE} -C ${TARGET_DIR} --strip-components=1

History.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22

33
## New and Noteworthy
44

5+
At least ruby 2.7 is required.
6+
7+
Typeresolution is now supported by two new tags in the project-list.xml file:
8+
`build-command` and `auxclasspath-command`. For details, see pull request [#72](https://github.com/pmd/pmd-regression-tester/pull/72).
9+
510
## Fixed Issues
611

12+
* [#48](https://github.com/pmd/pmd-regression-tester/issues/48): Support auxclasspath / typeresolution
713
* [#67](https://github.com/pmd/pmd-regression-tester/pull/67): Report contains errors having nil filename
814
* [#68](https://github.com/pmd/pmd-regression-tester/pull/68): Don't generate a dynamic ruleset if not needed
915
* [#69](https://github.com/pmd/pmd-regression-tester/pull/69): Detect single rules with auto-gen-config

Manifest.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.hoerc
44
.rubocop.yml
55
.rubocop_todo.yml
6+
.ruby-version
67
.travis.yml
78
Gemfile
89
History.md
@@ -15,6 +16,7 @@ config/all-java.xml
1516
config/design.xml
1617
config/project-list.xml
1718
config/projectlist_1_0_0.xsd
19+
config/projectlist_1_1_0.xsd
1820
lib/pmdtester.rb
1921
lib/pmdtester/builders/diff_builder.rb
2022
lib/pmdtester/builders/diff_report/configerrors.rb
@@ -23,6 +25,7 @@ lib/pmdtester/builders/diff_report/violations.rb
2325
lib/pmdtester/builders/diff_report_builder.rb
2426
lib/pmdtester/builders/html_report_builder.rb
2527
lib/pmdtester/builders/pmd_report_builder.rb
28+
lib/pmdtester/builders/project_builder.rb
2629
lib/pmdtester/builders/rule_set_builder.rb
2730
lib/pmdtester/builders/simple_progress_logger.rb
2831
lib/pmdtester/builders/summary_report/branch_name_row.rb

README.rdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ The tool creates the following folders:
9191

9292
== REQUIREMENTS:
9393

94-
* Ruby 2.4.1 or higher
94+
* Ruby 2.7 or higher
9595

9696
=== Runtime dependency
9797

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ hoe = Hoe.spec 'pmdtester' do
3030
['test-unit', '~> 3.2'],
3131
['rdoc', ['>= 4.0', '< 7']]
3232
]
33-
spec_extras[:required_ruby_version] = '>= 2.2'
33+
spec_extras[:required_ruby_version] = '>= 2.7'
3434

3535
license 'BSD-2-Clause'
3636
end

config/projectlist_1_0_0.xsd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" ?>
2+
<!-- version 1.0.0 -->
23
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
34
<xs:element name="projectlist">
45
<xs:complexType>
@@ -25,4 +26,4 @@
2526
<xs:element name="exclude-pattern" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
2627
</xs:sequence>
2728
</xs:complexType>
28-
</xs:schema>
29+
</xs:schema>

0 commit comments

Comments
 (0)