Skip to content

Commit

Permalink
Clean up the pom.xml a bit. Upgrade to Spring 2.5.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Mar 15, 2008
1 parent e6bcff4 commit 5dce0fd
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 103 deletions.
98 changes: 9 additions & 89 deletions symmetric/pom.xml
View file
Expand Up @@ -118,7 +118,7 @@
</distributionManagement>
<properties>
<surefire-report-release-version>2.4</surefire-report-release-version>
<springframework-release-version>2.0.7</springframework-release-version>
<springframework-release-version>2.5.1</springframework-release-version>
<docbook.source>${basedir}/src/docbook</docbook.source>
<docbook.target>${basedir}/target/site/guide</docbook.target>
</properties>
Expand All @@ -137,11 +137,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand All @@ -154,8 +149,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-report-release-version}</version>
<configuration>
<!-- Skip during normal build cycle -->
<skip>true</skip>
<systemProperties>
<property>
<name>javassist-write-dir</name>
Expand All @@ -167,18 +160,6 @@
<value>${user.home}\.symmetricds\lib\ojdbc14.jar</value>
</additionalClasspathElements>
</configuration>
<executions>
<execution>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<groups>continuous</groups>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -199,28 +180,8 @@
<finalName>symmetric-ds-${pom.version}</finalName>
</configuration>
</execution>
<!--
<execution>
<id>src</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>
${basedir}/src/main/assembly/assembly-src.xml
</descriptor>
</descriptors>
<finalName>symmetric-ds-${pom.version}</finalName>
</configuration>
</execution>
-->
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down Expand Up @@ -337,19 +298,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>announcement-generate</goal>
</goals>
<id>announcement-generate</id>
</execution>
</executions>
<configuration />
</plugin>
</plugins>
</build>
<reporting>
Expand Down Expand Up @@ -415,18 +363,6 @@
</plugin>
</plugins>
</reporting>
<repositories>
<repository>
<id>java.net</id>
<url>http://download.java.net/maven/2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<url>http://people.apache.org/repo/m2-snapshot-repository/</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<!-- This pulls in xerces 1.2.3 which causes issues
<dependency>
Expand All @@ -451,22 +387,7 @@
<!-- Spring Framework -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jmx</artifactId>
<artifactId>spring</artifactId>
<version>${springframework-release-version}</version>
</dependency>
<!-- DDLUtils -->
Expand All @@ -479,7 +400,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>net.sourceforge.javawebparts</groupId>
Expand All @@ -492,6 +413,11 @@
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand All @@ -516,6 +442,7 @@
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<version>0.9</version>
<scope>provided</scope>
</dependency>
<!-- Admin GUI -->
<dependency>
Expand All @@ -528,13 +455,6 @@
<artifactId>TableLayout</artifactId>
<version>20050920</version>
</dependency>
<!--
<dependency>
<groupId>net.java.dev.glazedlists</groupId>
<artifactId>glazedlists</artifactId>
<version>1.5.0</version>
</dependency>
-->
<!-- Databases -->
<dependency>
<groupId>org.apache.derby</groupId>
Expand Down
3 changes: 3 additions & 0 deletions symmetric/src/changes/changes.xml
View file
Expand Up @@ -9,6 +9,9 @@
<action dev="chenson42" type="add">
Added a thick client configuration and administration utility application.
</action>
<action dev="chenson42" type="add">
Upgrade to Spring Framework 2.5.1.
</action>
<action dev="chenson42" type="fix" issue="aid=1914242&amp;atid=997724">
The oracle dialect should select from user_objects vs. all_objects to determine if the
package variable has been installed.
Expand Down
2 changes: 1 addition & 1 deletion symmetric/src/shortcuts/Symmetric Compile and Package Only.launch
View file
Expand Up @@ -6,6 +6,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:/mvn.bat}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean eclipse:eclipse package"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dmaven.test.skip=true clean package"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/symmetric}"/>
</launchConfiguration>
3 changes: 2 additions & 1 deletion symmetric/src/shortcuts/Symmetric Eclipse.launch
View file
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/symmetric&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:/mvn.bat}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dwtpversion=1.5 eclipse:eclipse"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="eclipse:clean eclipse:eclipse"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/symmetric}"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion symmetric/src/shortcuts/Symmetric Test And Package.launch
View file
Expand Up @@ -6,6 +6,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:/mvn.bat}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean docbkx:generate-html eclipse:eclipse compile site package integration-test"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="clean install"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/symmetric}"/>
</launchConfiguration>
11 changes: 0 additions & 11 deletions symmetric/src/shortcuts/Symmetric Test.launch
View file

This file was deleted.

0 comments on commit 5dce0fd

Please sign in to comment.