diff --git a/uimaj-eclipse-feature-runtime/feature.properties b/uimaj-eclipse-feature-runtime/feature.properties deleted file mode 100644 index dd4060919..000000000 --- a/uimaj-eclipse-feature-runtime/feature.properties +++ /dev/null @@ -1,153 +0,0 @@ -# feature.properties -# *************************************************************** -# * 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. -# *************************************************************** -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=UIMA Runtime - -# "description" property - description of the feature -description=This feature packages the UIMA runtime libraries plugin. - -# "providerName" property - name of the company that provides the feature -providerName=Apache Software Foundation - -copyright=\ -Copyright the Apache Software Foundation and others; see License -and NOTICE files.\n - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=uima-eclipse-user-agreement.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=Apache UIMA (TM) Software User Agreement for Eclipse Features and Plugins\n\ -February 4, 2013\n\ -\n\ -Usage Of Content\n\ -\n\ -THE APACHE SOFTWARE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\ -(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND\n\ -CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE\n\ -OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND\n\ -CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the Apache Software Foundation is provided \n\ -tto you under the terms and conditions of the Apache Software License Version 2.0\n\ -("ASL"). A copy of the ASL is provided with this Content and is also available at \n\ -http://www.apache.org/licenses/LICENSE-2.0.html.\n\ -For purposes of the ASL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code, documentation and other files maintained in the \n\ -Apache Software Foundation source code repository ("Repository") in software modules ("Modules") \n\ -and made available as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. \n\ - Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\ - \n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java (TM) ARchive) in a directory named "plugins".\n\ - \n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. \n\ - Each Feature may be packaged as a sub-directory in a directory named "features". \n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins\n\ - and/or Fragments associated with that Feature.\n\ - \n\ - - Features may also include other Features ("Included Features"). \n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts") or "LICENSE" ("Licenses"). \n\ -The terms and conditions governing Features and Included Features should be contained in files named "LICENSE" ("Feature Licenses"). \n\ -Abouts, Licenses and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - \n\ - - Plug-in and Fragment directories\n\ -\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ -\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ -\n\ - - Feature directories\n\ -\n\ -\n\ -Note: if a Feature made available by the Apache Software Foundation is installed using the Provisioning Technology (as defined below), \n\ -you must agree to a license ("Feature Update License") during the installation process. \n\ -If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions \n\ -governing the Included Features or inform you where you can locate them. \n\ -Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions \n\ -(or references to such terms and conditions) that govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE ASL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ - \n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please\n\ -contact the Apache Software Foundation to determine what terms and conditions govern that particular Content.\n\ -\n\ -\n\ -Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse\n\ - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or\n\ - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to\n\ - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at \n\ - http://eclipse.org/equinox/p2/repository_packaging.html\n\ - ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the\n\ - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the\n\ - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology\n\ - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based\n\ - product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be\n\ - accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable\n\ - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target\n\ - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern\n\ - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.\n\ -\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to\n\ -another country, of encryption software. BEFORE using any encryption software, please check the country''s laws, regulations and policies concerning the import,\n\ -possession, or use, and re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\ -Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both. -########### end of license property ########################################## diff --git a/uimaj-eclipse-feature-runtime/feature.xml b/uimaj-eclipse-feature-runtime/feature.xml index 274d0aa45..5915e69a8 100644 --- a/uimaj-eclipse-feature-runtime/feature.xml +++ b/uimaj-eclipse-feature-runtime/feature.xml @@ -18,21 +18,130 @@ under the License. --> + provider-name="Apache Software Foundation"> This feature packages the UIMA runtime libraries plugin. - %copyright + Copyright the Apache Software Foundation and others; see License +and NOTICE files. - - %license + + Apache UIMA (TM) Software User Agreement for Eclipse Features and Plugins +February 4, 2013 + +Usage Of Content + +THE APACHE SOFTWARE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS +(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND +CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE +OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR +NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND +CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. + + +Applicable Licenses + +Unless otherwise indicated, all Content made available by the Apache Software Foundation is provided +tto you under the terms and conditions of the Apache Software License Version 2.0 +("ASL"). A copy of the ASL is provided with this Content and is also available at +http://www.apache.org/licenses/LICENSE-2.0.html. +For purposes of the ASL, "Program" will mean the Content. + +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the +Apache Software Foundation source code repository ("Repository") in software modules ("Modules") +and made available as downloadable archives ("Downloads"). + + - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. + Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). + + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java (TM) ARchive) in a directory named "plugins". + + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. + Each Feature may be packaged as a sub-directory in a directory named "features". + Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature. + + - Features may also include other Features ("Included Features"). + Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features. + + +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts") or "LICENSE" ("Licenses"). +The terms and conditions governing Features and Included Features should be contained in files named "LICENSE" ("Feature Licenses"). +Abouts, Licenses and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations: + + - The top-level (root) directory + + - Plug-in and Fragment directories + + - Inside Plug-ins and Fragments packaged as JARs + + - Sub-directories of the directory named "src" of certain Plug-ins + + - Feature directories + + +Note: if a Feature made available by the Apache Software Foundation is installed using the Provisioning Technology (as defined below), +you must agree to a license ("Feature Update License") during the installation process. +If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions +governing the Included Features or inform you where you can locate them. +Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions +(or references to such terms and conditions) that govern your use of the associated Content in that directory. + +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE ASL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): + + - Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html) + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE) + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html) + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html) + +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Apache Software Foundation to determine what terms and conditions govern that particular Content. + + +Use of Provisioning Technology + +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at + http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification"). + +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following: + + 1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product. + 2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine. + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software. + + +Cryptography + +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to +another country, of encryption software. BEFORE using any encryption software, please check the country''s laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if this is permitted. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both. +Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both. diff --git a/uimaj-eclipse-feature-runtime/pom.xml b/uimaj-eclipse-feature-runtime/pom.xml index 4cdbcdd96..2ae113b6f 100644 --- a/uimaj-eclipse-feature-runtime/pom.xml +++ b/uimaj-eclipse-feature-runtime/pom.xml @@ -29,7 +29,7 @@ ../uimaj-parent/pom.xml - org.apache.uima.runtime.feature.group + org.apache.uima.runtime eclipse-feature Apache UIMA Eclipse: ${project.artifactId} @@ -38,10 +38,6 @@ need UIMA framework code ${uimaWebsiteUrl} - - 2.7.2 - - org.apache.uima @@ -49,24 +45,4 @@ 3.3.0-SNAPSHOT - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - consider - - - - \ No newline at end of file diff --git a/uimaj-eclipse-feature-tools/feature.properties b/uimaj-eclipse-feature-tools/feature.properties deleted file mode 100644 index 0e4226b04..000000000 --- a/uimaj-eclipse-feature-tools/feature.properties +++ /dev/null @@ -1,156 +0,0 @@ -# feature.properties -# *************************************************************** -# * 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. -# *************************************************************** -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=UIMA Tools (includes Runtime) - -# "description" property - description of the feature -description=This feature contains a debug structure handler plugin, the Component\n\ -Descriptor Editor (a forms-based editor for creating and editing\n\ -the XML descriptors used by UIMA), the JCas generation capability,\n\ -a CAS Editor, the Launcher, and the PEAR packaging capability. - -# "providerName" property - name of the company that provides the feature -providerName=Apache Software Foundation - -copyright=\ -Copyright the Apache Software Foundation and others; see License -and NOTICE files.\n - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=uima-eclipse-user-agreement.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=Apache UIMA (TM) Software User Agreement for Eclipse Features and Plugins\n\ -February 4, 2013\n\ -\n\ -Usage Of Content\n\ -\n\ -THE APACHE SOFTWARE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\ -(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND\n\ -CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE\n\ -OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND\n\ -CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the Apache Software Foundation is provided \n\ -tto you under the terms and conditions of the Apache Software License Version 2.0\n\ -("ASL"). A copy of the ASL is provided with this Content and is also available at \n\ -http://www.apache.org/licenses/LICENSE-2.0.html.\n\ -For purposes of the ASL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code, documentation and other files maintained in the \n\ -Apache Software Foundation source code repository ("Repository") in software modules ("Modules") \n\ -and made available as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. \n\ - Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\ - \n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java (TM) ARchive) in a directory named "plugins".\n\ - \n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. \n\ - Each Feature may be packaged as a sub-directory in a directory named "features". \n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins\n\ - and/or Fragments associated with that Feature.\n\ - \n\ - - Features may also include other Features ("Included Features"). \n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts") or "LICENSE" ("Licenses"). \n\ -The terms and conditions governing Features and Included Features should be contained in files named "LICENSE" ("Feature Licenses"). \n\ -Abouts, Licenses and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - \n\ - - Plug-in and Fragment directories\n\ -\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ -\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ -\n\ - - Feature directories\n\ -\n\ -\n\ -Note: if a Feature made available by the Apache Software Foundation is installed using the Provisioning Technology (as defined below), \n\ -you must agree to a license ("Feature Update License") during the installation process. \n\ -If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions \n\ -governing the Included Features or inform you where you can locate them. \n\ -Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.\n\ -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions \n\ -(or references to such terms and conditions) that govern your use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE ASL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ - \n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please\n\ -contact the Apache Software Foundation to determine what terms and conditions govern that particular Content.\n\ -\n\ -\n\ -Use of Provisioning Technology\n\ -\n\ -The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse\n\ - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or\n\ - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to\n\ - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at \n\ - http://eclipse.org/equinox/p2/repository_packaging.html\n\ - ("Specification").\n\ -\n\ -You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the\n\ - applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ - in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the\n\ - Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:\n\ -\n\ - 1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology\n\ - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based\n\ - product.\n\ - 2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be\n\ - accessed and copied to the Target Machine.\n\ - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable\n\ - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target\n\ - Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern\n\ - the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ - indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.\n\ -\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to\n\ -another country, of encryption software. BEFORE using any encryption software, please check the country''s laws, regulations and policies concerning the import,\n\ -possession, or use, and re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\ -Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both. -########### end of license property ########################################## diff --git a/uimaj-eclipse-feature-tools/feature.xml b/uimaj-eclipse-feature-tools/feature.xml index 0da210f8a..690fd9804 100644 --- a/uimaj-eclipse-feature-tools/feature.xml +++ b/uimaj-eclipse-feature-tools/feature.xml @@ -18,21 +18,133 @@ under the License. --> + provider-name="Apache Software Foundation"> - %description + This feature contains a debug structure handler plugin, the Component +Descriptor Editor (a forms-based editor for creating and editing +the XML descriptors used by UIMA), the JCas generation capability, +a CAS Editor, the Launcher, and the PEAR packaging capability. - %copyright + Copyright the Apache Software Foundation and others; see License +and NOTICE files. - - %license + + Apache UIMA (TM) Software User Agreement for Eclipse Features and Plugins +February 4, 2013 + +Usage Of Content + +THE APACHE SOFTWARE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS +(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND +CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE +OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR +NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND +CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. + + +Applicable Licenses + +Unless otherwise indicated, all Content made available by the Apache Software Foundation is provided +tto you under the terms and conditions of the Apache Software License Version 2.0 +("ASL"). A copy of the ASL is provided with this Content and is also available at +http://www.apache.org/licenses/LICENSE-2.0.html. +For purposes of the ASL, "Program" will mean the Content. + +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the +Apache Software Foundation source code repository ("Repository") in software modules ("Modules") +and made available as downloadable archives ("Downloads"). + + - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. + Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). + + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java (TM) ARchive) in a directory named "plugins". + + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. + Each Feature may be packaged as a sub-directory in a directory named "features". + Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature. + + - Features may also include other Features ("Included Features"). + Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features. + + +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts") or "LICENSE" ("Licenses"). +The terms and conditions governing Features and Included Features should be contained in files named "LICENSE" ("Feature Licenses"). +Abouts, Licenses and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations: + + - The top-level (root) directory + + - Plug-in and Fragment directories + + - Inside Plug-ins and Fragments packaged as JARs + + - Sub-directories of the directory named "src" of certain Plug-ins + + - Feature directories + + +Note: if a Feature made available by the Apache Software Foundation is installed using the Provisioning Technology (as defined below), +you must agree to a license ("Feature Update License") during the installation process. +If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions +governing the Included Features or inform you where you can locate them. +Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions +(or references to such terms and conditions) that govern your use of the associated Content in that directory. + +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE ASL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): + + - Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html) + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE) + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html) + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html) + +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Apache Software Foundation to determine what terms and conditions govern that particular Content. + + +Use of Provisioning Technology + +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at + http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification"). + +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following: + + 1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product. + 2. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine. + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software. + + +Cryptography + +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to +another country, of encryption software. BEFORE using any encryption software, please check the country''s laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if this is permitted. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both. +Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both. diff --git a/uimaj-eclipse-feature-tools/pom.xml b/uimaj-eclipse-feature-tools/pom.xml index 94a7f1de5..634f75311 100644 --- a/uimaj-eclipse-feature-tools/pom.xml +++ b/uimaj-eclipse-feature-tools/pom.xml @@ -29,21 +29,17 @@ ../uimaj-parent/pom.xml - org.apache.uima.tools.feature.group + org.apache.uima.tools eclipse-feature Apache UIMA Eclipse: ${project.artifactId} UIMA Eclipse Plugin Feature for base uima tooling ${uimaWebsiteUrl} - - 2.7.2 - - org.apache.uima - org.apache.uima.runtime.feature.group + org.apache.uima.runtime 3.3.0-SNAPSHOT @@ -81,27 +77,5 @@ uimaj-ep-launcher 3.3.0-SNAPSHOT - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - consider - - - - - \ No newline at end of file diff --git a/uimaj-eclipse-update-site/category.xml b/uimaj-eclipse-update-site/category.xml index 8581b9b2c..4bf11cccf 100644 --- a/uimaj-eclipse-update-site/category.xml +++ b/uimaj-eclipse-update-site/category.xml @@ -20,10 +20,10 @@ *************************************************************** --> - + - + diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 74eceb720..2c5a3a21f 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -39,12 +39,12 @@ org.apache.uima - org.apache.uima.runtime.feature.group + org.apache.uima.runtime 3.3.0-SNAPSHOT org.apache.uima - org.apache.uima.tools.feature.group + org.apache.uima.tools 3.3.0-SNAPSHOT diff --git a/uimaj-ep-runtime/pom.xml b/uimaj-ep-runtime/pom.xml index e83c61db3..f68c59cdb 100644 --- a/uimaj-ep-runtime/pom.xml +++ b/uimaj-ep-runtime/pom.xml @@ -196,7 +196,9 @@ org.apache.vinci.transport.vns.service - org.slf4j*, + + org.slf4j*, + com.apple.eio;resolution:=optional, !com.strobel.assembler, !com.strobel.assembler.metadata, !com.strobel.decompiler, diff --git a/uimaj-maven-p2-site/pom.xml b/uimaj-maven-p2-site/pom.xml index fd2d9ea38..b38be8964 100644 --- a/uimaj-maven-p2-site/pom.xml +++ b/uimaj-maven-p2-site/pom.xml @@ -52,6 +52,8 @@ true false + false + false diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index b22967557..6889342ce 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -131,7 +131,8 @@ - 2.7.2 + + 2.7.0