jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1485283 - in /incubator/jspwiki/trunk: .checkstyle .classpath .project .settings/ ChangeLog build.xml pom.xml src/main/java/org/apache/wiki/Release.java
Date Wed, 22 May 2013 16:56:01 GMT
Author: gmazza
Date: Wed May 22 16:56:00 2013
New Revision: 1485283

URL: http://svn.apache.org/r1485283
Log:
Removed dependency management from Ant file, Eclipse configuration files gone in favor of
mvn eclipse:eclipse

Removed:
    incubator/jspwiki/trunk/.checkstyle
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/.project
    incubator/jspwiki/trunk/.settings/
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/pom.xml
    incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1485283&r1=1485282&r2=1485283&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed May 22 16:56:00 2013
@@ -1,5 +1,21 @@
 2013-05-22  Glen Mazza (gmazza AT apache DOT org)
 
+       * 2.9.2-incubating-6
+       
+       * Moved to one source of record for JSPWiki's 
+         dependencies (the Maven pom.xml file), it will
+         now be needed to run "mvn clean install [-Dmaven.test.skip]"
+         prior to running any of the Ant tasks, in
+         order to download the necessary libs.
+
+       * Added maven-eclipse-plugin to pom.xml to create necessary
+         Eclipse .project/.settings/.classpath settings upon calling
+         mvn eclipse:clean eclipse:eclipse and removed corresponding
+         folders in SVN repository. (IDEA users use mvn idea:idea
+         instead.)
+
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
        * 2.9.2-incubating-5
        
        * Mavenized location of doc directory; rat, javadoc,

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1485283&r1=1485282&r2=1485283&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed May 22 16:56:00 2013
@@ -112,7 +112,7 @@
   <property name="doc.rat" value="target/rat" />
 	
   <!-- dirs holding libs -->
-  <property name="libs.main" value="lib" />
+  <property name="libs.main" value="target/JSPWiki/WEB-INF/lib" />
   <property name="libs.tests" value="tests/lib" />
   <property name="libs.opt" value="tests/libs-opt" />
 	
@@ -155,6 +155,7 @@
      <pathelement path="${code.build}" />
      <fileset dir="${libs.main}">
         <include name="*.jar" />
+        <exclude name="jspwiki*.jar"/>
      </fileset>
   </path>
 
@@ -167,6 +168,7 @@
      <pathelement location="${java.home}/../lib/tools.jar" />
      <fileset dir="${libs.main}">
         <include name="*.jar" />
+        <exclude name="jspwiki*.jar"/>
      </fileset>
      <fileset dir="${libs.tests}">
         <include name="*.jar" />
@@ -202,7 +204,6 @@
      <mkdir dir="${tests.build}" />
      <mkdir dir="${tests.reports}" />
      <mkdir dir="${@tests.pagedir@}" />
-     <mkdir dir="${libs.main}" />
      <mkdir dir="${libs.tests}" />
      <mkdir dir="${libs.opt}" />
      <download-deps />
@@ -230,42 +231,11 @@
 
   <macrodef name="download-deps">
      <sequential>
