Skip to content

Bug/fix propdeps plugin not available #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
95b036b
[US642] JSON Patch Query (#1)
piotrdytkowski Jan 27, 2022
02fd39d
[US-642] implement json patch queries (#2)
piotrdytkowski Feb 4, 2022
918c702
Set up CI with Azure Pipelines
gravity9piotr Feb 6, 2022
30e2ba5
[US642] Update project settings (#3)
piotrdytkowski Feb 7, 2022
f690d44
Set up CI with Azure Pipelines (#4)
gravity9piotr Feb 7, 2022
5522d66
[US642] Add gradle release and versioning plugin
piotrdytkowski Feb 7, 2022
ef90fbf
[US642] Add gradle release and versioning plugin (#5)
piotrdytkowski Feb 8, 2022
c6241e0
Merge branch 'master' into master
gravity9piotr Feb 8, 2022
4e525b9
Merge pull request #1 from piotrdytkowski/master
gravity9piotr Feb 8, 2022
fca54f8
[US642] Change pipeline user
piotrdytkowski Feb 8, 2022
2824810
Merge branch 'master' into feature/prepare-release-and-versioning
gravity9piotr Feb 8, 2022
5d141a5
Merge pull request #2 from piotrdytkowski/feature/prepare-release-and…
gravity9piotr Feb 8, 2022
c02ac1e
revert user name
piotrdytkowski Feb 8, 2022
36638c0
Merge pull request #3 from gravity9piotr/revert-user-name
gravity9piotr Feb 8, 2022
8cedcde
[US642] Add gradle properties with version
piotrdytkowski Feb 8, 2022
f8f2e14
[Gradle Release Plugin] - new version commit: '2.0.1-SNAPSHOT'.
piotrdytkowski Feb 8, 2022
53a29f6
[US642] Try checkout instead of script
piotrdytkowski Feb 8, 2022
c1f6371
[US642] Try checking out particular branch
piotrdytkowski Feb 8, 2022
337c73d
[US642] Try persisting credentials in script
piotrdytkowski Feb 8, 2022
0421daf
[US642] Remove persisting credentials
piotrdytkowski Feb 8, 2022
3e2c5b4
[US642] Try to auth and store credentials before branch checkout
piotrdytkowski Feb 8, 2022
6a8d898
[Gradle Release Plugin] - pre tag commit: '2.0.0'.
Feb 8, 2022
f26553d
[US642] Try setting new version in both files
piotrdytkowski Feb 8, 2022
45f0bfc
[Gradle Release Plugin] - pre tag commit: '2.0.1'.
Feb 8, 2022
160c33a
[Gradle Release Plugin] - new version commit: '2.0.2-SNAPSHOT'.
Feb 8, 2022
a2a0049
[Gradle Release Plugin] - pre tag commit: '2.0.1'.
Feb 8, 2022
e727c09
[US642] Try old artifact targetPath and update remove unused version
piotrdytkowski Feb 8, 2022
c267d8c
[Gradle Release Plugin] - pre tag commit: '2.0.2'.
Feb 8, 2022
ac3b2e1
[Gradle Release Plugin] - new version commit: '2.0.3-SNAPSHOT'.
Feb 8, 2022
de0062a
[Gradle Release Plugin] - pre tag commit: '2.0.3'.
Feb 8, 2022
06159d5
[Gradle Release Plugin] - new version commit: '2.0.4-SNAPSHOT'.
Feb 8, 2022
f19ee10
[Gradle Release Plugin] - pre tag commit: '2.0.4'.
Feb 8, 2022
223001e
[Gradle Release Plugin] - new version commit: '2.0.5-SNAPSHOT'.
Feb 8, 2022
3f116c7
[Gradle Release Plugin] - pre tag commit: '2.0.5'.
Feb 8, 2022
3196b14
[Gradle Release Plugin] - new version commit: '2.0.6-SNAPSHOT'.
Feb 8, 2022
05dedef
[Gradle Release Plugin] - pre tag commit: '2.0.6'.
Feb 8, 2022
93adfcd
[Gradle Release Plugin] - new version commit: '2.0.7-SNAPSHOT'.
Feb 8, 2022
bf9935f
[US642] Try a tag to skip ci after version updates in release plugin
piotrdytkowski Feb 8, 2022
e41f950
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.7'.
Feb 8, 2022
53252cb
[Gradle Release Plugin][skip ci] - new version commit: '2.0.8-SNAPSH…
Feb 8, 2022
18d4b78
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.8'.
piotrdytkowski Feb 8, 2022
8d0685b
[Gradle Release Plugin][skip ci] - new version commit: '2.0.9-SNAPSH…
piotrdytkowski Feb 8, 2022
9a666d0
[US642] try to publish artifacts
piotrdytkowski Feb 8, 2022
c0ad591
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.9'.
Feb 8, 2022
6cadae6
[Gradle Release Plugin][skip ci] - new version commit: '2.0.10-SNAPS…
Feb 8, 2022
45b1c18
[US642] Try to publish artifacts
piotrdytkowski Feb 8, 2022
8cb2541
Merge branch 'master' of github.com:gravity9piotr/json-patch
piotrdytkowski Feb 8, 2022
dfef079
[US642] Try separate publish step
piotrdytkowski Feb 8, 2022
b4247f6
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.10'.
Feb 8, 2022
041d256
[Gradle Release Plugin][skip ci] - new version commit: '2.0.11-SNAPS…
Feb 8, 2022
3861a7c
[US642] Remove signing
piotrdytkowski Feb 8, 2022
dad202a
Merge branch 'master' of github.com:gravity9piotr/json-patch
piotrdytkowski Feb 8, 2022
509362f
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.11'.
Feb 8, 2022
dd20c26
[Gradle Release Plugin][skip ci] - new version commit: '2.0.12-SNAPS…
Feb 8, 2022
b4c24c0
[US642] Try to add repo id
piotrdytkowski Feb 8, 2022
4f5b1b4
[US642] Try to use repo name instead of id
piotrdytkowski Feb 8, 2022
96ad3f2
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.12'.
Feb 8, 2022
9c6a39c
[Gradle Release Plugin][skip ci] - new version commit: '2.0.13-SNAPS…
Feb 8, 2022
46d1b52
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.13'.
Feb 9, 2022
714421d
[Gradle Release Plugin][skip ci] - new version commit: '2.0.14-SNAPS…
Feb 9, 2022
2b336e4
[US642] Try adding basic auth
piotrdytkowski Feb 9, 2022
6ea1b13
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.14'.
Feb 9, 2022
106797f
[Gradle Release Plugin][skip ci] - new version commit: '2.0.15-SNAPS…
Feb 9, 2022
7352527
[US642] Try to expose maven properties
piotrdytkowski Feb 9, 2022
e97b242
Merge remote-tracking branch 'origin/master'
piotrdytkowski Feb 9, 2022
37fa43d
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.15'.
Feb 9, 2022
9ccbcb2
[Gradle Release Plugin][skip ci] - new version commit: '2.0.16-SNAPS…
Feb 9, 2022
ac070a4
[Gradle Release Plugin][skip ci] - new version commit: '2.0.16-SNAPS…
Feb 9, 2022
bea55f9
Merge remote-tracking branch 'origin/master'
piotrdytkowski Feb 9, 2022
f27555d
[US642] Remove unused plugin
piotrdytkowski Feb 9, 2022
8f0f12b
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.16'.
Feb 9, 2022
7d2eaad
[Gradle Release Plugin][skip ci] - new version commit: '2.0.17-SNAPS…
Feb 9, 2022
564a4e1
[US642] Allow raw json path and add test for nested array manipulations
piotrdytkowski Feb 11, 2022
5c5e3b4
Merge pull request #4 from gravity9piotr/feature/handle-json-path-dir…
gravity9piotr Feb 11, 2022
20ecd4c
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.17'.
Feb 11, 2022
4fd80c3
[Gradle Release Plugin][skip ci] - new version commit: '2.0.18-SNAPS…
Feb 11, 2022
7753715
Return json path errors instead of swallowing them
piotrdytkowski Mar 15, 2022
7bf73bc
Add test for empty array
piotrdytkowski Mar 16, 2022
85ba664
Merge pull request #5 from gravity9piotr/json-path-errors
gravity9piotr Mar 16, 2022
0292442
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.18'.
Mar 16, 2022
8a04196
[Gradle Release Plugin][skip ci] - new version commit: '2.0.19-SNAPS…
Mar 16, 2022
7b504bc
Hide internal JsonPath exception
piotrdytkowski Mar 24, 2022
b4bdbfd
Merge pull request #6 from gravity9piotr/bug/handle-jsonpath-exceptions
gravity9piotr Mar 25, 2022
b60567a
[Gradle Release Plugin][skip ci] - pre tag commit: '2.0.19'.
Mar 25, 2022
8415df7
[Gradle Release Plugin][skip ci] - new version commit: '2.0.20-SNAPS…
Mar 25, 2022
614dbb4
Remove json patch query, leaving json pointer and json path
piotrdytkowski Mar 25, 2022
e5b1000
Clearer exception for unsupported JPQ syntax
piotrdytkowski Mar 25, 2022
f2ca96c
Update major version due to backwards incompatible changes
piotrdytkowski Apr 20, 2022
4e0a319
Merge pull request #7 from gravity9piotr/feature/remove-query-parsing
gravity9piotr Apr 20, 2022
d3e7452
[Gradle Release Plugin][skip ci] - pre tag commit: '3.0.0'.
Apr 20, 2022
e340719
[Gradle Release Plugin][skip ci] - new version commit: '3.0.1-SNAPSH…
Apr 20, 2022
a442352
#787 JsonPath parsing - getting parentPath and new node name from pro…
Jun 20, 2022
57f9c87
#787 JsonPath parsing - renamed method name
Jun 20, 2022
2fdea67
#787 JsonPath parsing - fixes after review. Added more test cases
Jun 21, 2022
0379a5e
#787 JsonPath parsing - Added test cases for `-` at the end
Jun 21, 2022
0bf0b03
Merge pull request #8 from gravity9piotr/feature/787_json_path_parser
pbugara Jun 21, 2022
7f65374
#787 JsonPath parsing - added throws to java doc
Jun 21, 2022
3a57ce0
Merge pull request #9 from gravity9piotr/feature/787_json_path_parser
pbugara Jun 21, 2022
0b4beb2
[Gradle Release Plugin][skip ci] - pre tag commit: '3.0.1'.
Jun 21, 2022
7263b1b
[Gradle Release Plugin][skip ci] - new version commit: '3.0.2-SNAPSH…
Jun 21, 2022
f1bf677
#807 JsonPointer double slashes validation
Jul 22, 2022
ad576e9
#807 JsonPointer double slashes validation
Jul 22, 2022
a7d8e11
Merge pull request #10 from gravity9piotr/bugfix/807_json_pointer_dou…
pbugara Jul 22, 2022
29730eb
[Gradle Release Plugin][skip ci] - pre tag commit: '3.0.2'.
Jul 22, 2022
b474d44
[Gradle Release Plugin][skip ci] - new version commit: '3.0.3-SNAPSH…
Jul 22, 2022
e440488
Spring gradle propdeps plugin not available
BartekGravity Jun 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Gradle
# Build your Java project and run tests with Gradle using a Gradle wrapper script.
# Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/java

trigger:
- master

pool:
vmImage: ubuntu-latest

steps:
- checkout: self
persistCredentials: true
displayName: "git credentials"
- script: |
git checkout $(Build.SourceBranchName)
git config --global user.name "Azure DevOps"
displayName: "git config"
- task: MavenAuthenticate@0
displayName: 'authenticate maven'
inputs:
artifactsFeeds: bt
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.8'
jdkArchitectureOption: 'x64'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'clean test'
displayName: 'Gradle build and test'
- task: Gradle@2
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.8'
jdkArchitectureOption: 'x64'
tasks: 'clean release -Prelease.useAutomaticVersion=true'
displayName: 'Gradle release and publish artifacts'
- task: PublishPipelineArtifact@1
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
targetPath: $(System.DefaultWorkingDirectory)/build/libs/
displayName: "publish build artifact"
150 changes: 25 additions & 125 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@

buildscript {
repositories {
jcenter()
mavenCentral()
maven {
url "http://repo.springsource.org/plugins-release";
url "https://repo.spring.io/plugins-snapshot";
}
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
classpath(group: "org.springframework.build.gradle", name: "propdeps-plugin", version: "0.0.7");
classpath 'io.spring.gradle:propdeps-plugin:0.0.8-SNAPSHOT'
}
};

plugins {
id "maven-publish"
id("net.ltgt.errorprone") version "0.8.1" apply false
id 'net.researchgate.release' version '2.8.1'
id "net.linguica.maven-settings" version "0.5"
}

configure(allprojects) {
Expand All @@ -43,7 +47,6 @@ configure(allprojects) {

apply(plugin: "java");
apply(plugin: "maven");
apply(plugin: "signing");
apply(plugin: "biz.aQute.bnd.builder");
apply(plugin: "idea");
apply(plugin: "eclipse");
Expand All @@ -53,27 +56,13 @@ apply(from: "project.gradle");

group = "com.github.java-json-tools";

ext.forRelease = !version.endsWith("-SNAPSHOT");

/*
* Repositories to use
*/
repositories {
mavenCentral();
if (!forRelease) {
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
}
/* Allow staging references for last pre-release testing. */
if (project.properties.containsKey("sonatypeUsername")) {
maven {
url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
credentials {
username = project.properties["sonatypeUsername"]
password = project.properties["sonatypePassword"]
}
}
maven {
url "https://pkgs.dev.azure.com/Gravity9Solutions/BT/_packaging/bt/maven/v1"
}
}

Expand Down Expand Up @@ -117,15 +106,6 @@ allprojects {
}
}

/*
* Javadoc: we need to tell where the overview.html is, it will not pick it up
* automatically...
*/

//javadoc {
// options.overview = "src/main/java/overview.html";
//}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = "javadoc";
from javadoc.destinationDir;
Expand All @@ -137,113 +117,33 @@ artifacts {
archives javadocJar;
}

wrapper {
gradleVersion = "5.6.3";
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip";
release {
preTagCommitMessage = '[Gradle Release Plugin][skip ci] - pre tag commit: '
newVersionCommitMessage = '[Gradle Release Plugin][skip ci] - new version commit: '
}

task pom {
doLast {
pom {}.writeTo("${projectDir}/pom.xml");
}
}
afterReleaseBuild.dependsOn publish

/*
* SIGNING
*/

project.ext {
scmUrl = sprintf("git@github.com:java-json-tools/%s.git", name);
projectURL = sprintf("https://github.com/java-json-tools/%s", name);
sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/";
sonatypeSnapshots = "https://oss.sonatype.org/content/repositories/snapshots/";
};

task checkSigningRequirements {
doLast {
def requiredProperties = [ "sonatypeUsername", "sonatypePassword" ];
def noDice = false;
requiredProperties.each {
if (project.properties[it] == null) {
noDice = true;
System.err.printf("property \"%s\" is not defined!\n", it);
}
}
if (noDice)
throw new IllegalStateException("missing required properties for " +
"upload");
}
}

uploadArchives {
dependsOn(checkSigningRequirements);
publishing {
repositories {
mavenDeployer {
beforeDeployment {
MavenDeployment deployment -> signing.signPom(deployment);
}

repository(url: "${sonatypeStaging}") {
authentication(
userName: project.properties["sonatypeUsername"],
password: project.properties["sonatypePassword"]
);
}

snapshotRepository(url: "${sonatypeSnapshots}") {
authentication(
userName: project.properties["sonatypeUsername"],
password: project.properties["sonatypePassword"]
);
maven {
name = "bt"
url = "https://pkgs.dev.azure.com/Gravity9Solutions/BT/_packaging/bt/maven/v1"
authentication {
basic(BasicAuthentication)
}
}
}
}

/*
* Configure pom.xml on install, uploadArchives
*/
[
install.repositories.mavenInstaller,
uploadArchives.repositories.mavenDeployer
]*.pom*.whenConfigured { pom ->
pom.project {
name "${project.name}";
packaging "jar";
description "${project.ext.description}";
url "${projectURL}";

scm {
url "${scmUrl}";
connection "${scmUrl}";
developerConnection "scm:git:${scmUrl}";
}

licenses {
license {
name "Lesser General Public License, version 3 or greater";
url "http://www.gnu.org/licenses/lgpl.html";
distribution "repo";
};
license {
name "Apache Software License, version 2.0";
url "http://www.apache.org/licenses/LICENSE-2.0";
distribution "repo";
}
}

developers {
developer {
id "huggsboson";
name "John Huffaker";
email "jhuffaker+java-json-tools@gmail.com";
}
publications {
mavenJava(MavenPublication) {
from components.java
}
}
}

signing {
required { forRelease && gradle.taskGraph.hasTask("uploadArchives") };
sign configurations.archives;
wrapper {
gradleVersion = "5.6.3";
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip";
}


1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=3.0.3-SNAPSHOT
11 changes: 5 additions & 6 deletions project.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@
* Project-specific settings. Unfortunately we cannot put the name in there!
*/
group = "com.github.java-json-tools";
version = "1.13";
sourceCompatibility = JavaVersion.VERSION_1_7;
targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility
project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) implementation in Java";
project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) implementation in Java, using extended TMF620 JsonPath syntax";

/*
* List of dependencies
*/
dependencies {
provided(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2");
compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.11.0");
compile(group: 'com.jayway.jsonpath', name: 'json-path', version: '2.6.0')
compile(group: "com.github.java-json-tools", name: "msg-simple", version: "1.2");

compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0");
testCompile(group: "org.testng", name: "testng", version: "7.1.0") {
exclude(group: "junit", module: "junit");
Expand All @@ -54,9 +53,9 @@ javadoc.options {
}
links("https://docs.oracle.com/javase/7/docs/api/");
links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/");
links("https://fasterxml.github.com/jackson-databind/javadoc/2.11/");
links("https://fasterxml.github.com/jackson-core/javadoc/2.11/");
links("https://fasterxml.github.com/jackson-annotations/javadoc/2.11/");
links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.11.4/index.html");
links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.11.4/index.html");
links("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/2.11.4/index.html");
links("https://www.javadoc.io/doc/com.google.guava/guava/28.2-android/");
links("https://java-json-tools.github.io/msg-simple/");
links("https://java-json-tools.github.io/jackson-coreutils/");
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
*/

rootProject.name = "json-patch";
rootProject.name = "json-patch-query";
Loading