You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/07/12 22:53:58 UTC
[05/21] isis git commit: ISIS-1335: fixing RAT issues for archetype
ISIS-1335: fixing RAT issues for archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/73e657c4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/73e657c4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/73e657c4
Branch: refs/heads/master
Commit: 73e657c47b68048f2f3db06c39c43eb5ba6c6c10
Parents: 58eb2cd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 8 06:30:06 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 8 06:33:07 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 9 +++++++++
example/application/simpleapp/dom/build.gradle | 19 +++++++++++++++++++
example/application/simpleapp/dom/layouts.gradle | 19 +++++++++++++++++++
.../application/simpleapp/dom/liveReload.gradle | 19 +++++++++++++++++++
example/application/simpleapp/pom.xml | 2 +-
.../projects/basic/archetype.properties | 5 -----
.../src/test/resources/projects/basic/goal.txt | 0
7 files changed, 67 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6564bf4..7ae6ee3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -485,6 +485,8 @@
<exclude>**/test.data</exclude>
<exclude>**/fixture-data/**</exclude>
+ <exclude>**/application.js</exclude>
+
<exclude>**/jquery.zclip.js</exclude>
<exclude>**/bootstrap-growl.js</exclude>
<exclude>**/moment.js</exclude>
@@ -497,6 +499,13 @@
<exclude>**/src/main/appended-resources/supplemental-models.xml</exclude>
<exclude>**/datanucleus.log</exclude>
+ <exclude>**/gradle/wrapper/gradle-wrapper.properties</exclude>
+ <exclude>**/gradlew</exclude>
+ <exclude>**/gradlew.bat</exclude>
+ <exclude>**/rebel.xml</exclude>
+ <exclude>**/translations**.po</exclude>
+ <exclude>**/integtests/translations.pot</exclude>
+ <exclude>**/intellij/launch/*.xml</exclude>
</excludes>
<licenses>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/dom/build.gradle
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/build.gradle b/example/application/simpleapp/dom/build.gradle
index 97b290d..bc75138 100644
--- a/example/application/simpleapp/dom/build.gradle
+++ b/example/application/simpleapp/dom/build.gradle
@@ -1,5 +1,24 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
+// 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.
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
// this gradle script compiles and enhances the dom classes.
//
// The script is intended to be used in conjunction with IntelliJ IDEA, to remove the necessity to run the DataNucleus
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/dom/layouts.gradle
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/layouts.gradle b/example/application/simpleapp/dom/layouts.gradle
index 7fa9267..f5fa30d 100644
--- a/example/application/simpleapp/dom/layouts.gradle
+++ b/example/application/simpleapp/dom/layouts.gradle
@@ -1,5 +1,24 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
+// 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.
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
// This gradle script copies over .layout.xml files from src to target directory.
//
// This script is intended to be used while the app is running (in prototype mode), reducing the turn-around time
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/dom/liveReload.gradle
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/liveReload.gradle b/example/application/simpleapp/dom/liveReload.gradle
index 579c417..adb0ab1 100644
--- a/example/application/simpleapp/dom/liveReload.gradle
+++ b/example/application/simpleapp/dom/liveReload.gradle
@@ -1,5 +1,24 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
+// 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.
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
// This gradle script sets up livereload, configured so that any updates to the dom module's classpath will
// trigger the browser to reload the page. In particular, this relates to the .layout.xml files which define the
// grid layout of domain objects.
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index d3c1e53..0b9206c 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.13.0-SNAPSHOT</isis.version>
+ <isis.version>1.13.0</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index ebf04d9..0000000
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Jul 08 06:19:21 BST 2016
-package=it.pkg
-version=0.1-SNAPSHOT
-groupId=archetype.it
-artifactId=basic
http://git-wip-us.apache.org/repos/asf/isis/blob/73e657c4/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt b/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29..0000000