Anonymous avatar Anonymous committed 9ff1836

Build fixes
o updated maven repo directory for CI builds
o updated pom.xml to match proper SCM locations

Updated ivy/maven deps to Spring 1.2.9

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2@1454 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (3)

         <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar"/>
         <copy file="${build}/${name}-src-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-src-${version}-SNAPSHOT.jar"/>
 
+        <copy file="pom.xml" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/poms/${name}-${version}-SNAPSHOT.pom" overwrite="true"/>
+        <copy file="${build}/${name}-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
+        <copy file="${build}/${name}-src-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-src-${version}-SNAPSHOT.jar" overwrite="true"/>
+
         <!-- xwork-tiger -->
         <copy file="tiger/pom.xml" tofile="/opt/repository/ibiblio.org/opensymphony/poms/${name}-tiger-${version}-SNAPSHOT.pom"/>
         <copy file="${build}/${name}-tiger-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-tiger-${version}-SNAPSHOT.jar"/>
         <copy file="${build}/${name}-tiger-src-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-tiger-src-${version}-SNAPSHOT.jar"/>
+
+
+        <copy file="pom.xml" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/poms/${name}-tiger-${version}-SNAPSHOT.pom" overwrite="true"/>
+        <copy file="${build}/${name}-tiger-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-tiger-${version}-SNAPSHOT.jar" overwrite="true"/>
+        <copy file="${build}/${name}-tiger-src-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-tiger-src-${version}-SNAPSHOT.jar" overwrite="true"/>
     </target>
 
     <macrodef name="run-tiger-junit">
         </mailingList>
     </mailingLists>
     <scm>
-        <connection>:pserver:[username]@cvs.dev.java.net:/cvs/xwork</connection>
-        <url>https://xwork.dev.java.net/source/browse/xwork/</url>
+        <connection>scm:svn:http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2</connection>
+        <developerConnection>
+            scm:svn:https://svn.opensymphony.com/svn/xwork/branches/xwork_1-2
+        </developerConnection>
+        <url>https://svn.opensymphony.com/svn/xwork/branches/xwork_1-2</url>
     </scm>
     <licenses>
         <license>
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <!--version>2.2</version-->
+                <executions>
+                    <execution>
+                        <id>attach-source</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <sourcepath>src/java</sourcepath>
+                    <encoding>UTF-8</encoding>
+                    <groups>
+                        <group>
+                            <title>XWork Packages</title>
+                            <packages>com.opensymphony.xwork2*</packages>
+                        </group>
+                    </groups>
+                    <show>private</show>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+                        <link>http://logging.apache.org/log4j/docs/api/</link>
+                    </links>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-source</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
+	<defaultGoal>install</defaultGoal>
     </build>
     <dependencies>
         <dependency>
             <artifactId>commons-logging</artifactId>
             <version>1.0.4</version>
         </dependency>
+       <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>ognl</artifactId>
+            <version>2.6.11</version>
+        </dependency>
         <dependency>
             <groupId>org.rifers</groupId>
             <artifactId>rife-continuations</artifactId>
             <version>2.2.4</version>
         </dependency>
         <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>ognl</artifactId>
-            <version>2.6.11</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>Maven Snapshots</id>
+            <url>http://snapshots.maven.codehaus.org/maven2/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
         </mailingList>
     </mailingLists>
     <scm>
-        <connection>:pserver:[username]@cvs.dev.java.net:/cvs/xwork/tiger</connection>
-        <url>https://xwork.dev.java.net/source/browse/xwork/tiger</url>
+        <connection>scm:svn:http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2/tiger</connection>
+        <developerConnection>
+            scm:svn:https://svn.opensymphony.com/svn/xwork/branches/xwork_1-2/tiger
+        </developerConnection>
+        <url>https://svn.opensymphony.com/svn/xwork/branches/xwork_1-2/tiger</url>
     </scm>
     <licenses>
         <license>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.