You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2017/10/01 00:18:11 UTC

svn commit: r1810240 - in /tiles/autotag/trunk: ./ assembly/ maven-autotag-plugin/ src/site/apt/dev/ tiles-autotag-core-runtime/ tiles-autotag-core/ tiles-autotag-freemarker/ tiles-autotag-jsp/ tiles-autotag-velocity/

Author: mck
Date: Sun Oct  1 00:18:11 2017
New Revision: 1810240

URL: http://svn.apache.org/viewvc?rev=1810240&view=rev
Log:
- use snapshot of tiles-master-8
- declare max checkstyle violations for each module
- remove maven wagon plugins as it's svnpub now

Modified:
    tiles/autotag/trunk/assembly/pom.xml
    tiles/autotag/trunk/maven-autotag-plugin/pom.xml
    tiles/autotag/trunk/pom.xml
    tiles/autotag/trunk/src/site/apt/dev/release.apt
    tiles/autotag/trunk/tiles-autotag-core-runtime/pom.xml
    tiles/autotag/trunk/tiles-autotag-core/pom.xml
    tiles/autotag/trunk/tiles-autotag-freemarker/pom.xml
    tiles/autotag/trunk/tiles-autotag-jsp/pom.xml
    tiles/autotag/trunk/tiles-autotag-velocity/pom.xml

Modified: tiles/autotag/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/assembly/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/assembly/pom.xml (original)
+++ tiles/autotag/trunk/assembly/pom.xml Sun Oct  1 00:18:11 2017
@@ -52,13 +52,6 @@
         </configuration>
       </plugin>
     </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh</artifactId>
-        <version>2.5</version>
-      </extension>
-    </extensions>
   </build>
   <profiles>
     <profile>
@@ -121,26 +114,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>wagon-maven-plugin</artifactId>
-            <version>1.0-beta-4</version>
-            <executions>
-              <execution>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>upload</goal>
-                </goals>
-                <configuration>
-                  <fromDir>${project.build.directory}/assemblies</fromDir>
-                  <includes>**</includes>
-                  <toDir>${project.version}</toDir>
-                  <serverId>tiles.build</serverId>
-                  <url>scp://people.apache.org/www/people.apache.org/builds/tiles/autotag</url>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -151,13 +124,11 @@
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-autotag-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-autotag-core-runtime</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>

Modified: tiles/autotag/trunk/maven-autotag-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/maven-autotag-plugin/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/maven-autotag-plugin/pom.xml (original)
+++ tiles/autotag/trunk/maven-autotag-plugin/pom.xml Sun Oct  1 00:18:11 2017
@@ -31,6 +31,10 @@ under the License.
   <version>1.3-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>maven-autotag-plugin Maven Mojo</name>
+  <properties>
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>71</checkstyle.maxAllowedViolations>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -57,7 +61,6 @@ under the License.
     <dependency>
     	<groupId>org.apache.tiles</groupId>
     	<artifactId>tiles-autotag-core</artifactId>
-    	<version>1.3-SNAPSHOT</version>
     </dependency>
     <dependency>
     	<groupId>com.thoughtworks.xstream</groupId>
@@ -102,14 +105,12 @@ under the License.
     <dependency>
     	<groupId>org.easymock</groupId>
     	<artifactId>easymock</artifactId>
-    	<version>3.0</version>
     	<type>jar</type>
     	<scope>test</scope>
     </dependency>
     <dependency>
     	<groupId>commons-io</groupId>
     	<artifactId>commons-io</artifactId>
-    	<version>2.0</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>

Modified: tiles/autotag/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/pom.xml (original)
+++ tiles/autotag/trunk/pom.xml Sun Oct  1 00:18:11 2017
@@ -24,9 +24,21 @@ under the License.
     <parent>
         <artifactId>tiles-master</artifactId>
         <groupId>org.apache.tiles</groupId>
-        <version>7</version>
-        <relativePath />
+        <version>8-SNAPSHOT</version>
     </parent>
+
+    <!-- temporary only while parent pom is snapshot -->
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>https://repository.apache.org/snapshots</url>
+    </repository>
+  </repositories>
+
     <groupId>org.apache.tiles</groupId>
     <artifactId>tiles-autotag</artifactId>
     <version>1.3-SNAPSHOT</version>

