Author: dwoods
Date: Wed Jun 30 18:22:34 2010
New Revision: 959399
URL: http://svn.apache.org/viewvc?rev=959399&view=rev
Log:
OPENJPA-1712 Upgrade builds to use https to the Apache hosted Nexus repo
instead of SCP to people.a.o for maven artifacts. Site deploy still requires
SCP to people.a.o.
Modified:
openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.3.x/openjpa-integration/pom.xml
openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.3.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/openjpa-project/pom.xml
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/1.3.x/pom.xml
Modified:
openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
openjpa-all includes software developed by the:
Apache Commons Collections project
Modified: openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/examples/pom.xml Wed Jun 30
18:22:34 2010
@@ -31,17 +31,20 @@
the release plugin.
-->
<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>
- <artifactId>examples</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Integration Tests - Examples</name>
- <description>OpenJPA Integration Tests - Examples</description>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
+ <artifactId>openjpa-integration-examples</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Integration Tests - Examples</name>
+ <description>OpenJPA Integration Tests - Examples</description>
+
<profiles>
<profile>
<id>examples-profile</id>
Modified: openjpa/branches/1.3.x/openjpa-integration/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/pom.xml?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/pom.xml Wed Jun 30 18:22:34 2010
@@ -22,15 +22,19 @@
the release plugin.
-->
<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>
- <artifactId>openjpa-integration</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Integration Tests</name>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
+
+ <artifactId>openjpa-integration</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Integration Tests</name>
+
<modules>
<module>examples</module>
<module>tck</module>
Modified: openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Wed Jun 30 18:22:34
2010
@@ -54,17 +54,33 @@
the release plugin.
-->
<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>
- <artifactId>openjpa-integration-tck</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Integration Tests - JPA TCK</name>
- <description>OpenJPA Integration Tests - JPA TCK</description>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
+ <artifactId>openjpa-integration-tck</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Integration Tests - JPA TCK</name>
+ <description>OpenJPA Integration Tests - JPA TCK</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- Don't publish these artifacts to central -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>tck-profile</id>
Modified:
openjpa/branches/1.3.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa-kernel/src/main/appended-resources/META-INF/NOTICE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
* openjpa-kernel includes software written by Miroslav Nachev
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TypeEntity.java
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.persistence.identity;
import javax.persistence.Entity;
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.persistence.inheritance.entities;
import java.lang.reflect.Constructor;
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.persistence.spring;
import java.util.*;
Modified:
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
======================================
LICENSES FOR INCLUDED DEPENDENCIES
Modified:
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence/src/main/appended-resources/META-INF/NOTICE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
OpenJPA includes the persistence and orm schemas from the JPA specification.
Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
Modified: openjpa/branches/1.3.x/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-project/pom.xml?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-project/pom.xml Wed Jun 30 18:22:34 2010
@@ -21,29 +21,20 @@
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";>
- <!--
- To build the distribution files from project root:
- mvn clean compile package -Dtest=false -DfailIfNoTests=false
-
- To build and deploy a full digned release with docs, run:
-
- mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
-
- Note that to sign the release, you need to have "gpg" installed and
- create a key. See http://apache.org/dev/release-signing.html
- -->
<modelVersion>4.0.0</modelVersion>
- <artifactId>apache-openjpa</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Project Docs and Assemblies</name>
- <description>OpenJPA Project Docs and Assemblies</description>
+
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
+ <artifactId>apache-openjpa</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Project Docs and Assemblies</name>
+ <description>OpenJPA Project Docs and Assemblies</description>
+
<properties>
<openjpa.release.keyAlias>
${[email protected]
Modified:
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/LICENSE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
======================================
LICENSES FOR INCLUDED DEPENDENCIES
Modified:
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/1.3.x/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
Wed Jun 30 18:22:34 2010
@@ -1,3 +1,22 @@
+##
+## 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.
+##
+
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
Modified: openjpa/branches/1.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=959399&r1=959398&r2=959399&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Wed Jun 30 18:22:34 2010
@@ -27,25 +27,24 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>6</version>
+ <version>7</version>
+ <relativePath/>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Parent POM</name>
- <description>Apache OpenJPA implementation of JSR-220 JPA 1.0</description>
- <!--
- Changing this version needs to also be done in all children poms
- See: http://jira.codehaus.org/browse/MNG-624
- -->
<version>1.3.0-SNAPSHOT</version>
+ <description>Apache OpenJPA implementation of JSR-220 JPA 1.0</description>
+
<properties>
- <openjpa.version>${pom.version}</openjpa.version>
+ <openjpa.version>${project.version}</openjpa.version>
<openjpa.Log>DefaultLevel=INFO</openjpa.Log>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+
<site.deploy.url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
<!-- the test settings can be overridden my specific profiles -->
<test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
<test.jvm.maxheapsize>512m</test.jvm.maxheapsize>
@@ -70,11 +69,15 @@
</properties>
<url>http://openjpa.apache.org</url>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/OPENJPA</url>
- </issueManagement>
+
<inceptionYear>2006</inceptionYear>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/branches/1.3.x</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/branches/1.3.x</developerConnection>
+ <url>http://svn.apache.org/repos/asf/openjpa/branches/1.3.x</url>
+ </scm>
+
<mailingLists>
<mailingList>
<name>OpenJPA Developer List</name>
@@ -98,17 +101,18 @@
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-commits/</archive>
</mailingList>
</mailingLists>
- <licenses>
- <license>
- <name>Apache Software License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/OPENJPA</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <site>
+ <id>people.apache.org</id>
+ <url>${site.deploy.url}</url>
+ </site>
+ </distributionManagement>
<modules>
<module>openjpa-lib</module>
@@ -127,15 +131,7 @@
<profiles>
<profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
- <modules>
- <module>openjpa-project</module>
- </modules>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -169,111 +165,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <phase>process-classes</phase>
- <goals><goal>javadoc</goal></goals>
- <configuration>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
-
<subpackages>org.apache.openjpa</subpackages>
- <verbose>false</verbose>
- <maxmemory>512m</maxmemory>
- <links>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-
<link>http://java.sun.com/javaee/5/docs/api</link>
-
<link>http://jakarta.apache.org/commons/collections/api-release</link>
- </links>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy site site-deploy</goals>
- <arguments>-Prelease,docbook-profile</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <!--
- comments are usupported by
- javax.persistence.Persistence
- -->
-
<exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
-
- <!--
- comments are usupported by our rsrc
parser
- -->
- <exclude>**/*.rsrc</exclude>
-
- <!-- General informational files -->
- <exclude>openjpa-project/*.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>BUILDRELEASE</exclude>
- <exclude>scripts/*.list</exclude>
- <exclude>scripts/*.options</exclude>
- <exclude>scripts/*.dict</exclude>
-
- <!-- generated content -->
- <exclude>**/*.log</exclude>
- <exclude>**/rat.txt</exclude>
- <exclude>**/*.txt</exclude>
-
<exclude>**/org.apache.openjpa.revision.properties</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>release.properties</exclude>
- <exclude>**/NOTICE.vm</exclude>
- <exclude>**/LICENSE.vm</exclude>
-
<exclude>**/dependency-reduced-pom.xml</exclude>
-
- <!--
- Exclude internal repository. These
files are
- generated by Maven or only used for
build purposes.
- -->
-
<exclude>**/internal-repository/**</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
@@ -316,29 +207,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals><goal>javadoc</goal></goals>
- <configuration>
- <additionalparam>
- ${javadoc.additionalparam}
- </additionalparam>
- <aggregate>true</aggregate>
-
<subpackages>org.apache.openjpa</subpackages>
-
- <verbose>false</verbose>
- <!-- <linksource>true</linksource> -->
- <maxmemory>512m</maxmemory>
- <links>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-
<link>http://java.sun.com/javaee/5/docs/api</link>
-
<link>http://jakarta.apache.org/commons/collections/api-release</link>
- </links>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -351,103 +219,6 @@
</profile>
<profile>
- <!--
- Apache License check plugin. Run manually with:
- mvn rat:check
- Or add it to the verify phase with:
- mvn verify -Plicense-verify-profile
- -->
- <id>license-verify-profile</id>
- <build>
- <plugins>
- <plugin>
- <!--
- javadoc plugin doesn't copy resources like the normal
jar plugin.
- Unzip license,etc from normal jar and add to javadoc
jar.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc.resources</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- create output dir for nested
parent poms -->
- <mkdir
dir="${project.build.directory}" />
- <unzip
dest="${project.build.directory}/apidocs">
- <patternset>
- <include name="META-INF/*.txt"
/>
- </patternset>
- <fileset
dir="${project.build.directory}">
- <include
name="${artifactId}-${pom.version}.jar" />
- </fileset>
- </unzip>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <!--
- comments are usupported by
- javax.persistence.Persistence
- -->
-
<exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
-
- <!--
- comments are usupported by our rsrc parser
- -->
- <exclude>**/*.rsrc</exclude>
-
- <!-- General informational files -->
- <exclude>openjpa-project/*.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>BUILDRELEASE</exclude>
- <exclude>scripts/*.list</exclude>
- <exclude>scripts/*.options</exclude>
- <exclude>scripts/*.dict</exclude>
-
-
- <!-- generated content -->
- <exclude>**/*.log</exclude>
- <exclude>**/rat.txt</exclude>
- <exclude>**/*.txt</exclude>
-
<exclude>**/org.apache.openjpa.revision.properties</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>release.properties</exclude>
- <exclude>**/NOTICE.vm</exclude>
- <exclude>**/LICENSE.vm</exclude>
-
<exclude>**/dependency-reduced-pom.xml</exclude>
-
- <!--
- Exclude internal repository. These files
are
- generated by Maven or only used for build
purposes.
- -->
- <exclude>**/internal-repository/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>enable-security</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -494,7 +265,6 @@
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize}
-XX:MaxPermSize=${test.jvm.maxpermsize}
-agentlib:jdwp=transport=dt_socket,server=y,address=8000</test.jvm.arguments>
</properties>
</profile>
-
</profiles>
<!-- default versions for dependencies that child modules may include -->
@@ -608,29 +378,70 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
<configuration>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
+ <manifestEntries>
+
<Implementation-Build>${buildNumber}</Implementation-Build>
+ <Specification-Title>JSR-220 Java Persistence
API</Specification-Title>
+ <Specification-Vendor>Sun Microsystems,
Inc.</Specification-Vendor>
+
<Specification-Version>1.0</Specification-Version>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <additionalparam>
+ ${javadoc.additionalparam}
+ </additionalparam>
+ <aggregate>true</aggregate>
+ <subpackages>org.apache.openjpa</subpackages>
+ <verbose>false</verbose>
+ <maxmemory>512m</maxmemory>
+ <links>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+
<link>http://java.sun.com/javaee/5/docs/api</link>
+
<link>http://jakarta.apache.org/commons/collections/api-release</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.5</version>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
<useFile>false</useFile>
@@ -639,89 +450,74 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
+ <configuration>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>offline</revisionOnScmFailure>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
- <!--
- comments are usupported by
- javax.persistence.Persistence
- -->
+ <!-- comments are usupported in services files -->
<exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
-
- <!--
- comments are usupported by our rsrc parser
- -->
+ <!-- comments are usupported by our rsrc parser -->
<exclude>**/*.rsrc</exclude>
-
- <!-- General informational files -->
- <exclude>openjpa-project/*.txt</exclude>
- <exclude>README.txt</exclude>
- <exclude>BUILDRELEASE</exclude>
-
<!-- generated content -->
+ <exclude>**/.*/**</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
<exclude>**/rat.txt</exclude>
- <exclude>**/*.txt</exclude>
-
<exclude>**/org.apache.openjpa.revision.properties</exclude>
- <exclude>**/target/**/*</exclude>
+ <!-- Exclude internal build-only repository -->
+ <exclude>**/internal-repository/**</exclude>
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-jsch</artifactId>
- <version>1.7.0</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
- </plugin>
+ <!-- inherited from apache-7.pom, but need config updates -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy site site-deploy</goals>
+ <arguments>-Papache-release,docbook-profile,test-derby
-DskipTests=true</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -731,9 +527,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
+ <id>process-remote-resources</id>
<goals>
<goal>process</goal>
</goals>
@@ -749,6 +545,17 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if any artifacts are
missing legal files -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -770,12 +577,15 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -784,34 +594,23 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if any artifacts are missing
legal files -->
- <strict>true</strict>
- </configuration>
- </execution>
- </executions>
+ <artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<phase>process-sources</phase>
@@ -850,19 +649,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -887,6 +673,27 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <show>package</show>
+ <quiet>true</quiet>
+ <source>1.5</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/javaee/5/docs/api</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
@@ -896,7 +703,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
<configuration>
<configLocation>${checkstyle.config.location}</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -906,25 +712,4 @@
</plugins>
</reporting>
-
- <distributionManagement>
- <repository>
- <id>local-repository</id>
-
<url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
- </repository>
- <snapshotRepository>
- <id>local-repository</id>
-
<url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- <site>
- <id>people.apache.org</id>
-
<url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-site</url>
- </site>
- </distributionManagement>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/branches/1.3.x</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/branches/1.3.x</developerConnection>
- <url>http://svn.apache.org/repos/asf/openjpa/branches/1.3.x</url>
- </scm>
</project>
