geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r492615 - in /geronimo/daytrader/branches/1.2: modules/ejb/pom.xml pom.xml
Date Thu, 04 Jan 2007 15:44:01 GMT
Author: hogstrom
Date: Thu Jan  4 07:44:01 2007
New Revision: 492615

URL: http://svn.apache.org/viewvc?view=rev&rev=492615
Log:
Updating POMs with new info to prepare for a release of 1.2

Modified:
    geronimo/daytrader/branches/1.2/modules/ejb/pom.xml
    geronimo/daytrader/branches/1.2/pom.xml

Modified: geronimo/daytrader/branches/1.2/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/1.2/modules/ejb/pom.xml?view=diff&rev=492615&r1=492614&r2=492615
==============================================================================
--- geronimo/daytrader/branches/1.2/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/branches/1.2/modules/ejb/pom.xml Thu Jan  4 07:44:01 2007
@@ -46,18 +46,22 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: geronimo/daytrader/branches/1.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/1.2/pom.xml?view=diff&rev=492615&r1=492614&r2=492615
==============================================================================
--- geronimo/daytrader/branches/1.2/pom.xml (original)
+++ geronimo/daytrader/branches/1.2/pom.xml Thu Jan  4 07:44:01 2007
@@ -21,6 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>project-config</artifactId>
+        <version>1.1</version>
+    </parent>
+    
     <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader</artifactId>
     <name>DayTrader :: Performance Benchmark Sample</name>
@@ -29,7 +36,7 @@
     <description>J2EE 1.4 Performance Benchmark Sample Application</description>
     <issueManagement>
         <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/GERONIMO</url>
+        <url>http://issues.apache.org/jira/browse/DAYTRADER</url>
     </issueManagement>
     <ciManagement>
         <system>continuum</system>
@@ -100,9 +107,9 @@
     </contributors>
     <dependencies/>
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/gbuild/trunk/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/branches/1.2/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/branches/1.2/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/branches/1.2/</url>
     </scm>
     <organization>
         <name>Apache Software Foundation</name>
@@ -154,6 +161,18 @@
                 <scope>provided</scope>
             </dependency>
             <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-all</artifactId>
+                <version>0.9.6-incubating</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.3</version>
@@ -165,8 +184,91 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <profiles>
+    <build>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>validate-java-version</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>require-java-version</goal>
+                        </goals>
+                        <configuration>
+                            <version>1.5*</version>
+                        </configuration>
+                    </execution>
+
+                    <!--
+                    NOTE: This will copy LICENSE.txt and NOTICE.txt to classes/META-INF.
 
+                          Its a itty-bitty HACK to avoid adding resource definitions to
+                          the build, which causes the Eclipse plugin to generate invalid
+                          .classpath files. :-(
+                    -->
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-legal-files</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <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-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.5</jdkName>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <tagBase>https://svn.apache.org/repos/asf/geronimo/daytrader/tags</tagBase>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <repositories>
+        <!--
+        NOTE: The default repositories are picked up by Genesis, but need to
+              specify where Genesis lives to pick it up + any additional repositories.
+        -->
+        <repository>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
+    <profiles>
         <profile>
             <id>db2</id>
             <activation>



Mime
View raw message