Skip to content

Commit 133ef61

Browse files
authored
Merge pull request #3 from umjammer/1.3.2
1.3.2
2 parents 5890869 + 9a2b231 commit 133ef61

File tree

175 files changed

+16043
-17063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+16043
-17063
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
name: "CodeQL"
7+
8+
on:
9+
push:
10+
branches: [master]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [master]
14+
# schedule:
15+
# - cron: '0 3 * * 2'
16+
17+
jobs:
18+
analyze:
19+
name: Analyze
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
# Override automatic language detection by changing the below list
26+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27+
language: ['java']
28+
# Learn more...
29+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v3
34+
35+
# Initializes the CodeQL tools for scanning.
36+
- name: Initialize CodeQL
37+
uses: github/codeql-action/init@v2
38+
with:
39+
languages: ${{ matrix.language }}
40+
# If you wish to specify custom queries, you can do so here or in a config file.
41+
# By default, queries listed here will override any specified in a config file.
42+
# Prefix the list here with "+" to use these queries and those in the config file.
43+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
44+
45+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
46+
# If this step fails, then you should remove it and run the build manually (see below)
47+
- name: Set up JDK 1.8
48+
uses: actions/setup-java@v3
49+
with:
50+
java-version: '8'
51+
distribution: 'temurin'
52+
cache: maven
53+
54+
- name: Build with Maven
55+
run: mvn package -Dmaven.test.skip=true
56+
57+
# ℹ️ Command-line programs to run using the OS shell.
58+
# 📚 https://git.io/JvXDl
59+
60+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
61+
# and modify them (or add more) to build your code if your project
62+
# uses a compiled language
63+
64+
#- run: |
65+
# make bootstrap
66+
# make release
67+
68+
- name: Perform CodeQL Analysis
69+
uses: github/codeql-action/analyze@v2

.github/workflows/maven.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Java CI
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v3
13+
14+
- name: Check w/o SNAPSHOT when "bump version"
15+
if: ${{ contains(github.event.head_commit.message, 'bump version') }}
16+
run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
17+
18+
- name: Set up JDK 1.8
19+
uses: actions/setup-java@v3
20+
with:
21+
java-version: '8'
22+
distribution: 'temurin'
23+
cache: maven
24+
25+
- name: Build with Maven
26+
run: mvn -B package --file pom.xml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ bin
44
.settings
55
build
66
target
7+
/tmp/

