Skip to content

Commit

Permalink
Merge pull request #414 from apache/refactoring/393-Include-uimaFIT-a…
Browse files Browse the repository at this point in the history 
…rtifacts-in-binary-distribution

Issue #393: Include uimaFIT artifacts in binary distribution
  • Loading branch information
@reckart
reckart authored Nov 18, 2024
2 parents 4c2843b + 0e04530 commit 146d723
Show file tree
Hide file tree
Showing 7 changed files with 255 additions and 12 deletions.
56 changes: 51 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,38 @@
<artifactId>uimaj-cpe</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-document-annotation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-json</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-cpe</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-cas-editor</artifactId>
Expand Down Expand Up @@ -129,11 +151,6 @@
<artifactId>uimaj-ep-launcher</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-json</artifactId>
<version>${project.version}</version>
</dependency>

<!-- BEGIN: uimaj-v3migration-jcas -->
<!-- These can be removed when we remove the migration module -->
Expand Down Expand Up @@ -180,6 +197,35 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
44 changes: 44 additions & 0 deletions src/main/assembly/bin-without-jackson.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,30 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.uima:uimafit-core</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uimafit-core.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.uima:uimafit-cpe</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uimafit-cpe.jar</outputFileNameMapping>
<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>
Expand Down Expand Up @@ -179,6 +203,14 @@ under the License.
<include>org.slf4j:slf4j-api</include>
<!-- hook to built-in Java backend for slf4j included -->
<include>org.slf4j:slf4j-jdk14</include>
<include>commons-io:commons-io</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-jcl/5.3.39/spring-jcl-5.3.39.jar</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
Expand Down Expand Up @@ -305,6 +337,18 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>uimafit-core/api-change-report</directory>
<outputDirectory>uimafit-core/api-change-report</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>uimafit-cpe/api-change-report</directory>
<outputDirectory>uimafit-cpe/api-change-report</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
</fileSets>

<files>
Expand Down
44 changes: 44 additions & 0 deletions src/main/assembly/bin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,30 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.uima:uimafit-core</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uimafit-core.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</dependencySet>
<dependencySet>
<includes>
<include>org.apache.uima:uimafit-cpe</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uimafit-cpe.jar</outputFileNameMapping>
<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>
Expand Down Expand Up @@ -180,6 +204,14 @@ under the License.
<include>org.slf4j:slf4j-api</include>
<!-- hook to built-in Java backend for slf4j included -->
<include>org.slf4j:slf4j-jdk14</include>
<include>commons-io:commons-io</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-jcl</include>
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
Expand Down Expand Up @@ -306,6 +338,18 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>uimafit-core/api-change-report</directory>
<outputDirectory>uimafit-core/api-change-report</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>uimafit-cpe/api-change-report</directory>
<outputDirectory>uimafit-cpe/api-change-report</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
</fileSets>

<files>
Expand Down
60 changes: 54 additions & 6 deletions src/main/bin_distr_license_notices/LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,14 @@
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 product contains icons from the SVG Icons project http://svgicons.sourceforge.net/. The icons are licensed under the BSD
license, but the actual license text is not provided by the SVG Icons project. Here's the generic
BSD license template.
===============================================================================

This product contains icons from the SVG Icons project
http://svgicons.sourceforge.net/.

The icons are licensed under the BSD license, but the actual license text is
not provided by the SVG Icons project. Here's the generic BSD license template.

BSD License

Expand Down Expand Up @@ -236,7 +239,7 @@ 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.

====================================================================================================
===============================================================================

This product contains SLF4J, licensed and distributed under the MIT license:

Expand All @@ -261,4 +264,49 @@ Copyright (c) 2004-2017 QOS.ch
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.




Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>


>>> CGLIB 3.3 (cglib:cglib:3.3):

Per the LICENSE file in the CGLIB JAR distribution downloaded from
https://github.com/cglib/cglib/releases/download/RELEASE_3_3_0/cglib-3.3.0.jar,
CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which
is included above.


>>> Objenesis 3.2 (org.objenesis:objenesis:3.2):

Per the LICENSE file in the Objenesis ZIP distribution downloaded from
http://objenesis.org/download.html, Objenesis 3.2 is licensed under the
Apache License, version 2.0, the text of which is included above.

Per the NOTICE file in the Objenesis ZIP distribution downloaded from
http://objenesis.org/download.html and corresponding to section 4d of the
Apache License, Version 2.0, in this case for Objenesis:

Objenesis
Copyright 2006-2019 Joe Walnes, Henri Tremblay, Leonardo Mesquita


===============================================================================

To the extent any open source components are licensed under the EPL and/or
other similar licenses that require the source code and/or modifications to
source code to be made available (as would be noted above), you may obtain a
copy of the source code corresponding to the binaries for such open source
components and modifications thereto, if any, (the "Source Files"), by
downloading the Source Files from https://spring.io/projects, Pivotal's website
at https://network.pivotal.io/open-source, or by sending a request, with your
name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San
Francisco, CA 94103, Attention: General Counsel. All such requests should
clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. Pivotal
can mail a copy of the Source Files to you on a CD or equivalent physical
medium.

This offer to obtain a copy of the Source Files is valid for three years from
the date you acquired this Software product. Alternatively, the Source Files
may accompany the Software.
23 changes: 23 additions & 0 deletions src/main/bin_distr_license_notices/NOTICE-without-jackson.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,26 @@ licensed to the Apache Software Foundation under the
Copyright (c) 2003, 2006 IBM Corporation.

ResolverUtil.java Copyright 2005-2006 Tim Fennell

# Apache Commons IO

Apache Commons IO
Copyright 2002-2024 The Apache Software Foundation

# Apache Commons Lang

Apache Commons Lang
Copyright 2001-2024 The Apache Software Foundation

# Spring Framework

Copyright (c) 2002-2024 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with
the License.

This product may include a number of subcomponents with separate
copyright notices and license terms. Your use of the source code for
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
23 changes: 23 additions & 0 deletions src/main/bin_distr_license_notices/NOTICE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ Copyright (c) 2003, 2006 IBM Corporation.

ResolverUtil.java Copyright 2005-2006 Tim Fennell

# Apache Commons IO

Apache Commons IO
Copyright 2002-2024 The Apache Software Foundation

# Apache Commons Lang

Apache Commons Lang
Copyright 2001-2024 The Apache Software Foundation

# Jackson JSON processor NOTICE from the Jackson Jar 2.15.2

Jackson is a high-performance, Free/Open Source JSON processing library.
Expand Down Expand Up @@ -46,3 +56,16 @@ Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.

See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
and the licenses and copyrights that apply to that code.

# Spring Framework

Copyright (c) 2002-2024 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with
the License.

This product may include a number of subcomponents with separate
copyright notices and license terms. Your use of the source code for
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
17 changes: 16 additions & 1 deletion uimaj-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,19 +318,34 @@

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
Expand Down

0 comments on commit 146d723

Please sign in to comment.