From 3bd4e23c03f30caeb94b8c8bc050f7d60a17dcc7 Mon Sep 17 00:00:00 2001
From: lpandzic <4463380+lpandzic@users.noreply.github.com>
Date: Wed, 7 Apr 2021 08:32:25 +0200
Subject: [PATCH 1/5] changed repository urls to use https instead of http
---
querydsl-apt/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index 7d516418d..0f46e0bc7 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -264,7 +264,7 @@
spring roo repository
- http://spring-roo-repository.springsource.org/release
+ https://spring-roo-repository.springsource.org/release
From dabca72b39536b30eb79d4ae692fbf78bb79e2b0 Mon Sep 17 00:00:00 2001
From: lpandzic <4463380+lpandzic@users.noreply.github.com>
Date: Wed, 7 Apr 2021 08:32:36 +0200
Subject: [PATCH 2/5] changed repository urls to use https instead of http
---
pom.xml | 2 +-
querydsl-jdo/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index dfd9d3d8e..c230f68c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,7 +653,7 @@
querydsl
- http://www.querydsl.com/maven
+ https://www.querydsl.com/maven
diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
index f62e8ef23..2b875326e 100644
--- a/querydsl-jdo/pom.xml
+++ b/querydsl-jdo/pom.xml
@@ -275,14 +275,14 @@
datanucleus
- http://www.datanucleus.org/downloads/maven2
+ https://www.datanucleus.org/downloads/maven2
datanucleus
- http://www.datanucleus.org/downloads/maven2
+ https://www.datanucleus.org/downloads/maven2
From dc0305347be6d0b8ce9f66750d227760f001fd83 Mon Sep 17 00:00:00 2001
From: lpandzic <4463380+lpandzic@users.noreply.github.com>
Date: Wed, 7 Apr 2021 12:19:42 +0200
Subject: [PATCH 3/5] removed querydsl repository fixes for missing artifacts
---
pom.xml | 9 +--------
querydsl-jpa/pom.xml | 2 +-
querydsl-sql-codegen/pom.xml | 4 ++--
querydsl-sql-spatial/pom.xml | 10 +++++++++-
querydsl-sql/pom.xml | 10 +++++++++-
5 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index c230f68c6..c2f0a7a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
2.3.2
1.4.197
42.2.18
- 11.1.0.7.0
+ 11.2.0.4
5.1.30
1.3.1
9.3.1.0005
@@ -650,13 +650,6 @@
-
-
- querydsl
- https://www.querydsl.com/maven
-
-
-
com.springsource.repository.bundles.release
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 3424d20e8..69a879a92 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -184,7 +184,7 @@
test
- com.oracle
+ com.oracle.database.jdbc
ojdbc6
${oracle.version}
test
diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
index 867ac925c..91906e58a 100644
--- a/querydsl-sql-codegen/pom.xml
+++ b/querydsl-sql-codegen/pom.xml
@@ -91,9 +91,9 @@
- com.oracle
+ com.oracle.database.jdbc
ojdbc6
- 11.1.0.7.0
+ ${oracle.version}
test
diff --git a/querydsl-sql-spatial/pom.xml b/querydsl-sql-spatial/pom.xml
index 9989b70c4..f63a78117 100644
--- a/querydsl-sql-spatial/pom.xml
+++ b/querydsl-sql-spatial/pom.xml
@@ -113,7 +113,7 @@
true
- com.oracle
+ com.oracle.database.jdbc
ojdbc6
${oracle.version}
test
@@ -281,4 +281,12 @@
+
+
+
+ datanucleus
+ https://www.datanucleus.org/downloads/maven2
+
+
+
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index be0a05d67..a9032c900 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -101,7 +101,7 @@
test
- com.oracle
+ com.oracle.database.jdbc
ojdbc6
${oracle.version}
test
@@ -308,4 +308,12 @@
+
+
+
+ datanucleus
+ https://www.datanucleus.org/downloads/maven2
+
+
+
From 847d238153337cb9ab32497a9719e19497edde57 Mon Sep 17 00:00:00 2001
From: f43nd1r
Date: Tue, 4 May 2021 16:32:19 +0200
Subject: [PATCH 4/5] use cubrid driver available in maven central
---
pom.xml | 2 +-
querydsl-sql-spatial/pom.xml | 6 +++---
querydsl-sql/pom.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c2f0a7a1b..38704390d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
11.2.0.4
5.1.30
1.3.1
- 9.3.1.0005
+ 9.3.9.0002
3.7.2
13.10.00.35
2.2.5
diff --git a/querydsl-sql-spatial/pom.xml b/querydsl-sql-spatial/pom.xml
index f63a78117..549bea3a4 100644
--- a/querydsl-sql-spatial/pom.xml
+++ b/querydsl-sql-spatial/pom.xml
@@ -157,9 +157,9 @@
- cubrid
- cubrid-jdbc
- ${cubrid.version}
+ com.github.jinahya
+ cubrid-jdbc-driver-${cubrid.version}
+ 1.0.0
test
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index a9032c900..46dd9d4cc 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -145,9 +145,9 @@
- cubrid
- cubrid-jdbc
- ${cubrid.version}
+ com.github.jinahya
+ cubrid-jdbc-driver-${cubrid.version}
+ 1.0.0
test
From 50d9dc1bdc443e7d49497fda55df0065be94de61 Mon Sep 17 00:00:00 2001
From: f43nd1r
Date: Wed, 5 May 2021 15:40:10 +0200
Subject: [PATCH 5/5] trigger workflows again