Skip to content

Commit b4708aa

Browse files
authored
Revert "Update Maven wrapper (#732)" (#738)
This reverts commit 2510349.
1 parent 2510349 commit b4708aa

File tree

600 files changed

+15940
-168579
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

+15940
-168579
lines changed

.gitattributes

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
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

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
branches:
55
- master
66
- "3.0"
7-
- "2.14"
87
- "2.13"
98
paths-ignore:
109
- "README.md"
@@ -13,7 +12,6 @@ on:
1312
branches:
1413
- master
1514
- "3.0"
16-
- "2.14"
1715
- "2.13"
1816
paths-ignore:
1917
- "README.md"
@@ -24,7 +22,8 @@ jobs:
2422
strategy:
2523
fail-fast: false
2624
matrix:
27-
java_version: ['8', '11', '14']
25+
# Alas, as long as JDK6 is target, cannot run against 14+
26+
java_version: ['8', '11']
2827
os: ['ubuntu-20.04']
2928
env:
3029
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

.gitignore

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

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

1514
# Eclipse
1615
.classpath

.mvn/wrapper/maven-wrapper.jar

49.5 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,2 @@
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
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

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 (3.0) | [![codecov.io](https://codecov.io/github/FasterXML/jackson-core/coverage.svg?branch=master)](https://codecov.io/github/FasterXML/jackson-core?branch=master) |
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) |
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
This file was deleted.

0 commit comments

Comments
 (0)