velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1842342 - in /velocity/tools/branches/VELTOOLS-177: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-tools-generic/ velocity-tools-view-j...
Date Sat, 29 Sep 2018 20:39:27 GMT
Author: michaelo
Date: Sat Sep 29 20:39:27 2018
New Revision: 1842342

URL: http://svn.apache.org/viewvc?rev=1842342&view=rev
Log:
Another Cleanup

* Remove configurations/versions which are set by parent or default
* Pull up common dependencies to dependency management
* Upgrade Velocity Master to 3

Modified:
    velocity/tools/branches/VELTOOLS-177/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml
    velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml

Modified: velocity/tools/branches/VELTOOLS-177/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/pom.xml Sat Sep 29 20:39:27 2018
@@ -20,13 +20,13 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-master</artifactId>
-    <version>2</version>
+    <version>3</version>
   </parent>
 
   <artifactId>velocity-tools-parent</artifactId>
@@ -44,12 +44,7 @@
   <inceptionYear>2002</inceptionYear>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>4.12</junit.version>
     <slf4j.version>1.7.25</slf4j.version>
-    <surefire.plugin.version>2.22.0</surefire.plugin.version>
-    <servlet.api.version>3.1.0</servlet.api.version>
-    <velocity.engine.version>2.0</velocity.engine.version>
   </properties>
 
   <modules>
@@ -126,46 +121,58 @@
     </contributor>
   </contributors>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-core</artifactId>
+        <version>2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet.jsp</groupId>
+        <artifactId>javax.servlet.jsp-api</artifactId>
+        <version>2.3.3</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.el</groupId>
+        <artifactId>javax.el-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+      </dependency>
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>3.6</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <defaultGoal>install</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
-          <configuration>
-            <useReleaseProfile>false</useReleaseProfile>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-            <goals>deploy</goals>
-            <arguments>-Papache-release</arguments>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <debug>true</debug>
-          <optimize>false</optimize>
-          <showDeprecation>true</showDeprecation>
-          <showWarning>true</showWarning>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.plugin.version}</version>
         <configuration>
-          <includes>
-            <include>**/Test*.java</include>
-            <include>**/*Test.java</include>
-            <include>**/*TestCase.java</include>
-            <include>**/*Tests.java</include>
-          </includes>
           <systemProperties>
             <property>
               <name>org.slf4j.simpleLogger.defaultLogLevel</name>
@@ -181,7 +188,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.1</version>
         <configuration>
           <excludePackageNames>org.apache.velocity.tools.examples</excludePackageNames>
           <additionalparam>${javadoc.opts}</additionalparam>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml Sat Sep 29 20:39:27
2018
@@ -20,7 +20,7 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
(original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
Sat Sep 29 20:39:27 2018
@@ -48,13 +48,11 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet.api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -73,19 +71,15 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools-view-jsp</artifactId>
       <version>${project.version}</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.2</version>
-      <type>jar</type>
+      <artifactId>javax.servlet.jsp-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -101,7 +95,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.22.0</version>
         <executions>
           <execution>
             <id>integration-test</id>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
(original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
Sat Sep 29 20:39:27 2018
@@ -20,7 +20,7 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml Sat Sep 29 20:39:27
2018
@@ -20,7 +20,7 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -38,7 +38,6 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
-      <version>${velocity.engine.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
@@ -53,18 +52,15 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml Sat Sep 29 20:39:27
2018
@@ -20,7 +20,7 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -43,31 +43,26 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet.api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.2</version>
+      <artifactId>javax.servlet.jsp-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-      <version>2.2</version>
+      <artifactId>javax.el-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml?rev=1842342&r1=1842341&r2=1842342&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml Sat Sep 29 20:39:27 2018
@@ -43,25 +43,21 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet.api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -71,14 +67,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.plugin.version}</version>
         <configuration>
-          <includes>
-            <include>**/Test*.java</include>
-            <include>**/*Test.java</include>
-            <include>**/*TestCase.java</include>
-            <include>**/*Tests.java</include>
-          </includes>
           <systemProperties>
             <property>
               <name>test.output.dir</name>



Mime
View raw message