Re: svn commit: r885573 - in /openjpa/trunk: openjpa-all/ openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ openjpa-osgi/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/ openjpa-persistence-jdbc/src/test/java/org/apache/open...

Mon, 30 Nov 2009 13:05:08 -0800 

Yep, it included some openjpa-osgi updates....

Will take a look at undoing/redoing.  Thanks.


-Donald


Craig L Russell wrote:

Hi Donald,
Seems your commit picked up some non-license related issues. Was this intentional? 

Craig

On Nov 30, 2009, at 12:08 PM, [email protected] wrote:


Author: dwoods
Date: Mon Nov 30 20:08:15 2009
New Revision: 885573

URL: http://svn.apache.org/viewvc?rev=885573&view=rev
Log:
add missing or incorrect license headers found by rat plugin

Modified:
   openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java 
   openjpa/trunk/openjpa-osgi/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartionedDataCache.java openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java 
   openjpa/trunk/openjpa/pom.xml

Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== 
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Mon Nov 30 20:08:15 2009
@@ -106,11 +106,11 @@
            <artifactId>openjpa</artifactId>
            <version>${pom.version}</version>
        </dependency>
-        <!-- Need to manually add back optional openjpa-jdbc depends -->
+
+        <!-- Optional openjpa-jdbc depends you may need...
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
-            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
@@ -126,7 +126,6 @@
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
-            <scope>compile</scope>
            <optional>true</optional>
            <exclusions>
                <exclusion>
@@ -139,6 +138,14 @@
                </exclusion>
            </exclusions>
        </dependency>
-        <!-- end optional openjpa-jdbc depends -->
+        end optional openjpa-jdbc depends -->
+
+        <!-- Optional Bean Validation depends
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+            <optional>true</optional>
+        </dependency>
+        end optional validation depends -->
    </dependencies>
</project>
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheDistributionPolicy.java Mon Nov 30 20:08:15 2009 
@@ -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.datacache;

import org.apache.openjpa.kernel.OpenJPAStateManager;

Modified: openjpa/trunk/openjpa-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-osgi/pom.xml?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== 
--- openjpa/trunk/openjpa-osgi/pom.xml (original)
+++ openjpa/trunk/openjpa-osgi/pom.xml Mon Nov 30 20:08:15 2009
@@ -246,7 +246,7 @@
        <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
        </dependency>
    </dependencies>
</project>
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java Mon Nov 30 20:08:15 2009 
@@ -7,7 +7,7 @@
 * "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/LICENSE2.0
+ * 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
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartionedDataCache.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartionedDataCache.java?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartionedDataCache.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartionedDataCache.java Mon Nov 30 20:08:15 2009 
@@ -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.datacache;

import org.apache.openjpa.datacache.CacheDistributionPolicy;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocation.java Mon Nov 30 20:08:15 2009 
@@ -7,7 +7,7 @@
 * "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/LICENSE2.0
+ * 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
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java Mon Nov 30 20:08:15 2009 
@@ -7,7 +7,7 @@
 * "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/LICENSE2.0
+ * 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

Modified: openjpa/trunk/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=885573&r1=885572&r2=885573&view=diff ============================================================================== 
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Mon Nov 30 20:08:15 2009
@@ -197,5 +197,12 @@
            <artifactId>openjpa-slice</artifactId>
            <version>${pom.version}</version>
        </dependency>
+        <!-- Need to manually add back optional validation depends -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- end optional validation depends -->
    </dependencies>
</project>




Craig L Russell
Architect, Sun Java Enterprise System http://db.apache.org/jdo
408 276-5638 mailto:[email protected]
P.S. A good JDO? O, Gasp!

Reply via email to