geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r390629 - in /geronimo/trunk: modules/directory/ modules/security/ modules/timer/ modules/tomcat-builder/ modules/tomcat/ pom.xml
Date Sat, 01 Apr 2006 09:52:04 GMT
Author: jlaskowski
Date: Sat Apr  1 01:52:02 2006
New Revision: 390629

URL: http://svn.apache.org/viewcvs?rev=390629&view=rev
Log:
GERONIMO-1660 - Application migration to Maven 2: Console
Submitted by: Prasad Kashyap

It contains only a part of the original patch since the remaining part (console.zip) made
too much 'noise' with no discussion before.
svn:ignore .settings

Modified:
    geronimo/trunk/modules/directory/   (props changed)
    geronimo/trunk/modules/security/   (props changed)
    geronimo/trunk/modules/timer/   (props changed)
    geronimo/trunk/modules/tomcat/   (props changed)
    geronimo/trunk/modules/tomcat-builder/   (props changed)
    geronimo/trunk/pom.xml

Propchange: geronimo/trunk/modules/directory/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr  1 01:52:02 2006
@@ -1,6 +1,7 @@
 *.iml
 .project
 .classpath
+.settings
 maven.log
 velocity.log*
 junit*.properties

Propchange: geronimo/trunk/modules/security/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr  1 01:52:02 2006
@@ -1,6 +1,7 @@
 *.iml
 .project
 .classpath
+.settings
 maven.log
 junit*.properties
 target

Propchange: geronimo/trunk/modules/timer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr  1 01:52:02 2006
@@ -1,6 +1,7 @@
 *.iml
 .project
 .classpath
+.settings
 maven.log
 junit*.properties
 target

Propchange: geronimo/trunk/modules/tomcat/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr  1 01:52:02 2006
@@ -1,6 +1,7 @@
 *.iml
 .project
 .classpath
+.settings
 maven.log
 junit*.properties
 target

Propchange: geronimo/trunk/modules/tomcat-builder/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr  1 01:52:02 2006
@@ -3,6 +3,7 @@
 *.iws
 .project
 .classpath
+.settings
 maven.log
 junit*.properties
 target

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=390629&r1=390628&r2=390629&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sat Apr  1 01:52:02 2006
@@ -88,6 +88,16 @@
   <properties>
     <!--
       |
+      | Maven properties
+      |
+    -->
+    <maven.compile.source>1.4</maven.compile.source>
+    <maven.compile.target>1.4</maven.compile.target>
+    <maven.compile.deprecation>true</maven.compile.deprecation>
+    <maven.compile.optimize>true</maven.compile.optimize>
+    <maven.compiler.debug>true</maven.compiler.debug>
+    <!--
+      |
       | Geronimo module versions
       |
     -->
@@ -128,6 +138,7 @@
     -->
     <activeIoVersion>2.0-r118</activeIoVersion>
     <activeMqVersion>4.0-SNAPSHOT</activeMqVersion>
+    <antVersion>1.6.5</antVersion>
     <antlrVersion>2.7.2</antlrVersion>
     <apachedsVersion>0.9.2</apachedsVersion>
     <asmVersion>1.4.3</asmVersion>
@@ -659,8 +670,9 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>${maven.compile.source}</source>
+          <target>${maven.compile.target}</target>
+          <optimize>${maven.compile.optimize}</optimize>
         </configuration>
       </plugin>
       <plugin>
@@ -774,6 +786,27 @@
         <module>modules/${module}</module>
       </modules>
     </profile>
+    <profile>
+      <id>singleplugin</id>
+      <activation>
+        <property>
+          <name>plugin</name>
+        </property>
+      </activation>
+      <modules>
+        <module>plugins-m2/${plugin}</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>singleapp</id>
+      <activation>
+        <property>
+          <name>application</name>
+        </property>
+      </activation>
+      <modules>
+        <module>applications/${application}</module>
+      </modules>
+    </profile>
   </profiles>
-
 </project>



Mime
View raw message