.travis.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 17 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
jai-imageio-jpeg2000
2-
====================
1+
[![Release](https://jitpack.io/v/umjammer/jai-imageio-jpeg2000.svg)](https://jitpack.io/#umjammer/jai-imageio-jpeg2000)
2+
[![Java CI](https://github.com/umjammer/jai-imageio-jpeg2000/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/jai-imageio-jpeg2000/actions/workflows/maven.yml)
3+
[![CodeQL](https://github.com/umjammer/jai-imageio-jpeg2000/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/jai-imageio-jpeg2000/actions/workflows/codeql-analysis.yml)
4+
![Java](https://img.shields.io/badge/Java-8-b07219)
5+
[![Parent](https://img.shields.io/badge/Parent-vavi--image-pink)](https://github.com/umjammer/vavi-image)
36

4-
[![Build Status](https://travis-ci.org/jai-imageio/jai-imageio-jpeg2000.svg)](https://travis-ci.org/jai-imageio/jai-imageio-jpeg2000)
7+
# jai-imageio-jpeg2000
8+
9+
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/JPEG_2000_logo.svg/190px-JPEG_2000_logo.svg.png" width="120" />
510

611
JPEG2000 support for Java Advanced Imaging Image I/O Tools API core
712
[jai-imagecore-core](https://github.com/jai-imageio/jai-imageio-core).
@@ -35,73 +40,17 @@ maintained and extends the original imageio with many useful features,
3540
but depends on the
3641
[binary distribution of jai_core](http://download.osgeo.org/webdav/geotools/javax/media/jai_core/1.1.3/).
3742

43+
## Install
3844

39-
## Contribute
40-
41-
You are welcome to raise
42-
[Github pull requests](https://github.com/jai-imageio/jai-imageio-jpeg2000/pulls) for any improvements,
43-
or to create [GitHub issues](https://github.com/jai-imageio/jai-imageio-jpeg2000/issues) for any bugs
44-
discovered.
45-
46-
This project is maintained fully on GitHub by its community - to follow the project, simply
47-
[watch this project on GitHub](https://github.com/jai-imageio/jai-imageio-jpeg2000/subscription).
48-
49-
50-
Usage
51-
-----
52-
53-
To build this project, use Apache Maven 2.2.1 or newer and run:
54-
55-
mvn clean install
56-
57-
To use jai-imageio-core-jpeg2000 from a Maven project, add:
58-
59-
<dependency>
60-
<groupId>com.github.jai-imageio</groupId>
61-
<artifactId>jai-imageio-jpeg2000</artifactId>
62-
<version>1.3.0</version>
63-
</dependency>
64-
65-
To find the latest `<version>` above, see
66-
[jai-imageio-jpeg2000 at BinTray](https://bintray.com/jai-imageio/maven/jai-imageio-jpeg2000)
67-
68-
69-
jai-imageio-jpeg2000 is mirrored to Maven Central. Alternatively you can use
70-
this explicit repository:
45+
https://jitpack.io/#umjammer/jai-imageio-jpeg2000
7146

72-
<repositories>
73-
<repository>
74-
<id>bintray-jai-imageio</id>
75-
<name>jai-imageio at bintray</name>
76-
<url>http://dl.bintray.com/jai-imageio/maven/</url>
77-
<snapshots>
78-
<enabled>false</enabled>
79-
</snapshots>
80-
</repository>
81-
</repositories>
47+
## Usage
8248

83-
The Maven repository include additional artifact types such as `javadoc` and `sources`
84-
which should be picked up by your IDE's Maven integration.
49+
```java
50+
BufferedImage image = ImageIO.read(Paths.get("/foo/bar.j2k").toFile());
51+
```
8552

86-
87-
Download
88-
--------
89-
90-
To download the binary JARs, browse the
91-
[Downloads at BinTray](https://bintray.com/jai-imageio/maven/jai-imageio-jpeg2000).
92-
93-
94-
Javadoc
95-
-------
96-
97-
* [Javadoc for jai-imageio-jpeg2000](http://jai-imageio.github.io/jai-imageio-jpeg2000/javadoc/)
98-
* [Javadoc for jai-imageio-core](http://jai-imageio.github.io/jai-imageio-core/javadoc/)
99-
100-
101-
102-
103-
Copyright and licenses
104-
----------------------
53+
## Copyright and licenses
10554

10655
* Copyright © 1999/2000 JJ2000 Partners
10756
* Copyright © 2005 Sun Microsystems
@@ -123,9 +72,7 @@ The [jj2000](src/main/java/jj2000) package in this module is licensed under the
12372
with the GNU Public License (GPL)**. It is unknown what is the compatibility
12473
of the JJ2000 license with other open source licenses.
12574

126-
127-
Changelog
128-
---------
75+
## Changelog
12976

13077
* 1.3.1 - Now an OSGi bundle
13178
* 1.3.0 - Changed package name to org.github.imageio.plugins.jpeg2000.
@@ -136,9 +83,7 @@ Changelog
13683
support from [jai-imageio-core](http://github.com/jai-imageio/jai-imageio-core)
13784
for [licensing reasons](https://github.com/jai-imageio/jai-imageio-core/issues/4)
13885

139-
140-
More info
141-
---------
86+
## More info
14287

14388
* https://github.com/jai-imageio/jai-imageio-jpeg2000
14489
* https://github.com/jai-imageio/jai-imageio-core

0 commit comments

Comments
 (0)