geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r676543 - in /geronimo/genesis/trunk/genesis-flava: genesis-default-flava/pom.xml genesis-java5-flava/ genesis-java5-flava/pom.xml pom.xml
Date Mon, 14 Jul 2008 10:19:09 GMT
Author: jdillon
Date: Mon Jul 14 03:19:07 2008
New Revision: 676543

URL: http://svn.apache.org/viewvc?rev=676543&view=rev
Log:
Add Java 5 specific flava mucksi

Added:
    geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/
      - copied from r676299, geronimo/genesis/trunk/genesis-flava/genesis-default-flava/
    geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/pom.xml
      - copied, changed from r676538, geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
Modified:
    geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
    geronimo/genesis/trunk/genesis-flava/pom.xml

Modified: geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml?rev=676543&r1=676542&r2=676543&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml Mon Jul 14 03:19:07
2008
@@ -344,6 +344,17 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <optimize>true</optimize>
+                    <debug>true</debug>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>
                     <execution>
@@ -389,11 +400,6 @@
                 <version>2.4</version>
                 <configuration>
                     <quiet>true</quiet>
-                    <!--
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                    </links>
-                    -->
                     <tags>
                         <tag>
                             <name>goal</name>
@@ -443,11 +449,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.4</version>
-                <!--
-                <configuration>
-                    <targetJdk>1.5</targetJdk>
-                </configuration>
-                -->
             </plugin>
             
             <plugin>

Copied: geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/pom.xml (from r676538, geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/pom.xml?p2=geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/pom.xml&p1=geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml&r1=676538&r2=676543&rev=676543&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-flava/genesis-java5-flava/pom.xml Mon Jul 14 03:19:07 2008
@@ -26,324 +26,28 @@
     
     <parent>
         <groupId>org.apache.geronimo.genesis.flava</groupId>
-        <artifactId>genesis-flava</artifactId>
+        <artifactId>genesis-default-flava</artifactId>
         <version>2.0-SNAPSHOT</version>
+        <relativePath>../genesis-default-flava/pom.xml</relativePath>
     </parent>
     
-    <artifactId>genesis-default-flava</artifactId>
-    <name>Genesis Flava :: Default</name>
+    <artifactId>genesis-java5-flava</artifactId>
+    <name>Genesis Flava :: Java 5</name>
     <packaging>pom</packaging>
     
     <build>
-        <defaultGoal>install</defaultGoal>
-        
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            
-            <resource>
-                <directory>${project.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
-                    <configuration>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-ear-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.5.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-ejb-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.0-alpha-4</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-help-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jxr-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.4.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>2.0.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-rar-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-7</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-7</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.0.4</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-stage-plugin</artifactId>
-                    <version>1.0-alpha-1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
-                    <configuration>
-                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <forkMode>once</forkMode>
-                        <argLine>-enableassertions</argLine>
-                        <workingDirectory>${project.build.directory}</workingDirectory>
-                        <excludes>
-                            <exclude>**/Abstract*.java</exclude>
-                            <exclude>**/Test*.java</exclude>
-                        </excludes>
-                        <includes>
-                            <include>**/*Test.java</include>
-                        </includes>
-                    </configuration>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.4.3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-verifier-plugin</artifactId>
-                    <version>1.0-beta-1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <dependencies>
-                        <!-- maven-archiver 2.1 is broken... won't allow custom manifestEntires,
need to override until war plugin is updated. -->
-                        <dependency>
-                            <groupId>org.apache.maven</groupId>
-                            <artifactId>maven-archiver</artifactId>
-                            <version>2.2</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>cobertura-maven-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo.jspc</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <version>2.0-alpha-2-SNAPSHOT</version> <!-- FIXME -->
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>ianal-maven-plugin</artifactId>
-                    <version>1.0-alpha-1-SNAPSHOT</version> <!-- FIXME -->
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jaxb2-maven-plugin</artifactId>
-                    <version>1.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>rat-maven-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>selenium-maven-plugin</artifactId>
-                    <version>1.0-beta-3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>shitty-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>sql-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.3.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.0-rc-2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>
                     <execution>
@@ -353,31 +57,14 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <requireMavenVersion>
-                                    <version>[2.0.9,)</version>
-                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
                             </rules>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                            </resourceBundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     
@@ -389,11 +76,10 @@
                 <version>2.4</version>
                 <configuration>
                     <quiet>true</quiet>
-                    <!--
                     <links>
                         <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
                     </links>
-                    -->
+                    <source>1.5</source>
                     <tags>
                         <tag>
                             <name>goal</name>
@@ -443,54 +129,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.4</version>
-                <!--
                 <configuration>
                     <targetJdk>1.5</targetJdk>
                 </configuration>
-                -->
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.4.3</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <quiet>true</quiet>
-                </configuration>
             </plugin>
         </plugins>
     </reporting>
-    
-    <profiles>
-        <profile>
-            <id>stage-distribution</id>
-            <activation>
-                <property>
-                    <name>stageDistributionURL</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <repository>
-                    <id>stage-repository</id>
-                    <url>${stageDistributionURL}/repository</url>
-                </repository>
-                <snapshotRepository>
-                    <id>stage-snapshot-repository</id>
-                    <url>${stageDistributionURL}/snapshot-repository</url>
-                </snapshotRepository>
-                <site>
-                    <id>stage-site</id>
-                    <url>${stageDistributionURL}/site</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-    
+
 </project>
 

Modified: geronimo/genesis/trunk/genesis-flava/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/pom.xml?rev=676543&r1=676542&r2=676543&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-flava/pom.xml Mon Jul 14 03:19:07 2008
@@ -37,6 +37,7 @@
     
     <modules>
         <module>genesis-default-flava</module>
+        <module>genesis-java5-flava</module>
     </modules>
     
 </project>



Mime
View raw message