cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kolonit...@apache.org
Subject [2/2] cayenne git commit: fix release 4.0.M2 violations 1) rat violations 2) exclude ide specific files
Date Tue, 24 Feb 2015 09:14:59 GMT
fix release 4.0.M2 violations
1) rat violations
2) exclude ide specific files


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7cbb57c9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7cbb57c9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7cbb57c9

Branch: refs/heads/master
Commit: 7cbb57c92049d67912313157200c01084d3b7b1b
Parents: 5ff9ac4
Author: kolonitsky <Alex.Kolonitsky@gmail.com>
Authored: Tue Feb 24 12:13:12 2015 +0300
Committer: kolonitsky <Alex.Kolonitsky@gmail.com>
Committed: Tue Feb 24 12:13:12 2015 +0300

----------------------------------------------------------------------
 .../main/resources/assemblies/assembly-src.xml    |  5 +++++
 .../unsupported_distinct_types/Customer.java      | 18 ++++++++++++++++++
 .../unsupported_distinct_types/Product.java       | 18 ++++++++++++++++++
 .../UnsupportedDistinctTypes.java                 | 18 ++++++++++++++++++
 .../cayenne/tools/dbimport/testOneToOne.sql       | 17 +++++++++++++++++
 pom.xml                                           |  2 --
 6 files changed, 76 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/assembly/src/main/resources/assemblies/assembly-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-src.xml b/assembly/src/main/resources/assemblies/assembly-src.xml
index b0fa665..547cdf4 100644
--- a/assembly/src/main/resources/assemblies/assembly-src.xml
+++ b/assembly/src/main/resources/assemblies/assembly-src.xml
@@ -31,6 +31,11 @@
 				<exclude>eclipse/**</exclude>
 				<exclude>**/target/**</exclude>
 				<exclude>**/derby.log</exclude>
+                <exclude>**/.idea</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.settings</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Customer.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Customer.java
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Customer.java
index 402cd73..248cf35 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Customer.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Customer.java
@@ -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.cayenne.testdo.unsupported_distinct_types;
 
 import org.apache.cayenne.testdo.unsupported_distinct_types.auto._Customer;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Product.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Product.java
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Product.java
index 2cc6ad6..bbd998d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Product.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/Product.java
@@ -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.cayenne.testdo.unsupported_distinct_types;
 
 import org.apache.cayenne.testdo.unsupported_distinct_types.auto._Product;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/UnsupportedDistinctTypes.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/UnsupportedDistinctTypes.java
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/UnsupportedDistinctTypes.java
index cbe5986..9af71d2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/UnsupportedDistinctTypes.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/unsupported_distinct_types/UnsupportedDistinctTypes.java
@@ -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.cayenne.testdo.unsupported_distinct_types;
 
 import org.apache.cayenne.testdo.unsupported_distinct_types.auto._UnsupportedDistinctTypes;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.sql
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.sql
b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.sql
index a279c65..b676ed9 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.sql
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.sql
@@ -1,3 +1,20 @@
+--  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.
+
 CREATE TABLE player (
   id INTEGER NOT NULL,
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/7cbb57c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6eea524..62f0897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -938,8 +938,6 @@
                         <exclude>**/*.html</exclude>
                         <exclude>**/*.css</exclude>
                         <exclude>**/*.driver.xml</exclude>
-                        <exclude>**/testdo/**</exclude>
-                        <exclude>**/test/**/*.sql</exclude>
 
                         <exclude>**/test/**/ks1.jceks</exclude>
                         <exclude>**/test/**/plain.txt</exclude>


Mime
View raw message