Modified: tiles/autotag/trunk/src/site/apt/dev/release.apt
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/src/site/apt/dev/release.apt?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/src/site/apt/dev/release.apt (original)
+++ tiles/autotag/trunk/src/site/apt/dev/release.apt Sun Oct  1 00:18:11 2017
@@ -102,14 +102,6 @@ mvn release:perform
 
   It should compile and test everything, build and upload the artifacts and the website for the project.
 
-  <<Troubleshooting>>: if upload of assemblies fails it can be done manually with
-
------------------------------------
-cd target/checkout/assembly/target/assemblies/
-ssh user@people.apache.org mkdir /www/people.apache.org/builds/tiles/autotag/${version}/
-scp * user@people.apache.org:/www/people.apache.org/builds/tiles/autotag/${version}/
------------------------------------
-
   Upload the assemblies manually with
 
 -----------------------------------

Modified: tiles/autotag/trunk/tiles-autotag-core-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/tiles-autotag-core-runtime/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/tiles-autotag-core-runtime/pom.xml (original)
+++ tiles/autotag/trunk/tiles-autotag-core-runtime/pom.xml Sun Oct  1 00:18:11 2017
@@ -109,6 +109,9 @@ under the License.
         <tiles.osgi.private />
         <tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>7</checkstyle.maxAllowedViolations>
     </properties>
 
   <dependencies>

Modified: tiles/autotag/trunk/tiles-autotag-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/tiles-autotag-core/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/tiles-autotag-core/pom.xml (original)
+++ tiles/autotag/trunk/tiles-autotag-core/pom.xml Sun Oct  1 00:18:11 2017
@@ -46,6 +46,10 @@ under the License.
 			</testResource>
 		</testResources>
 	</build>
+    <properties>
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>35</checkstyle.maxAllowedViolations>
+    </properties>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>

Modified: tiles/autotag/trunk/tiles-autotag-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/tiles-autotag-freemarker/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/tiles-autotag-freemarker/pom.xml (original)
+++ tiles/autotag/trunk/tiles-autotag-freemarker/pom.xml Sun Oct  1 00:18:11 2017
@@ -31,6 +31,10 @@ under the License.
   <version>1.3-SNAPSHOT</version>
   <name>Autotag - Freemarker support</name>
   <description>Generates code for Freemarker support.</description>
+  <properties>
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>2</checkstyle.maxAllowedViolations>
+  </properties>
   <dependencies>
   	<dependency>
   		<groupId>org.apache.tiles</groupId>

Modified: tiles/autotag/trunk/tiles-autotag-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/tiles-autotag-jsp/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/tiles-autotag-jsp/pom.xml (original)
+++ tiles/autotag/trunk/tiles-autotag-jsp/pom.xml Sun Oct  1 00:18:11 2017
@@ -31,6 +31,10 @@ under the License.
   <version>1.3-SNAPSHOT</version>
   <name>Tiles Autotag - JSP tags automatic generation</name>
   <description>Generates JSP tags automatically from templates.</description>
+  <properties>
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>1</checkstyle.maxAllowedViolations>
+  </properties>
   <dependencies>
     <dependency>
         <groupId>junit</groupId>

Modified: tiles/autotag/trunk/tiles-autotag-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/autotag/trunk/tiles-autotag-velocity/pom.xml?rev=1810240&r1=1810239&r2=1810240&view=diff
==============================================================================
--- tiles/autotag/trunk/tiles-autotag-velocity/pom.xml (original)
+++ tiles/autotag/trunk/tiles-autotag-velocity/pom.xml Sun Oct  1 00:18:11 2017
@@ -31,6 +31,10 @@ under the License.
   <version>1.3-SNAPSHOT</version>
   <name>Autotag - Velocity support</name>
   <description>Module to generate Velocity code to use tag models.</description>
+  <properties>
+        <!-- decrease this whenever possible -->
+        <checkstyle.maxAllowedViolations>1</checkstyle.maxAllowedViolations>
+  </properties>
   <dependencies>
   	<dependency>
   		<groupId>org.apache.tiles</groupId>