Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1712 more build and pom cleanup 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@983973 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-08-10 12:54:23 +00:00
parent 0f0c6de652
commit aec11be5f1
12 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
NOTICE.txt
View File

@ -1,29 +1,27 @@
Apache OpenJPA
Copyright 2006-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
OpenJPA includes the persistence and orm schemas from the JPA specifications.
Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
OpenJPA elects to include this software in this distribution under the
CDDL license. You can obtain a copy of the License at:
https://glassfish.dev.java.net/public/CDDL+GPL.html
The source code is available at:
https://glassfish.dev.java.net/source/browse/glassfish/
OpenJPA includes software written by Miroslav Nachev
OpenJPA uses test code written by Charles Tillman.
Apache OpenJPA
Copyright 2006-2010 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
OpenJPA includes the persistence and orm schemas from the JPA specifications.
Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
OpenJPA elects to include this software in this distribution under the
CDDL license. You can obtain a copy of the License at:
https://glassfish.dev.java.net/public/CDDL+GPL.html
The source code is available at:
https://glassfish.dev.java.net/source/browse/glassfish/
OpenJPA includes software written by Miroslav Nachev
OpenJPA uses test code written by Charles Tillman.

1
openjpa-all/pom.xml
View File

@ -31,6 +31,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Aggregate Jar with Dependencies</name>

18
openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
View File

@ -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.
##
Apache License
Version 2.0, January 2004

5
openjpa-examples/pom.xml
View File

@ -31,13 +31,12 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Examples</name>
<description>Apache OpenJPA Examples</description>
<url>http://openjpa.apache.org/samples.html</url>
<description>OpenJPA Examples</description>
<properties>
<openjpa.Log>DefaultLevel=WARN</openjpa.Log>

1
openjpa-integration/examples/pom.xml
View File

@ -40,6 +40,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-examples</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests - Examples</name>

1
openjpa-integration/pom.xml
View File

@ -31,6 +31,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests</name>

1
openjpa-integration/tck/pom.xml
View File

@ -71,6 +71,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-tck</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Integration Tests - JPA TCK</name>

1
openjpa-integration/validation/pom.xml
View File

@ -30,6 +30,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration-validation</artifactId>
<packaging>jar</packaging>
<name>OpenJPA Integration Tests - Bean Validation</name>

9
openjpa-project/BUILDING.txt
View File

@ -14,10 +14,10 @@ website at http://openjpa.apache.org/building-openjpa.html
OpenJPA requires Java 1.6 or later to build, but still supports using
Java SE 5 for runtime even though some features are only available
with Java SE 6.
2. Install the build tool Apache Maven 2.0.9 or later, from:
2. Install the build tool Apache Maven 2.2.1 or later, from:
http://maven.apache.org/
If it is installed correctly, typing mvn -v from the console will result
in the text "Maven version: 2.0.9"
in the text "Maven version: 2.2.1"
3. Extract the source archive if you have not already done so.
The source will create a new directory named:
openjpa-<version>-source. Where <version> is the openjpa
@ -55,7 +55,7 @@ Java(TM) SE Runtime Environment (build 1.6.0_17-b04-248-10M3025)
Java HotSpot(TM) 64-Bit Server VM (build 14.3-b01-101, mixed mode)
$ mvn -v
Maven version: 2.0.10
Maven version: 2.2.1
$ svn --version
svn, version 1.5.5 (r34862)
@ -71,8 +71,7 @@ A trunk/openjpa-lib/src/test/java/org/apache
A trunk/openjpa-lib/src/test/java/org/apache/openjpa
A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib
A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test
A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.
java
A trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
...

6
openjpa-project/NOTICE.txt
View File

@ -5,14 +5,14 @@ Copyright 2006-2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.
The OpenJPA binary assembly includes software developed by the:
Apache Commons Collections project
Apache Commons DBCP project
Apache Commons Lang project
Apache Commons Pool project
Apache Derby project
Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec apis)
Apache Geronimo project (JMS 1.1, JTA 1.1, JPA 2.0 and Bean Validation 1.0 spec apis)
Apache Incubtor - Bean Validation project
SERP project

13
openjpa-project/pom.xml
View File

@ -21,6 +21,18 @@
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 fully signed release with docs, run:
mvn clean deploy -Papache-release,docbook-profile
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>
@ -30,6 +42,7 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>apache-openjpa</artifactId>
<packaging>pom</packaging>
<name>OpenJPA Project Docs and Assemblies</name>

22
pom.xml
View File

@ -208,17 +208,6 @@
<inherited>true</inherited>
<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>
<inherited>true</inherited>
@ -333,17 +322,6 @@
<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>
</plugins>
</build>