Author: dwoods
Date: Fri Oct 2 14:36:30 2009
New Revision: 821035
URL: http://svn.apache.org/viewvc?rev=821035&view=rev
Log:
fix ASL 2.0 header and change test-mysql profile to test-mysql-slice profile to
keep it from running during the nightly auotmated tests
Modified:
openjpa/trunk/openjpa-slice/pom.xml
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=821035&r1=821034&r2=821035&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Fri Oct 2 14:36:30 2009
@@ -1,17 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the
- NOTICE file distributed with this work for additional information
regarding copyright ownership. The ASF
- licenses this file to you under the Apache License, Version 2.0 (the
"License"); you may not use this file
- except in compliance with the License. You may obtain a copy of the
License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- either express or implied. See the License for the specific language
governing permissions and limitations under
- the License.
- -->
- <!--
- Maven release plugin requires the project tag to be on a single
line.
- -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
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>
@@ -78,27 +86,31 @@
<connection.password />
</properties>
</profile>
+
+ <!-- Sample profile for testing with MySQL DB -->
<profile>
- <id>test-mysql</id>
+ <!-- different id, so this doesn't run during automated testing -->
+ <id>test-mysql-slice</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
- <name>test-mysql</name>
+ <name>test-mysql-slice</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.5</version>
+ <version>${mysql.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
- <connection.driver.name> com.mysql.jdbc.Driver
</connection.driver.name>
+ <mysql.version>5.1.6</mysql.version>
+
<connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
<connection.url>${openjpa.mysql.url}</connection.url>
- <connection.username> ${openjpa.mysql.username}
</connection.username>
- <connection.password> ${openjpa.mysql.password}
</connection.password>
+
<connection.username>${openjpa.mysql.username}</connection.username>
+
<connection.password>${openjpa.mysql.password}</connection.password>
</properties>
</profile>
</profiles>
