Skip to content

Commit

Permalink
Updated asm5 usages in various configuration files.
Browse files Browse the repository at this point in the history
  • Loading branch information
igr committed Dec 2, 2017
1 parent c2e11a0 commit 196115c
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .codacy.yml
@@ -1,4 +1,4 @@
exclude_paths:
- '**/src/test/**'
- '**/asm5/**'
- '**/asm6/**'
- '**/*.py'
2 changes: 1 addition & 1 deletion ACKNOWLEDGEMENTS.md
Expand Up @@ -4,7 +4,7 @@

Jodd is bundled with the following 3rd party sources:

+ [ASM5 v5.2](http://asm.ow2.org), BSD license
+ [ASM5 v6.0](http://asm.ow2.org), BSD license
+ [BCrypt v0.4](http://www.mindrot.org/projects/jBCrypt/), ISC/BSD licence
+ [NanoHTTPD v1.25](https://github.com/NanoHttpd/nanohttpd), BSD license

Expand Down
2 changes: 1 addition & 1 deletion CODE_COVERAGE.md
Expand Up @@ -38,4 +38,4 @@ For example:
./gradlew :jodd-core:codeCoverage
open jodd-core/build/reports/jacoco/index.html

_NOTE_: Package `jodd.asm5` is _excluded_ from code coverage, but still reported locally.
_NOTE_: Package `jodd.asm6` is _excluded_ from code coverage, but still reported locally.
8 changes: 4 additions & 4 deletions build.gradle
Expand Up @@ -313,8 +313,8 @@ configure(javaModules()) {
applyTo testUnit
applyTo testIntegration
}
testUnit.extensions.getByName("jacoco").excludes = ['*Test*', '*.?', '*Foo*', 'jodd.asm5.*', '*.fixtures.*']
testIntegration.extensions.getByName("jacoco").excludes = ['*Test*', '*.?', '*Foo*', 'jodd.asm5.*', '*.fixtures.*']
testUnit.extensions.getByName("jacoco").excludes = ['*Test*', '*.?', '*Foo*', 'jodd.asm6.*', '*.fixtures.*']
testIntegration.extensions.getByName("jacoco").excludes = ['*Test*', '*.?', '*Foo*', 'jodd.asm6.*', '*.fixtures.*']
}
jacocoTestReport {
reports {
Expand Down Expand Up @@ -367,7 +367,7 @@ configure(javaModules()) {
}

javadoc {
exclude '**/asm5/**'
exclude '**/asm6/**'
afterEvaluate {
configure(options) {
windowTitle 'Jodd API Documentation'
Expand Down Expand Up @@ -420,7 +420,7 @@ task javadocAll(type: Javadoc) {
maxMemory '512m'

source javaBundleModulesSources.allJava
exclude '**/asm5/**'
exclude '**/asm6/**'

destinationDir = file("$buildDir/reports/javadoc")
classpath = files(javaBundleModulesSources.compileClasspath)
Expand Down
2 changes: 1 addition & 1 deletion checkstyle-suppressions.xml
Expand Up @@ -9,6 +9,6 @@
<suppress files=".*[/\\]test[/\\].*" checks=".+"/>
<suppress files=".*[/\\]testInt[/\\].*" checks=".+"/>
<suppress files=".*[/\\]perf[/\\].*" checks=".+"/>
<suppress files=".*[/\\]asm5[/\\].*" checks=".+"/>
<suppress files=".*[/\\]asm6[/\\].*" checks=".+"/>

</suppressions>
2 changes: 1 addition & 1 deletion codecov.yml
@@ -1,2 +1,2 @@
ignore:
- "**/jodd/asm5/**"
- "**/jodd/asm6/**"
6 changes: 4 additions & 2 deletions etc/asm.md
@@ -1,8 +1,10 @@
Jodd and ASM
============

Since v3.4.2, Jodd comes with ASM 4.1 bundled with it.
Since v4.0, Jodd uses ASM 6.0.
Since v3.5.2, Jodd uses ASM 5.0.1.
Since v3.4.2, Jodd comes with ASM 4.1 bundled with it.

We had to do so to remain compatible with systems that still use
old version of ASM.

Expand All @@ -12,6 +14,6 @@ in order to minimize the size of the library.
Changes
-------

+ package is renamed to: `jodd.asm5`.
+ package is renamed to: `jodd.asm6`.
+ `SignatureWriter` class is removed as not used.
+ some JavaDoc links fixed or removed
2 changes: 1 addition & 1 deletion gradle/license.gradle
Expand Up @@ -115,7 +115,7 @@ def license(overwrite) {

// *** 3rd PARTY LIBS, SPECIAL CASES ***
if (
file.absolutePath.contains("src/main/java/jodd/asm5/") ||
file.absolutePath.contains("src/main/java/jodd/asm6/") ||
file.name.equals("BCrypt.java") ||
file.name.equals("NanoHTTPD.java")
) {
Expand Down
34 changes: 0 additions & 34 deletions jodd-proxetta/src/main/java/jodd/asm6/package-info.java

This file was deleted.

2 changes: 1 addition & 1 deletion ruleset.xml
Expand Up @@ -4,6 +4,6 @@
<exclude-pattern>.*/test/.*</exclude-pattern>
<exclude-pattern>.*/testInt/.*</exclude-pattern>
<exclude-pattern>.*/perf/.*</exclude-pattern>
<exclude-pattern>.*/asm5/.*</exclude-pattern>
<exclude-pattern>.*/asm6/.*</exclude-pattern>

</ruleset>

0 comments on commit 196115c

Please sign in to comment.