geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r484913 - in /geronimo/server/trunk: applications/console/geronimo-console-standard/pom.xml applications/geronimo-examples/geronimo-jsp-examples/pom.xml configs/webconsole-jetty6/pom.xml configs/webconsole-tomcat/pom.xml pom.xml
Date Sat, 09 Dec 2006 04:52:16 GMT
Author: jbohn
Date: Fri Dec  8 20:52:13 2006
New Revision: 484913

URL: http://svn.apache.org/viewvc?view=rev&rev=484913
Log:
GERONIMO-2536 moved reference to java.net repository to individual components from root pom.xml
Still need to remove dependencies from console configs so they are included when deployed.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=484913&r1=484912&r2=484913
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Fri Dec 
8 20:52:13 2006
@@ -159,11 +159,16 @@
     </build>
     
     <!--
-    HACK: dwr:dwr:jar:1.1.1 is not available on a m2 repo, so include them here
-          to avoid needing to setup an m1 repo which causes problems resolving
-          dependencies.
+    HACK: dwr:dwr:jar:1.1.1 and jstl:jstl:jar:1.2 is not available on a m2 repo, 
+          so include them here to avoid needing to setup an m1 repo which causes 
+          problems resolving dependencies.
     -->
     <repositories>
+        <repository>
+            <id>java.net</id>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
         <repository>
             <id>module-local</id>
             <url>file://${pom.basedir}/repository</url>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=484913&r1=484912&r2=484913
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Fri
Dec  8 20:52:13 2006
@@ -73,4 +73,17 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
+          to avoid needing to setup an m1 repo which causes problems resolving
+          dependencies.
+    -->
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
 </project>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=484913&r1=484912&r2=484913
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Fri Dec  8 20:52:13 2006
@@ -229,4 +229,16 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
+          to avoid needing to setup an m1 repo which causes problems resolving
+          dependencies.
+    -->
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
 </project>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=484913&r1=484912&r2=484913
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Fri Dec  8 20:52:13 2006
@@ -234,4 +234,16 @@
         </plugins>
     </build>
     
+    <!--
+    HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
+          to avoid needing to setup an m1 repo which causes problems resolving
+          dependencies.
+    -->
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=484913&r1=484912&r2=484913
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Dec  8 20:52:13 2006
@@ -1378,12 +1378,6 @@
         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>java.net</id>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
-            <layout>legacy</layout>
-        </repository>
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>



Mime
View raw message