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

license year updated #434

Merged
merged 1 commit into from
Jun 30, 2015
Merged

license year updated #434

merged 1 commit into from
Jun 30, 2015

Conversation

simonjenga
Copy link
Contributor

license year updated

@davvd
Copy link

davvd commented May 27, 2015

@simonjenga Thanks for your pull request, let me find someone who can review it

@davvd
Copy link

davvd commented May 27, 2015

@carlosmiranda please review, thanks

@@ -99,15 +99,19 @@
<artifactId>jcabi-aspects</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@simonjenga Why is this indented? Please revert this change.

@carlosmiranda
Copy link
Contributor

@simonjenga This PR is so big, and my comments are mostly the same, so in summary:

  1. Remove all other code changes not related to the LICENSE and submit separate PRs for them. We keep things separate on this project.
  2. No need to add license headers in .properties files.
  3. Do not change the license for files within it/ folders, they were put in that way to test some specific quality checks.

Let me know when you've pushed a new commit.

@simonjenga
Copy link
Contributor Author

@carlosmiranda Unnecessary code changes have been removed in this new pushed commit.
Other changes will be done as needed in new PRs that will be submitted later.

@carlosmiranda
Copy link
Contributor

@simonjenga Thanks!

@carlosmiranda
Copy link
Contributor

@rultor Looks good to merge.

@rultor
Copy link
Collaborator

rultor commented May 28, 2015

@rultor Looks good to merge.

@carlosmiranda Thanks for your request. @davvd Please confirm this.

@carlosmiranda
Copy link
Contributor

@rultor merge please

@rultor
Copy link
Collaborator

rultor commented Jun 25, 2015

@rultor merge please

@carlosmiranda Thanks for your request. @yegor256 Please confirm this.

@yegor256
Copy link
Owner

@rultor try to merge

@rultor
Copy link
Collaborator

rultor commented Jun 25, 2015

@rultor try to merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Collaborator

rultor commented Jun 25, 2015

@rultor try to merge

@yegor256 Oops, I failed. You can see the full log here (spent 11min)

INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/MavenEnvironmentMocker.java..."
INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/MavenProjectMocker.java..."
INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java..."
INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java..."
INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/ValidatorsProviderMocker.java..."
INFO: "reading qulice-maven-plugin/src/test/java/com/qulice/maven/package-info.java..."
INFO: "reading qulice-maven-plugin/src/test/resources/com/qulice/maven/PomXpathValidator/pom.xml..."
INFO: "reading qulice-pmd/LICENSE.txt..."
INFO: "reading qulice-pmd/pom.xml..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/DataSourceReader.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/Files.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/PMDValidator.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/PmdListener.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/SourceValidator.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/package-info.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/rules/UnnecessaryLocalRule.java..."
INFO: "reading qulice-pmd/src/main/java/com/qulice/pmd/rules/package-info.java..."
INFO: "reading qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml..."
INFO: "reading qulice-pmd/src/site/apt/index.apt.vm..."
INFO: "reading qulice-pmd/src/site/site.xml..."
INFO: "reading qulice-pmd/src/test/java/com/qulice/pmd/FilesTest.java..."
INFO: "reading qulice-pmd/src/test/java/com/qulice/pmd/PMDValidatorTest.java..."
INFO: "reading qulice-pmd/src/test/java/com/qulice/pmd/package-info.java..."
INFO: "reading qulice-pmd/src/test/resources/log4j.properties..."
INFO: "reading qulice-pmd:findbug_excludes_4934864278473998.xml..."
INFO: "reading qulice-spi/LICENSE.txt..."
INFO: "reading qulice-spi/pom.xml..."
INFO: "reading qulice-spi/src/main/java/com/qulice/spi/Environment.java..."
INFO: "reading qulice-spi/src/main/java/com/qulice/spi/ValidationException.java..."
INFO: "reading qulice-spi/src/main/java/com/qulice/spi/Validator.java..."
INFO: "reading qulice-spi/src/main/java/com/qulice/spi/package-info.java..."
INFO: "reading qulice-spi/src/site/apt/index.apt.vm..."
INFO: "reading qulice-spi/src/site/site.xml..."
INFO: "reading qulice-spi/src/test/java/com/qulice/spi/EnvironmentTest.java..."
INFO: "reading qulice-spi/src/test/java/com/qulice/spi/package-info.java..."
INFO: "reading qulice-xml/LICENSE.txt..."
INFO: "reading qulice-xml/pom.xml..."
INFO: "puzzle 280-4ce4d8c5 0/IMP at qulice-xml/pom.xml"
INFO: "reading qulice-xml/src/main/java/com/qulice/xml/Prettifier.java..."
INFO: "reading qulice-xml/src/main/java/com/qulice/xml/XmlValidator.java..."
INFO: "reading qulice-xml/src/main/java/com/qulice/xml/package-info.java..."
INFO: "reading qulice-xml/src/site/apt/index.apt.vm..."
INFO: "reading qulice-xml/src/site/site.xml..."
INFO: "reading qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java..."
INFO: "puzzle 246-77de21a5 0/IMP at qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java"
INFO: "reading qulice-xml/src/test/java/com/qulice/xml/package-info.java..."
INFO: "reading qulice-xml/src/test/resources/log4j.properties..."
INFO: "reading src/site/apt/index.apt.vm..."
INFO: "reading src/site/apt/quality.apt.vm..."
INFO: "reading src/site/resources/CNAME..."
INFO: "reading src/site/site.xml..."
ERROR: "Element 'id': [facet 'pattern'] The value '337.-8e901889' is not accepted by the pattern '[a-zA-Z0-9\\-]+'."
ERROR: "Element 'id': '337.-8e901889' is not a valid value of the local atomic type."
ERROR: "<?xml version=\"1.0\"?>\n<?xml-stylesheet type='text/xsl' href='http://pdd-xsl.teamed.io/0.14.2.xsl'?>\n<puzzles xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://pdd-xsd.teamed.io/0.14.2.xsd\" version=\"0.14.2\" date=\"2015-06-25T02:23:53Z\">\n  <puzzle>\n    <ticket>337.</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>337.-8e901889</id>\n    <lines>168-168</lines>\n    <body>Implement exclude and excludes for ant QuliceTask</body>\n    <file>qulice-ant/src/main/java/com/qulice/ant/AntEnvironment.java</file>\n    <author>alevohin</author>\n    <email>alevohin@mail.ru</email>\n    <time>2015-01-19T19:18:59Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>337</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>337-3d7cb361</id>\n    <lines>40-40</lines>\n    <body>Implement unit tests at AntEnvironmentTest</body>\n    <file>qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java</file>\n    <author>alevohin</author>\n    <email>alevohin@mail.ru</email>\n    <time>2015-01-19T19:18:59Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>260</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>260-dc51e6f4</id>\n    <lines>50-51</lines>\n    <body>Add handling of multiple anonymous classes inside methods by looking at the recursive tree.</body>\n    <file>qulice-checkstyle/src/main/java/com/qulice/checkstyle/MethodBodyCommentsCheck.java</file>\n    <author>krzyk</author>\n    <email>Krzysztof.Krason@sabre.com</email>\n    <time>2014-08-23T14:11:13Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>333</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>333-37771839</id>\n    <lines>212-213</lines>\n    <body>When new jcabi is released based on qulice &gt; 0.11, remove the line below.</body>\n    <file>qulice-findbugs/pom.xml</file>\n    <author>krzyk</author>\n    <email>Krzysztof.Krason@sabre.com</email>\n    <time>2014-11-29T07:49:29Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>339</ticket>\n    <estimate>30</estimate>\n    <role>IMP</role>\n    <id>339-6f043704</id>\n    <lines>47-47</lines>\n    <body>Design validator classes for Gradle.</body>\n    <file>qulice-gradle-plugin/src/main/java/com/qulice/gradle/QulicePlugin.java</file>\n    <author>Dmitri Pisarenko</author>\n    <email>dp@altruix.co</email>\n    <time>2015-01-17T13:25:27Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>281</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>281-2350cdf0</id>\n    <lines>300-306</lines>\n    <body>Dependency-violations is broken. As it uses maven-dependency-analyzer 1.4. The latter depends on ASM3. We can't add ASM3 in classpath as findbugs and PMD depends on ASM5. Find a way to upgrade maven-dependency-analyzer to use ASM5. After fix uncomment next line &lt;pomInclude&gt;dependency-violations/pom.xml&lt;/pomInclude&gt;</body>\n    <file>qulice-maven-plugin/pom.xml</file>\n    <author>longtimeago</author>\n    <email>ppol@ua.fm</email>\n    <time>2014-09-02T17:42:56Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>262</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>262-9a421520</id>\n    <lines>37-41</lines>\n    <body>Checkstyle doesn't have current module in classpath (either because RedundantThrows/AbstractTypeAwareCheck have wrong implementation of resolveClass() or qulice provides wrong classpath to the module. When this is fixed uncomment following three checks and remove \"suppressLoadErrors\" from RedundantThrows configuration in checks.xml.</body>\n    <file>qulice-maven-plugin/src/it/checkstyle-exceptions/verify.groovy</file>\n    <author>krzyk</author>\n    <email>Krzysztof.Krason@sabre.com</email>\n    <time>2014-06-11T10:02:14Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>352</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>352-f6cf61e2</id>\n    <lines>51-53</lines>\n    <body>Need to add multiline check after issue #350 resolved. Now only one class can be excluded Don't forget update example-exclude.apt.vm</body>\n    <file>qulice-maven-plugin/src/it/findbugs-exclude/pom.xml</file>\n    <author>alevohin</author>\n    <email>alevohin@mail.ru</email>\n    <time>2015-01-16T04:23:10Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>60</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>60-2649436b</id>\n    <lines>36-39</lines>\n    <body>This validation doesn't work at the moment because of incorrect classpath generation in DefaultMavenEnvironment. There is some problem which leads to incomplete classpath being passed to com.qulice.findbugs.Wrap class.</body>\n    <file>qulice-maven-plugin/src/it/findbugs-violations/verify.groovy</file>\n    <author>Yegor Bugayenko</author>\n    <email>yegor@tpc2.com</email>\n    <time>2012-04-02T03:12:27Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>250</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>250-70b42373</id>\n    <lines>45-53</lines>\n    <body>Maven-duplicate-finder-plugin should support exclusions. Let's add exclusions of following formats (examples): - duplicate:about.html - duplicate:org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5 - duplicate:org.codehaus.groovy.ast.expr.RegexExpression - duplicate:org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5|xml-apis:xml-apis:1.0.0|about.html - duplicate:org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5|xml-apis:xml-apis:1.0.0|org.w3c.dom.UserDataHandler See https://github.com/tpc2/qulice/issues/152#issuecomment-39028953 and https://github.com/teamed/qulice/issues/250 for details</body>\n    <file>qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java</file>\n    <author>krzyk</author>\n    <email>Krzysztof.Krason@sabre.com</email>\n    <time>2014-06-24T19:10:43Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>250</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>250-bd6aad88</id>\n    <lines>60-62</lines>\n    <body>Fix a problem with maven configuration of duplicate finder plugin in commented out code below, and enable duplicate-finder-ignore-deps IT in pom.xml.</body>\n    <file>qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java</file>\n    <author>Yegor Bugayenko</author>\n    <email>yegor@tpc2.com</email>\n    <time>2014-09-04T07:09:01Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>280</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>280-4ce4d8c5</id>\n    <lines>66-72</lines>\n    <body>This version of jcabi-xml retries if the connection to the host of the schema document is reset. However I don't know how to trigger the \"connection reset\" condition for testing. We should find a way to test whether it does retry if this happens. See issues https://github.com/jcabi/jcabi-xml/issues/32 and https://github.com/teamed/qulice/issues/280 for background details.</body>\n    <file>qulice-xml/pom.xml</file>\n    <author>Carlos Miranda</author>\n    <email>carlosmiranda@users.noreply.github.com</email>\n    <time>2015-01-12T13:03:58Z</time>\n  </puzzle>\n  <puzzle>\n    <ticket>246</ticket>\n    <estimate>0</estimate>\n    <role>IMP</role>\n    <id>246-77de21a5</id>\n    <lines>91-95</lines>\n    <body>XmlValidator should be able to log IO problems (for example, inability to connect to a server) and ignore them (see ticket #243).\\ However, {@link com.jcabi.xml.StrictXML} class outright throws an IllegalArgumentException in such cases. Let's find a way to detect whether a failure was caused by such IO errorsand fix this test.</body>\n    <file>qulice-xml/src/test/java/com/qulice/xml/XmlValidatorTest.java</file>\n    <author>Carlos Miranda</author>\n    <email>carlosmiranda@users.noreply.github.com</email>\n    <time>2014-08-15T02:17:27Z</time>\n  </puzzle>\n</puzzles>\n"
/var/lib/gems/1.9.1/gems/pdd-0.14.2/lib/pdd.rb:161:in `sanitize': Element 'id': [facet 'pattern'] The value '337.-8e901889' is not accepted by the pattern '[a-zA-Z0-9\-]+'.; Element 'id': '337.-8e901889' is not a valid value of the local atomic type. (PDD::SchemaError)
    from /var/lib/gems/1.9.1/gems/pdd-0.14.2/lib/pdd.rb:106:in `xml'
    from /var/lib/gems/1.9.1/gems/pdd-0.14.2/bin/pdd:90:in `<top (required)>'
    from /usr/local/bin/pdd:23:in `load'
    from /usr/local/bin/pdd:23:in `<main>'

@carlosmiranda
Copy link
Contributor

@yegor256 I haven't seen this error before, could you help us?

@yegor256
Copy link
Owner

@carlosmiranda it's a problem with one of the puzzles in the branch. It is probably formatted like @todo #337. (with a dot)

@carlosmiranda
Copy link
Contributor

yegor256 pushed a commit that referenced this pull request Jun 30, 2015
@yegor256
Copy link
Owner

@rultor try to merge

@rultor
Copy link
Collaborator

rultor commented Jun 30, 2015

@rultor try to merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit f0fa873 into yegor256:master Jun 30, 2015
@rultor
Copy link
Collaborator

rultor commented Jun 30, 2015

@rultor try to merge

@yegor256 Done! FYI, the full log is here (took me 18min)

@davvd
Copy link

davvd commented Jul 1, 2015

@carlosmiranda I just added 21 mins to your account, many thanks for your contribution (60337461).. 810 hours and 9 mins spent here. extra minutes for review comments (c=6). +21 to your rating, your total score is +3338

@davvd
Copy link

davvd commented Jul 1, 2015

@rultor deploy now pls

@rultor
Copy link
Collaborator

rultor commented Jul 1, 2015

@rultor deploy now pls

@davvd OK, I'll try to deploy now. You can check the progress here

@rultor
Copy link
Collaborator

rultor commented Jul 1, 2015

@rultor deploy now pls

@davvd Done! FYI, the full log is here (took me 12min)

@simonjenga simonjenga deleted the license-year branch July 4, 2015 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants