Skip to content

Commit 2510349

Browse files
authored
Update Maven wrapper (#732)
1 parent ee417e1 commit 2510349

File tree

600 files changed

+168581
-15942
lines changed

Some content is hidden

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

600 files changed

+168581
-15942
lines changed

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# Do not merge `pom.xml` from older version, as it will typically conflict
22

33
pom.xml merge=ours
4+
.travis.yml merge=ours
5+
6+
release/VERSION merge=ours

.github/workflows/main.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- "3.0"
7+
- "2.14"
78
- "2.13"
89
paths-ignore:
910
- "README.md"
@@ -12,6 +13,7 @@ on:
1213
branches:
1314
- master
1415
- "3.0"
16+
- "2.14"
1517
- "2.13"
1618
paths-ignore:
1719
- "README.md"
@@ -22,8 +24,7 @@ jobs:
2224
strategy:
2325
fail-fast: false
2426
matrix:
25-
# Alas, as long as JDK6 is target, cannot run against 14+
26-
java_version: ['8', '11']
27+
java_version: ['8', '11', '14']
2728
os: ['ubuntu-20.04']
2829
env:
2930
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ syntax: glob
1010

1111
# building
1212
/target
13+
.mvn/wrapper/maven-wrapper.jar
1314

1415
# Eclipse
1516
.classpath

.mvn/wrapper/maven-wrapper.jar

-49.5 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Project contains versions 2.0 and above: source code for earlier (1.x) versions
2828
| Artifact | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.core/jackson-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.core/jackson-core) |
2929
| OSS Sponsorship | [![Tidelift](https://tidelift.com/badges/package/maven/com.fasterxml.jackson.core:jackson-core)](https://tidelift.com/subscription/pkg/maven-com-fasterxml-jackson-core-jackson-core?utm_source=maven-com-fasterxml-jackson-core-jackson-core&utm_medium=referral&utm_campaign=readme) |
3030
| Javadocs | [![Javadoc](https://javadoc.io/badge/com.fasterxml.jackson.core/jackson-core.svg)](https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core) |
31-
| Code coverage (2.13) | [![codecov.io](https://codecov.io/github/FasterXML/jackson-core/coverage.svg?branch=2.13)](https://codecov.io/github/FasterXML/jackson-core?branch=2.13) |
31+
| Code coverage (3.0) | [![codecov.io](https://codecov.io/github/FasterXML/jackson-core/coverage.svg?branch=master)](https://codecov.io/github/FasterXML/jackson-core?branch=master) |
3232
| CodeQ (LGTM.com) | [![LGTM alerts](https://img.shields.io/lgtm/alerts/g/FasterXML/jackson-core.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/FasterXML/jackson-core/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/FasterXML/jackson-core.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/FasterXML/jackson-core/context:java) |
3333
| CodeQ (ClusterFuzz) | [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/jackson-core.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:jackson-core) |
3434

SECURITY.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Security Policy
2+
3+
Last Updated: 2019-11-26
4+
5+
## Supported Versions
6+
7+
Current status of open branches, with new releases, can be found from [Jackson Releases](https://github.com/FasterXML/jackson/wiki/Jackson-Releases)
8+
wiki page
9+
10+
## Reporting a Vulnerability
11+
12+
The recommended mechanism for reporting possible security vulnerabilities follows
13+
so-called "Coordinated Disclosure Plan" (see [definition of DCP](https://vuls.cert.org/confluence/display/Wiki/Coordinated+Vulnerability+Disclosure+Guidance)
14+
for general idea). The first step is to file a [Tidelift security contact](https://tidelift.com/security):
15+
Tidelift will route all reports via their system to maintainers of relevant package(s), and start the
16+
process that will evaluate concern and issue possible fixes, send update notices and so on.
17+
Note that you do not need to be a Tidelift subscriber to file a security contact.
18+
19+
Alternatively you may also report possible vulnerabilities to `info` at fasterxml dot com
20+
mailing address. Note that filing an issue to go with report is fine, but if you do that please
21+
DO NOT include details of security problem in the issue but only in email contact.
22+
This is important to give us time to provide a patch, if necessary, for the problem.

0 commit comments

Comments
 (0)