Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade codesniffer to 3.2.0 #430

Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ All notable changes to AET will be documented in this file.
- [PR-429](https://github.com/Cognifide/aet/pull/429) - `aet-cookbook` version updated to [`v5.1.1`](https://github.com/Cognifide/aet-cookbook/blob/master/CHANGELOG.md#511) in Vagrant. **Important**: please follow the instructions from [PR-43 description](https://github.com/Cognifide/aet-cookbook/pull/43) in order to keep the MongoDB data on your local environment.

- [PR-422](https://github.com/Cognifide/aet/pull/422) RunnerConfiguration's urlPackageSize property got set to 1
- [PR-430](https://github.com/Cognifide/aet/pull/430) Upgraded HTML codesniffer to latest release (3.2.0)

- [PR-385](https://github.com/Cognifide/aet/pull/385) Fixed ChefDK and vagrant-berkshelf versions

Expand Down
24 changes: 23 additions & 1 deletion core/jobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,28 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.samaxes.maven</groupId>
<artifactId>minify-maven-plugin</artifactId>
<executions>
<execution>
<id>default-minify</id>
<goals>
<goal>minify</goal>
</goals>
<configuration>
<webappSourceDir>${basedir}/src/main/resources</webappSourceDir>
<webappTargetDir>${basedir}/target/classes</webappTargetDir>
<jsSourceDir>collectors/accessibility/</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>htmlcs.js</jsSourceFile>
</jsSourceFiles>
<jsTargetDir>collectors/accessibility</jsTargetDir>
<skipMerge>true</skipMerge>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand All @@ -178,7 +200,7 @@
<instructions>
<Bundle-Vendor>Cognifide Ltd.</Bundle-Vendor>
<Import-Package>javax.annotation;resolution:=optional,*</Import-Package>
<Export-Package>com.cognifide.aet.job.common.*</Export-Package>
<Export-Package>com.cognifide.aet.job.common.*,collectors.*</Export-Package>
</instructions>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ private String getScriptFromFile() throws ProcessingException {
URL entry = context.getBundle().getEntry("/collectors/accessibility/htmlcs.min.js");
if (entry != null) {
script = IOUtils.toString(entry.openStream(), StandardCharsets.UTF_8);
script = "return " + script;
} else {
throw new ProcessingException("Can't find accessibility htmlcs scripts in bundle context!");
}
Expand Down
Loading