http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 7631248..a235aa4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,6 +20,8 @@ </parent> <groupId>org.apache.isis.core</groupId> + <version>0.3.1-SNAPSHOT</version> + <artifactId>isis</artifactId> <packaging>pom</packaging> @@ -71,8 +73,6 @@ <projectUrl>${project.url}</projectUrl> - <!-- number of unapproved licenses --> - <rat.num>0</rat.num> </properties> <scm> @@ -259,6 +259,98 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.8</version> + <configuration> + <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers> + <excludeSubProjects>true</excludeSubProjects> + <excludes> + <exclude>**/target/**</exclude> + <exclude>**/target-ide/**</exclude> + + <exclude>**/*.project</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.settings/**</exclude> + <exclude>**/*.launch</exclude> + <exclude>src/site/resources/ide/eclipse/**</exclude> + + <exclude>**/*.pdn</exclude> + <exclude>**/*.svg</exclude> + <exclude>**/*.json</exclude> + <exclude>**/*.min.js</exclude> + + <exclude>**/*.ucd</exclude> + <exclude>**/*.ucls</exclude> + + <exclude>**/xml/objects/**</exclude> + <exclude>**/test.data</exclude> + + <exclude>**/src/main/appended-resources/supplemental-models.xml</exclude> + </excludes> + <licenses> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>AL2 </licenseFamilyCategory> + <licenseFamilyName>Apache License 2.0</licenseFamilyName> + <notes/> + <patterns> + <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JQRY</licenseFamilyCategory> + <licenseFamilyName>MIT </licenseFamilyName> + <notes/> + <patterns> + <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>JMOCK</licenseFamilyCategory> + <licenseFamilyName>JMock</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 2000-2007, jMock.org</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>DOCBK</licenseFamilyCategory> + <licenseFamilyName>DocBook 4.5</licenseFamilyName> + <notes/> + <patterns> + <pattern>Permission to copy in any form is granted for use</pattern> + <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> + <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern> + <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern> + <pattern>XML Catalog data for DocBook XML V4.5</pattern> + <pattern>DocBook additional general entities V4.5</pattern> + <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> + </patterns> + </license> + <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> + <licenseFamilyCategory>W3C </licenseFamilyCategory> + <licenseFamilyName>XHTML</licenseFamilyName> + <notes/> + <patterns> + <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> + </patterns> + </license> + </licenses> + <licenseFamilies> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>Apache License 2.0</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>MIT</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>JMock</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>DocBook 4.5</familyName> + </licenseFamily> + <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> + <familyName>XHTML</familyName> + </licenseFamily> + </licenseFamilies> + </configuration> </plugin> @@ -808,118 +900,13 @@ archetype includes this explicit dependency. <!-- run using: - mvn org.apache.rat.apache-rat-plugin:check + mvn org.apache.rat:apache-rat-plugin:check --> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <configuration> - <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers> - <excludeSubProjects>true</excludeSubProjects> - <numUnapprovedLicenses>${rat.num}</numUnapprovedLicenses> - <excludes> - <exclude>**/*.project</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/*.launch</exclude> - <exclude>src/site/resources/ide/eclipse/**</exclude> - - <exclude>**/*.java.hsp</exclude> - <exclude>**/*.ucd</exclude> - <exclude>**/*.ucls</exclude> - - <exclude>**/*.svg</exclude> - <exclude>**/*.pdn</exclude> - - <exclude>**/*.json</exclude> - <exclude>**/rat.txt</exclude> - <exclude>**/isis.log</exclude> - <exclude>**/datanucleus.log</exclude> - - <exclude>**/fixture-data</exclude> - <exclude>**/test.data</exclude> - <exclude>**/hsql-db/**</exclude> - - <exclude>**/xml/tmp/**</exclude> - <exclude>**/xml/objects/**</exclude> - <exclude>tmp/tests/**/.xml</exclude> - - <exclude>**/ldap-conf/**</exclude> - - <exclude>**/src/main/resources/resources.txt</exclude> - <exclude>**/src/main/appended-resources/supplemental-models.xml</exclude> - - <exclude>**/*.min.js</exclude> - </excludes> - <licenses> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>AL2 </licenseFamilyCategory> - <licenseFamilyName>Apache License 2.0</licenseFamilyName> - <notes/> - <patterns> - <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JQRY</licenseFamilyCategory> - <licenseFamilyName>MIT </licenseFamilyName> - <notes/> - <patterns> - <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>JMOCK</licenseFamilyCategory> - <licenseFamilyName>JMock</licenseFamilyName> - <notes/> - <patterns> - <pattern>Copyright (c) 2000-2007, jMock.org</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>DOCBK</licenseFamilyCategory> - <licenseFamilyName>DocBook 4.5</licenseFamilyName> - <notes/> - <patterns> - <pattern>Permission to copy in any form is granted for use</pattern> - <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> - <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern> - <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern> - <pattern>XML Catalog data for DocBook XML V4.5</pattern> - <pattern>DocBook additional general entities V4.5</pattern> - <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> - </patterns> - </license> - <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> - <licenseFamilyCategory>W3C </licenseFamilyCategory> - <licenseFamilyName>XHTML</licenseFamilyName> - <notes/> - <patterns> - <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> - </patterns> - </license> - </licenses> - <licenseFamilies> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>Apache License 2.0</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>MIT</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>JMock</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>DocBook 4.5</familyName> - </licenseFamily> - <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> - <familyName>XHTML</familyName> - </licenseFamily> - </licenseFamilies> - </configuration> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/core/profilestore-inmemory/pom.xml ---------------------------------------------------------------------- diff --git a/core/profilestore-inmemory/pom.xml b/core/profilestore-inmemory/pom.xml index d97afc3..fb2f33d 100644 --- a/core/profilestore-inmemory/pom.xml +++ b/core/profilestore-inmemory/pom.xml @@ -26,7 +26,6 @@ <version>0.3.1-SNAPSHOT</version> </parent> - <groupId>org.apache.isis.core</groupId> <artifactId>isis-inmemory-profilestore</artifactId> <name>Isis Core In-memory ProfileStore</name> http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/core/security-noop/pom.xml ---------------------------------------------------------------------- diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml index dcce19e..12a9854 100644 --- a/core/security-noop/pom.xml +++ b/core/security-noop/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-noop-security</artifactId> - <name>Isis No-op Security</name> + <name>Isis Core No-op Security</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/core/src/main/appended-resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/core/src/main/appended-resources/supplemental-models.xml b/core/src/main/appended-resources/supplemental-models.xml new file mode 100644 index 0000000..9a93f2b --- /dev/null +++ b/core/src/main/appended-resources/supplemental-models.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. --> +<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd";> + + <supplement> + <project> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + <licenses> + <license> + <name>Public Domain</name> + </license> + </licenses> + </project> + </supplement> + +</supplementalDataModels> http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/isis-parent/pom.xml ---------------------------------------------------------------------- diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml index 121ba38..24717d1 100644 --- a/isis-parent/pom.xml +++ b/isis-parent/pom.xml @@ -77,8 +77,6 @@ <isis-parent.enforcer.validate>true</isis-parent.enforcer.validate> - <!-- number of unapproved licenses --> - <rat.num>0</rat.num> <!-- override in each module (used by locate global resources) --> <siteBaseDir>.</siteBaseDir> @@ -826,7 +824,6 @@ archetype includes this explicit dependency. <configuration> <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers> <excludeSubProjects>true</excludeSubProjects> - <numUnapprovedLicenses>${rat.num}</numUnapprovedLicenses> <excludes> <exclude>**/*.project</exclude> <exclude>**/.classpath</exclude> http://git-wip-us.apache.org/repos/asf/isis/blob/57858723/tool/maven-plugin/src/main/appended-resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/tool/maven-plugin/src/main/appended-resources/supplemental-models.xml b/tool/maven-plugin/src/main/appended-resources/supplemental-models.xml new file mode 100644 index 0000000..ecd3906 --- /dev/null +++ b/tool/maven-plugin/src/main/appended-resources/supplemental-models.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. --> +<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd";> + + <supplement> + <project> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + <licenses> + <license> + <name>Public Domain</name> + </license> + </licenses> + </project> + </supplement> + + <supplement> + <!-- not quite sure why licenses:download-license flags this, since license info seems to be in its POM --> + <project> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-jodatime</artifactId> + <version>3.1.1</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.scannotation</groupId> + <artifactId>scannotation</artifactId> + <version>1.0.3</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + + <supplement> + <project> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <licenses> + <license> + <name>BSD License</name> + <url>http://dom4j.sourceforge.net/dom4j-1.6.1/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + + <supplement> + <project> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>1.0</version> + <licenses> + <license> + <name>Creative Commons Attribution 2.5 License</name> + <url>http://creativecommons.org/licenses/by/2.5/</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + + + <supplement> + <project> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + </project> + </supplement> + + +</supplementalDataModels>
