Merge remote-tracking branch 'upstream/master' into 320

yegor256 · Dec 19, 2014 · 2cceb05 · 2cceb05
2 parents 63cba1f + 0dbcff7
commit 2cceb05
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 36 deletions.
diff --git a/.rultor.yml b/.rultor.yml
@@ -10,6 +10,10 @@ env:
 install:
   - "sudo gem install pdd"
 
+architect:
+  - yegor256
+  - davvd
+
 merge:
   script: |
     mvn clean install -Pqulice-profile -Pqulice --errors --settings ../settings.xml

diff --git a/pom.xml b/pom.xml
@@ -130,40 +130,16 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-    </build>
-    <profiles>
         <!--
-        @todo #333 Remove this profile when new jcabi parent is released
-         with qulice version >= 0.11.
-        -->
-        <profile>
-            <id>qulice</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.qulice</groupId>
-                        <artifactId>qulice-maven-plugin</artifactId>
-                        <version>0.11</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.shared</groupId>
-                                <artifactId>maven-dependency-analyzer</artifactId>
-                                <version>1.5</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <groupId>org.apache.maven</groupId>
-                                        <artifactId>maven-project</artifactId>
-                                    </exclusion>
-                                    <exclusion>
-                                        <groupId>org.apache.maven</groupId>
-                                        <artifactId>maven-artifact-manager</artifactId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+        @todo #308 Remove this declaration when parent pom would depends
+         on qulice-maven-plugin:0.12
+         -->
+        <plugins>
+            <plugin>
+                <groupId>com.qulice</groupId>
+                <artifactId>qulice-maven-plugin</artifactId>
+                <version>0.12</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/qulice-maven-plugin/src/site/apt/usage.apt.vm b/qulice-maven-plugin/src/site/apt/usage.apt.vm
@@ -106,7 +106,7 @@ are met: no conditions.
     <plugin>
       <groupId>com.qulice</groupId>
       <artifactId>qulice-maven-plugin</artifactId>
-      <version>${releasedVersion}</version>
+      <version>${project.version}</version>
       <configuration>
         <license>LICENSE.txt</license>
       </configuration>