From fb5f3659a902af6f667b90b1c5460817e7672653 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 20:49:32 -0400 Subject: [PATCH 1/6] [site] Fix code tag issue ending block on site --- src/site/xdoc/getting-started.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/getting-started.xml.vm b/src/site/xdoc/getting-started.xml.vm index 2f62665a..c2a89acf 100644 --- a/src/site/xdoc/getting-started.xml.vm +++ b/src/site/xdoc/getting-started.xml.vm @@ -37,7 +37,7 @@ file and its dependencies in the classpath.

- If you are using Maven just add the following dependency to your pom.xml: + If you are using Maven just add the following dependency to your pom.xml:

From 8f6d6c172b2a697db13d98d4323700bb9ffc965d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:16:15 -0400 Subject: [PATCH 2/6] [pom] Allow derby latest usage now at 10.16.1.1 --- .github/dependabot.yml | 3 --- pom.xml | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b298118d..df290c7e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,9 +26,6 @@ updates: interval: daily open-pull-requests-limit: 10 ignore: - - dependency-name: org.apache.derby:derby - versions: - - "> 10.14.2.0" - dependency-name: javax.enterprise:cdi-api versions: - "> 1.1" diff --git a/pom.xml b/pom.xml index 58c54fbf..7c74c576 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,19 @@ org.apache.derby derby - 10.14.2.0 + 10.16.1.1 + test + + + org.apache.derby + derbyshared + 10.16.1.1 + test + + + org.apache.derby + derbyoptionaltools + 10.16.1.1 test @@ -147,6 +159,17 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + + test + + + + org.apache.maven.plugins maven-surefire-plugin From 7ee27f12f12b99f08c0014e4e750a994c02aaf05 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:21:13 -0400 Subject: [PATCH 3/6] [mvn] Update maven wrapper --- .mvn/maven.config | 1 + .mvn/wrapper/maven-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .mvn/maven.config diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 00000000..956533e6 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 687668b3..dc3affce 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar From 8bef95d2ea11910ff7a009640515179849173af3 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:30:28 -0400 Subject: [PATCH 4/6] [pom] Drop derby to 10.15.2.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7c74c576..7d364978 100644 --- a/pom.xml +++ b/pom.xml @@ -101,19 +101,19 @@ org.apache.derby derby - 10.16.1.1 + 10.15.2.0 test org.apache.derby derbyshared - 10.16.1.1 + 10.15.2.0 test org.apache.derby derbyoptionaltools - 10.16.1.1 + 10.15.2.0 test From 86b13e4d99d158e3b0e9c8132ef9934922ae718a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:31:04 -0400 Subject: [PATCH 5/6] [dependabot] Ignore above 10.15.2.0 --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index df290c7e..329c8197 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,6 +26,9 @@ updates: interval: daily open-pull-requests-limit: 10 ignore: + - dependency-name: org.apache.derby:derby + versions: + - "> 10.15.2.0" - dependency-name: javax.enterprise:cdi-api versions: - "> 1.1" From e1a517c5baac44001a7d02177c66b051b0e03fc1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 1 Aug 2022 21:43:09 -0400 Subject: [PATCH 6/6] [ci] Add two more exclusions on derby components --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 329c8197..7363b19f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,6 +29,12 @@ updates: - dependency-name: org.apache.derby:derby versions: - "> 10.15.2.0" + - dependency-name: org.apache.derby:derbyoptionaltools + versions: + - "> 10.15.2.0" + - dependency-name: org.apache.derby:derbyshared + versions: + - "> 10.15.2.0" - dependency-name: javax.enterprise:cdi-api versions: - "> 1.1"