Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into 273
Browse files Browse the repository at this point in the history
Conflicts:
	qulice-xml/pom.xml
  • Loading branch information
carlosmiranda committed Jan 12, 2016
2 parents 128dba1 + 7adfc06 commit 2dc3617
Show file tree
Hide file tree
Showing 98 changed files with 2,005 additions and 534 deletions.
9 changes: 7 additions & 2 deletions .rultor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ architect:
- yegor256
- davvd
install:
- sudo gem install pdd
- sudo gem install --no-ri --no-rdoc pdd
- sudo gem install --no-ri --no-rdoc est
assets:
secring.gpg: yegor256/home#assets/secring.gpg
settings.xml: yegor256/home#assets/qulice/settings.xml
Expand All @@ -15,6 +16,7 @@ merge:
mvn clean site -Psite --errors --settings ../settings.xml
mvn clean
pdd --source=$(pwd) --verbose --file=/dev/null --exclude=qulice-maven-plugin/src/it/**/*.java
est --dir=est --file=/dev/null
commanders:
- caarlos0
- carlosmiranda
Expand All @@ -30,6 +32,8 @@ deploy:
mvn clean
pdd --source=$(pwd) --verbose --file=qulice.xml --exclude=qulice-maven-plugin/src/it/**/*.java
s3cmd --no-progress put qulice.xml --config=../s3cfg s3://pdd.teamed.io/qulice.xml
est --dir=./est --verbose --file=qulice.xml --format=xml
s3cmd --no-progress put qulice.xml --config=../s3cfg s3://est.teamed.io/qulice.xml
env:
MAVEN_OPTS: -XX:MaxPermSize=256m -Xmx1g
release:
Expand All @@ -39,4 +43,5 @@ release:
mvn clean deploy -Pqulice-profile -Pqulice -Psonatype --errors --settings ../settings.xml
mvn clean site-deploy -Pgh-pages -Pqulice-profile -Psite --errors --settings ../settings.xml || echo 'site-deploy failed'
commanders:
- krzyk
- krzyk
- yegor256
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,15 @@ env:
global:
- MAVEN_OPTS="-XX:MaxPermSize=2g -Xmx4g"
- JAVA_OPTS="-XX:MaxPermSize=2g -Xmx4g"
install:
- set -e
- travis_retry sudo apt-get install -y --fix-missing libmagic1 libmagic-dev
- gem install --no-ri --no-rdoc pdd
- gem install --no-ri --no-rdoc est
- set +e
script:
- set -e
- pdd --file=/dev/null --exclude=qulice-maven-plugin/src/it/**/*.java
- est --dir=est --file=/dev/null
- mvn clean install -Pqulice --errors
- set +e
75 changes: 75 additions & 0 deletions PUZZLES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
## Puzzles

There are 15 active puzzles (70 total):


