geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r786072 - in /geronimo/server/trunk: plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml pom.xml
Date Thu, 18 Jun 2009 14:15:54 GMT
Author: xuhaihong
Date: Thu Jun 18 14:15:53 2009
New Revision: 786072

URL: http://svn.apache.org/viewvc?rev=786072&view=rev
Log:
Temporarily override the plug-in repository in Geronimo's root POM file and update some dependencies.xml
files

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml?rev=786072&r1=786071&r2=786072&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
Thu Jun 18 14:15:53 2009
@@ -88,6 +88,11 @@
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml?rev=786072&r1=786071&r2=786072&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
Thu Jun 18 14:15:53 2009
@@ -88,6 +88,11 @@
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=786072&r1=786071&r2=786072&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jun 18 14:15:53 2009
@@ -2522,7 +2522,7 @@
             </plugins>
         </pluginManagement>
 
-        <!--<plugins>-->
+        <plugins>
         <!--<plugin>-->
         <!--<groupId>org.apache.maven.plugins</groupId>-->
         <!--<artifactId>maven-enforcer-plugin</artifactId>-->
@@ -2549,14 +2549,18 @@
         <!--</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-compiler-plugin</artifactId>
+            <configuration>
+                <optimize>true</optimize>
+                <debug>false</debug>
+                <showDeprecation>false</showDeprecation>
+                <showWarnings>false</showWarnings>
+                <source>1.5</source>
+                <target>1.5</target>
+            </configuration>
+        </plugin>
 
         <!--<plugin>-->
         <!--<groupId>org.apache.maven.plugins</groupId>-->
@@ -2593,7 +2597,7 @@
         <!--</execution>-->
         <!--</executions>-->
         <!--</plugin>-->
-        <!--</plugins>-->
+        </plugins>
     </build>
 
     <reporting>
@@ -2658,7 +2662,27 @@
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/server</url>
         </site>
     </distributionManagement>
-
+    
+    <!--
+        Remove this once the genesis 2.0.1 is released or there is a better solution
+    -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://repository.apache.org/snapshots</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+    
     <profiles>
         <profile>
             <id>default</id>



Mime
View raw message