-     	<!-- main dependencies  -->
-     	<get-element to-file="${libs.main}/activation-1.1.jar" url="${central.url}/javax/activation/activation/1.1/activation-1.1.jar"
/>
-     	<get-element to-file="${libs.main}/akismet-java-1.02.jar" url="${central.url}/net/sourceforge/akismet-java/1.02/akismet-java-1.02.jar"
/>
-        <get-element to-file="${libs.main}/commons-codec-1.3.jar" url="${central.url}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
/>
-        <get-element to-file="${libs.main}/commons-fileupload-1.2.1.jar" 
-                     url="${central.url}/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"
/>
-        <get-element to-file="${libs.main}/commons-httpclient-3.1.jar" 
-                     url="${central.url}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"
/>
-        <get-element to-file="${libs.main}/commons-io-1.4.jar" url="${central.url}/commons-io/commons-io/1.4/commons-io-1.4.jar"
/>
-        <get-element to-file="${libs.main}/commons-lang-2.6.jar" url="${central.url}/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"
/>
-        <get-element to-file="${libs.main}/commons-logging-api-1.0.4.jar" 
-                     url="${central.url}/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"
/>
-        <get-element to-file="${libs.main}/ecs-1.4.2.jar" url="${central.url}/ecs/ecs/1.4.2/ecs-1.4.2.jar"
/>
-        <get-element to-file="${libs.main}/freshcookies-security-0.60.jar" 
-                     url="${central.url}/org/freshcookies/freshcookies-security/0.60/freshcookies-security-0.60.jar"
/>
-        <get-element to-file="${libs.main}/standard-1.1.2.jar" url="${central.url}/taglibs/standard/1.1.2/standard-1.1.2.jar"
/>
-        <get-element to-file="${libs.main}/jstl-1.1.2.jar" url="${central.url}/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"
/>
-        <get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar" url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar"/>
-        <get-element to-file="${libs.main}/jdom-1.0.jar" url="${central.url}/jdom/jdom/1.0/jdom-1.0.jar"
/>
-        <get-element to-file="${libs.main}/org.suigeneris.jrcs.diff-0.4.2.jar" 
-                     url="${central.url}/org/jvnet/hudson/org.suigeneris.jrcs.diff/0.4.2/org.suigeneris.jrcs.diff-0.4.2.jar"
/>
-        <get-element to-file="${libs.main}/json-rpc-1.0.jar" url="${central.url}/com/metaparadigm/json-rpc/1.0/json-rpc-1.0.jar"
/>
-        <get-element to-file="${libs.main}/jsp-api-2.0.jar" url="${central.url}/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0.jar"
/>
-        <get-element to-file="${libs.main}/log4j-1.2.14.jar" url="${central.url}/log4j/log4j/1.2.14/log4j-1.2.14.jar"
/>
-        <get-element to-file="${libs.main}/lucene-core-3.6.0.jar" url="${central.url}/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar"
/>
-        <get-element to-file="${libs.main}/lucene-highlighter-3.6.0.jar" 
-                     url="${central.url}/org/apache/lucene/lucene-highlighter/3.6.0/lucene-highlighter-3.6.0.jar"
/>
-        <get-element to-file="${libs.main}/lucene-memory-3.6.0.jar" 
-                     url="${central.url}/org/apache/lucene/lucene-memory/3.6.0/lucene-memory-3.6.0.jar"
/>
-        <get-element to-file="${libs.main}/mail-1.4.jar" url="${central.url}/javax/mail/mail/1.4/mail-1.4.jar"
/>
-        <get-element to-file="${libs.main}/nekohtml-0.9.4.jar" url="${central.url}/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar"
/>
-        <get-element to-file="${libs.main}/oro-2.0.7.jar" url="${central.url}/oro/oro/2.0.7/oro-2.0.7.jar"
/>
-        <get-element to-file="${libs.main}/oscache-2.3.jar" url="${central.url}/opensymphony/oscache/2.3/oscache-2.3.jar"
/>
-        <get-element to-file="${libs.main}/sandler-0.5.jar" url="${central.url}/net/sourceforge/sandler/0.5/sandler-0.5.jar"
/>
-        <get-element to-file="${libs.main}/servlet-api-2.4.jar" url="${central.url}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"
/>
-        <get-element to-file="${libs.main}/xmlrpc-2.0.1.jar" url="${central.url}/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar"
/>
+     	<!-- main dependencies now populated via "mvn clean install [-Dmaven.test.skip]",
which must be run prior to any Ant task 
+             present build process:
+             mvn clean install [-Dmaven.test.skip to avoid unit tests] will build a WAR.
+             ant dist (will run unit tests still) or ant war (just to build a WAR).
+     	-->
      
      	<!-- tests dependencies  -->
      	<get-element to-file="${libs.tests}/commons-el-1.0.jar" url="${central.url}/commons-el/commons-el/1.0/commons-el-1.0.jar"
/>
@@ -313,7 +283,9 @@
     <delete file="${code.i18n}/CoreResources_en.properties" />
     <delete file="${code.i18n}/plugin/PluginResources_en.properties" />
     <delete file="${code.i18n}/templates/default_en.properties" />
-    <delete dir="target" />
+    <delete includeemptydirs="true">
+      <fileset dir="target" includes="**/*" excludes="JSPWiki/WEB-INF/lib/*.*"/>
+    </delete>
     <delete dir="tests/etc/WEB-INF" />
     <delete>
       <fileset dir="." includes="**/*~" defaultexcludes="no"/>
@@ -324,7 +296,6 @@
   <!-- Removes all lib directories -->
   <target name="clean-deps"
           description="Cleans away all downloaded files.">
-    <delete dir="${libs.main}" />
     <delete dir="${libs.tests}" />
     <delete dir="${libs.opt}" />
   </target>
@@ -518,7 +489,7 @@
 
     <war warfile="${warfile}"
          webxml="src/main/webapp/WEB-INF/web.xml">
-       <lib dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar"/>
+       <lib dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar
jspwiki*.jar"/>
        <lib file="${jarfile}" />
        <!--lib file="${libs.tests}/stripes*.jar"/-->
        <fileset dir="src/main/webapp">
@@ -1049,7 +1020,7 @@ If all of the tests ran successfully, th
 
       <!-- Copy the libraries -->
       <copy toDir="@{context.dir}/webapp/WEB-INF/lib">
-        <fileset dir="lib" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar"
/>
+        <fileset dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar
jspwiki*.jar" />
         <fileset file="${jarfile}"/>
         <fileset file="${jdbc.driver.jar}"/>
       </copy>

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1485283&r1=1485282&r2=1485283&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Wed May 22 16:56:00 2013
@@ -232,6 +232,27 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <additionalConfig>
+                        <file>
+                            <name>.checkstyle</name>
+                            <location>src/main/config/dev/jspwiki-checkstyle.xml</location>
+                        </file>
+                        <file>
+                            <name>.settings/org.eclipse.jdt.core.prefs</name>
+                            <location>src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+                        </file>
+                    </additionalConfig>
+                    <additionalProjectnatures>
+                        <projectnature>net.sourceforge.metrics.nature</projectnature>
+                        <projectnature>net.sf.eclipsecs.core.CheckstyleNature</projectnature>
                       
+                    </additionalProjectnatures>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>

Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1485283&r1=1485282&r2=1485283&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Wed May 22 16:56:00
2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "5";
+    public static final String     BUILD         = "6";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message