<del>unknown</del> [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>8-67eb3954</del> [`pom.xml:280-283`](../master/pom.xml#L280-L283)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>83-6c3a2ab9</del> [`DefaultValidatorsProvider.java:47-47`](../master/src/main/java/com/qulice/maven/DefaultValidatorsProvider.java#L47-L47)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>83-d32bcbba</del> [`DefaultValidatorsProvider.java:62-62`](../master/src/main/java/com/qulice/maven/DefaultValidatorsProvider.java#L62-L62)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>13-53c72388</del>](https://github.com/tpc2/qulice/issues/176) [`XmlValidatorTest.java:48-49`](../master/qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java#L48-L49)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>176-99bef10b</del> [`XmlValidator.java:83-84`](../master/qulice-xml/src/main/java/com/qulice/xml/XmlValidator.java#L83-L84)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>55-7f8cd1da</del> [`Invalid.java:14-15`](../master/qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/PuzzleFormatCheck/Invalid.java#L14-L15)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>555-31c30df2</del> [`Valid.java:7-7`](../master/qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/PuzzleFormatCheck/Valid.java#L7-L7)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>JIRA-7643-d253cd9d</del> [`Valid.java:10-10`](../master/qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/PuzzleFormatCheck/Valid.java#L10-L10)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>44-99bef10b</del> [`CheckstyleValidator.java:206-207`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/CheckstyleValidator.java#L206-L207)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>44-c0ef14bd</del> [`Files.java:56-58`](../master/qulice-pmd/src/main/java/com/qulice/pmd/Files.java#L56-L58)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-3eabd944</del> [`ConstantUsageCheck.java:42-46`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/ConstantUsageCheck.java#L42-L46)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-14ec496b</del> [`NonStaticMethodCheck.java:46-50`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/NonStaticMethodCheck.java#L46-L50)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>143</del>](https://github.com/tpc2/qulice/issues/143) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>143-2a590ee4</del> [`PuzzleDuplicateCheck.java:46-46`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/PuzzleDuplicateCheck.java#L46-L46)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>153</del>](https://github.com/tpc2/qulice/issues/153) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>153-1c44959f</del> [`Environment.java:86-90`](../master/qulice-spi/src/main/java/com/qulice/spi/Environment.java#L86-L90)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>67</del>](https://github.com/tpc2/qulice/issues/67) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>67-ea924b79</del> [`PomXpathValidator.java:51-52`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/PomXpathValidator.java#L51-L52)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>148</del>](https://github.com/tpc2/qulice/issues/148) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>148-3add3478</del> [`CodeNarcValidator.java:46-50`](../master/qulice-codenarc/src/main/java/com/qulice/codenarc/CodeNarcValidator.java#L46-L50)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>152</del>](https://github.com/tpc2/qulice/issues/152) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>152-5f54d891</del> [`DefaultMavenEnvironment.java:56-58`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/DefaultMavenEnvironment.java#L56-L58)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<del>152-ea9dc1d7</del>](https://github.com/teamed/qulice/issues/250) [`DuplicateFinderValidator.java:40-40`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java#L40-L40)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#309](https://github.com/teamed/qulice/issues/309):[**250-bd6aad88**](https://github.com/teamed/qulice/issues/309) [`DuplicateFinderValidator.java:58-60`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java#L58-L60)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#310](https://github.com/teamed/qulice/issues/310):[**250-70b42373**](https://github.com/teamed/qulice/issues/310) [`DuplicateFinderValidator.java:45-53`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java#L45-L53)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>152-25766266</del> [`DuplicateFinderValidator.java:47-49`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java#L47-L49)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>151</del>](https://github.com/tpc2/qulice/issues/151) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[<del>151-1b555c82</del>](https://github.com/teamed/qulice/issues/251) [`JslintValidator.java:40-42`](../master/qulice-maven-plugin/src/main/java/com/qulice/maven/JslintValidator.java#L40-L42)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>251-723b0584</del> [`pom.xml:300-303`](../master/qulice-maven-plugin/pom.xml#L300-L303)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>1-75aae825</del>](https://github.com/teamed/qulice/issues/252) [`XmlValidatorTest.java:48-51`](../master/qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java#L48-L51)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>252-5858aa84</del> [`XmlValidator.java:54-56`](../master/qulice-xml/src/main/java/com/qulice/xml/XmlValidator.java#L54-L56)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>252-a79829e3</del> [`XmlValidator.java:70-71`](../master/qulice-xml/src/main/java/com/qulice/xml/XmlValidator.java#L70-L71)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-3859ec8f</del> [`checks.xml:366-368`](../master/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml#L366-L368)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-3961fc83</del> [`checks.xml:372-377`](../master/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml#L372-L377)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-d234717c</del> [`checks.xml:366-369`](../master/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml#L366-L369)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>1-6974f5e9</del> [`checks.xml:225-229`](../master/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml#L225-L229)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>149-fa59b6ee</del>](https://github.com/teamed/qulice/issues/352) [`FindBugsValidator.java:66-71`](../master/qulice-findbugs/src/main/java/com/qulice/findbugs/FindBugsValidator.java#L66-L71)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#421](https://github.com/teamed/qulice/issues/421):[<del>352-f6cf61e2</del>](https://github.com/teamed/qulice/issues/421) [`pom.xml:51-53`](../master/qulice-maven-plugin/src/it/findbugs-exclude/pom.xml#L51-L53)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>149-29796bc9</del> [`FindBugsValidatorTest.java:91-94`](../master/qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java#L91-L94)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>262-9a421520</del> [`verify.groovy:37-41`](../master/qulice-maven-plugin/src/it/checkstyle-exceptions/verify.groovy#L37-L41)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>123-3eeb54ce</del> [`some.xml:3-4`](../master/qulice-maven-plugin/src/it/checkstyle-violations/src/main/resources/some.xml#L3-L4)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[#388](https://github.com/teamed/qulice/issues/388):[**60-2649436b**](https://github.com/teamed/qulice/issues/388) [`verify.groovy:36-39`](../master/qulice-maven-plugin/src/it/findbugs-violations/verify.groovy#L36-L39)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[#354](https://github.com/teamed/qulice/issues/354):[**246-77de21a5**](https://github.com/teamed/qulice/issues/354) [`XmlValidatorTest.java:91-95`](../master/qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java#L91-L95)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>260</del>](https://github.com/teamed/qulice/issues/260) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#356](https://github.com/teamed/qulice/issues/356):[**260-dc51e6f4**](https://github.com/teamed/qulice/issues/356) [`MethodBodyCommentsCheck.java:50-51`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/MethodBodyCommentsCheck.java#L50-L51)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>260-1576b183</del> [`MethodBodyCommentsCheck.java:52-53`](../master/qulice-checkstyle/src/main/java/com/qulice/checkstyle/MethodBodyCommentsCheck.java#L52-L53)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>281</del>](https://github.com/teamed/qulice/issues/281) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#365](https://github.com/teamed/qulice/issues/365):[**281-2350cdf0**](https://github.com/teamed/qulice/issues/365) [`pom.xml:296-302`](../master/qulice-maven-plugin/pom.xml#L296-L302)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>308</del>](https://github.com/teamed/qulice/issues/308) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<del>308-45ddd042</del> [`pom.xml:134-136`](../master/pom.xml#L134-L136)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>333</del>](https://github.com/teamed/qulice/issues/333) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#370](https://github.com/teamed/qulice/issues/370):[<del>333-37771839</del>](https://github.com/teamed/qulice/issues/370) [`pom.xml:207-208`](../master/qulice-findbugs/pom.xml#L207-L208)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#590](https://github.com/teamed/qulice/issues/590):[**370-69914ea1**](https://github.com/teamed/qulice/issues/590) [`pom.xml:379-380`](../master/qulice-maven-plugin/pom.xml#L379-L380)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>339</del>](https://github.com/teamed/qulice/issues/339) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#422](https://github.com/teamed/qulice/issues/422):[**339-6f043704**](https://github.com/teamed/qulice/issues/422) [`QulicePlugin.java:47-47`](../master/qulice-gradle-plugin/src/main/java/com/qulice/gradle/QulicePlugin.java#L47-L47)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>280</del>](https://github.com/teamed/qulice/issues/280) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#423](https://github.com/teamed/qulice/issues/423):[**280-4ce4d8c5**](https://github.com/teamed/qulice/issues/423) [`pom.xml:66-72`](../master/qulice-xml/pom.xml#L66-L72)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<del>337.-8e901889</del> [`AntEnvironment.java:168-168`](../master/qulice-ant/src/main/java/com/qulice/ant/AntEnvironment.java#L168-L168)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[#337](https://github.com/teamed/qulice/issues/337):[<del>337</del>](https://github.com/teamed/qulice/issues/337) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#426](https://github.com/teamed/qulice/issues/426):[**337-3d7cb361**](https://github.com/teamed/qulice/issues/426) [`AntEnvironmentTest.java:40-40`](../master/qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java#L40-L40)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#443](https://github.com/teamed/qulice/issues/443):[**337-8e901889**](https://github.com/teamed/qulice/issues/443) [`AntEnvironment.java:168-168`](../master/qulice-ant/src/main/java/com/qulice/ant/AntEnvironment.java#L168-L168)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>469</del>](https://github.com/teamed/qulice/issues/469) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#483](https://github.com/teamed/qulice/issues/483):[**469-1b2c894b**](https://github.com/teamed/qulice/issues/483) [`XmlValidator.java:173-179`](../master/qulice-xml/src/main/java/com/qulice/xml/XmlValidator.java#L173-L179)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>447</del>](https://github.com/teamed/qulice/issues/447) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#497](https://github.com/teamed/qulice/issues/497):[**447-94597ea9**](https://github.com/teamed/qulice/issues/497) [`CheckstyleValidatorTest.java:214-216`](../master/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java#L214-L216)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[<del>412</del>](https://github.com/teamed/qulice/issues/412) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#505](https://github.com/teamed/qulice/issues/505):[**412-bd044e76**](https://github.com/teamed/qulice/issues/505) [`CheckstyleValidatorTest.java:51-53`](../master/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java#L51-L53)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;[#544](https://github.com/teamed/qulice/issues/544):[<del>544</del>](https://github.com/teamed/qulice/issues/544) [`?`](../master/?)<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[#596](https://github.com/teamed/qulice/issues/596):[**544-c37b2cc3**](https://github.com/teamed/qulice/issues/596) [`PMDEmptyTest.java:48-50`](../master/qulice-pmd/src/test/java/com/qulice/pmd/PMDEmptyTest.java#L48-L50)<br/>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sending us your pull request please run full Maven build:

> mvn clean install -Pqulice
Keep in mind that JDK7 is the lowest version you may use.
Keep in mind that JDK7 and Maven 3.1.0 are the lowest versions you may use.

## Got questions?

Expand Down
6 changes: 3 additions & 3 deletions TEAM.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Role | Members
---|---
PM | @davvd
CR | @darkled, @caarlos0, @carlosmiranda, @dmzaytsev, @pinaf, @ggajos, @longtimeago
DEV | @hdouss
IMP | @hdouss
DEV | @aschworer, @happy-neko, @jrdalpra, @prahladyeri
IMP | @aschworer, @happy-neko, @jrdalpra, @prahladyeri
ARC | @krzyk
DES |
PO |
PO | @yegor256
ITR |
QA |
SA |
Expand Down
36 changes: 36 additions & 0 deletions est/001.est
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
date: 31-12-2015
author: Michal Kordas
method: champions.pert
scope:
1: Setup infrastructure
2: Define interfaces and architecture
3: Integrate Checkstyle
4: Integrate PMD
5: Integrate Findbugs
6: Integrate Codenarc
7: Add custom checks/rules
8: Add dependency analyser
9: Add XML analyser
10: Add website
11: Add code coverage checks
12: Implement Maven Plugin
13: Implement Gradle Plugin
14: Add Ant integration
15: Add duplicate code detector
16: Integrate Java Script static analysis
17: Add checks for POM file
18: Integrate with Enforcer plugin
19: Integration testing
champions:
7:
worst-case: 120
best-case: 50
most-likely: 70
2:
worst-case: 60
best-case: 20
most-likely: 30
12:
worst-case: 50
best-case: 15
most-likely: 25
37 changes: 36 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<parent>
<groupId>com.jcabi</groupId>
<artifactId>parent</artifactId>
<version>0.33</version>
<version>0.40</version>
</parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
Expand Down Expand Up @@ -116,6 +116,17 @@
<url>http://www.qulice.com</url>
</site>
</distributionManagement>
<dependencyManagement>
<dependencies>
<!-- Manual jcabi-xml version override until parent POM declares
version 0.17.1 or higher -->
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-xml</artifactId>
<version>0.17.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
Expand All @@ -132,5 +143,29 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
<execution>
<id>enforce-maven-3</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.1.0</version>
</requireMavenVersion>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
10 changes: 0 additions & 10 deletions qulice-ant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,6 @@

<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<!--
Latest version of the plugin (1.8) is based on Groovy 2.0.1,
which is based on ASM 4.0, while CodeNarc and FindBugs are still using ASM 3.x.
This version mismatch leads to an exception in runtime,
explained in http://stackoverflow.com/questions/11738732/
That's why we downgrade the version here to 1.6, which is
based on Groovy 1.8.6, which is using ASM 3.2.
-->
<version>1.6</version>
<configuration combine.children="append">
<mergeUserSettings>false</mergeUserSettings>
<pomIncludes>
Expand Down Expand Up @@ -189,7 +180,6 @@
<artifactId>qulice-maven-plugin</artifactId>
<configuration>
<excludes combine.children="append">
<exclude>findbugs:.*</exclude>
<exclude>checkstyle:/src/it/.*</exclude>
<exclude>pmd:.*/src/it/.*</exclude>
<exclude>xml:/src/it/.*</exclude>
Expand Down

0 comments on commit 2dc3617

Please sign in to comment.