You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/11/07 16:34:54 UTC
svn commit: r1768549 - in /uima/uimaj/branches/experiment-v3-jcas/src/main:
assembly/bin.xml bin_distr_license_notices/
bin_distr_license_notices/LICENSE license_notice_research.txt readme/
Author: schor
Date: Mon Nov 7 16:34:54 2016
New Revision: 1768549
URL: http://svn.apache.org/viewvc?rev=1768549&view=rev
Log:
[UIMA-5172] update assembly for new project, rename bin lic/notice dir
Added:
uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/
- copied from r1768546, uima/uimaj/branches/experiment-v3-jcas/src/main/readme/
uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt
Removed:
uima/uimaj/branches/experiment-v3-jcas/src/main/readme/
Modified:
uima/uimaj/branches/experiment-v3-jcas/src/main/assembly/bin.xml
uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/assembly/bin.xml?rev=1768549&r1=1768548&r2=1768549&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/assembly/bin.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/assembly/bin.xml Mon Nov 7 16:34:54 2016
@@ -162,6 +162,18 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.apache.uima:uimaj-v3migration-jcas</include>
+ </includes>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </dependencySet>
+
<!-- Copy each eclipse plugin into the /eclipsePlugins dir of the distribution -->
<dependencySet>
@@ -261,6 +273,13 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+ <fileSet>
+ <directory>uima-docbook-v3-users-guide/target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
<!-- examples -->
<fileSet>
@@ -299,12 +318,12 @@ under the License.
<files>
<!-- copy bin distr license and notice -->
<file>
- <source>src/main/readme/LICENSE</source>
+ <source>src/main/bin_distr_license_notices/LICENSE</source>
<outputDirectory></outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
- <source>src/main/readme/NOTICE</source>
+ <source>src/main/bin_distr_license_notices/NOTICE</source>
<outputDirectory></outputDirectory>
<fileMode>644</fileMode>
</file>
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE?rev=1768549&r1=1768546&r2=1768549&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE Mon Nov 7 16:34:54 2016
@@ -234,4 +234,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVI
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Added: uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt?rev=1768549&view=auto
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt (added)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt Mon Nov 7 16:34:54 2016
@@ -0,0 +1,28 @@
+ 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 file documents research done on license and notices
+
+November 3 2016
+ Procyon-core and procyon-compilertools licenses are Apache v2 per maven central pom for version 0.5.32
+ Jars have no info in their manifest
+ source has Apache license file, no notice file
+
+ Note: ASM not depended on (Nov 2016). ASM is licensed under a BSD 3-clause style license.
+
+
+
\ No newline at end of file