Skip to content

Commit 690a75e

Browse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #146 from utPLSQL/bugfix/issue-136-add-missing-libs
Bugfix/issue 136 add missing libs
2 parents cbf1cd8 + f3a62e4 commit 690a75e

File tree

1 file changed

+48
-33
lines changed

1 file changed

+48
-33
lines changed

‎sqldev/pom.xml‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
<!-- The Basics -->
77
<groupId>org.utplsql</groupId>
88
<artifactId>org.utplsql.sqldev</artifactId>
9-
<version>1.3.2-SNAPSHOT</version>
9+
<version>1.4.0-SNAPSHOT</version>
1010
<packaging>bundle</packaging>
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<jdk.version>1.8</jdk.version>
1414
<jdk.version.test>1.8</jdk.version.test>
1515
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
16-
<sqldev.basedir>/Applications/SQLDeveloper20.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
16+
<sqldev.basedir>/Applications/SQLDeveloper21.4.2.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1717
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
1818
<!-- arguments to by added by jacoco plugin for test runs with coverage -->
1919
<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
2020
<argLine>-noverify -Djava.util.logging.config.file=${project.basedir}/src/test/resources/logging.conf</argLine>
2121
</properties>
2222
<dependencies>
2323
<!-- SQL Developer specific dependencies part 1 (not available in public Maven repositories) -->
24-
<!-- Versions of scope system are based on SQL Developer 19.4.0. -->
24+
<!-- Versions of scope system are based on SQL Developer 21.4.2. Version numbers are reduced to major.minor.bugfix format. -->
2525
<!-- The actual version is not that important, since the these libraries are provided. -->
26-
<!-- Therefore it is not planned to update them with every change of sqldev.basedir. -->
26+
<!-- Therefore it is not planned to update them with every change of sqldev.basedir. Updated for 21.4.2 -->
2727
<dependency>
2828
<groupId>oracle</groupId>
2929
<artifactId>idert</artifactId>
30-
<version>13.0.0</version>
30+
<version>12.2.1</version>
3131
<scope>system</scope>
3232
<systemPath>${sqldev.basedir}/ide/lib/idert.jar</systemPath>
3333
</dependency>
@@ -41,147 +41,161 @@
4141
<dependency>
4242
<groupId>oracle</groupId>
4343
<artifactId>javatools</artifactId>
44-
<version>13.0.0</version>
44+
<version>12.2.1</version>
4545
<scope>system</scope>
4646
<systemPath>${sqldev.basedir}/ide/lib/javatools.jar</systemPath>
4747
</dependency>
4848
<dependency>
4949
<groupId>oracle</groupId>
5050
<artifactId>oracle.ide.ceditor</artifactId>
51-
<version>13.0.0</version>
51+
<version>12.2.1</version>
5252
<scope>system</scope>
5353
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.ceditor.jar</systemPath>
5454
</dependency>
5555
<dependency>
5656
<groupId>oracle</groupId>
5757
<artifactId>oracle.ide</artifactId>
58-
<version>13.0.0</version>
58+
<version>12.2.1</version>
5959
<scope>system</scope>
6060
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.jar</systemPath>
6161
</dependency>
6262
<dependency>
6363
<groupId>oracle</groupId>
6464
<artifactId>uic</artifactId>
65-
<version>13.0.0</version>
65+
<version>12.2.1</version>
6666
<scope>system</scope>
6767
<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
6868
</dependency>
6969
<dependency>
7070
<groupId>oracle</groupId>
7171
<artifactId>oracle.ide.navigator</artifactId>
72-
<version>13.0.0</version>
72+
<version>12.2.1</version>
7373
<scope>system</scope>
7474
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.navigator.jar</systemPath>
7575
</dependency>
7676
<dependency>
7777
<groupId>oracle</groupId>
7878
<artifactId>javax-ide</artifactId>
79-
<version>13.0.0</version>
79+
<version>12.2.1</version>
8080
<scope>system</scope>
8181
<systemPath>${sqldev.basedir}/ide/lib/javax-ide.jar</systemPath>
8282
</dependency>
8383
<dependency>
8484
<groupId>oracle</groupId>
8585
<artifactId>oracle.dbtools-common</artifactId>
86-
<version>19.4.0</version>
86+
<version>21.4.1</version>
8787
<scope>system</scope>
8888
<systemPath>${sqldev.basedir}/sqldeveloper/lib/dbtools-common.jar</systemPath>
8989
</dependency>
9090
<dependency>
9191
<groupId>oracle</groupId>
9292
<artifactId>oracle.sqldeveloper</artifactId>
93-
<version>19.3.0</version>
93+
<version>21.4.2</version>
9494
<scope>system</scope>
9595
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.jar</systemPath>
9696
</dependency>
9797
<dependency>
9898
<groupId>oracle</groupId>
9999
<artifactId>oracle.sqldeveloper.utils</artifactId>
100-
<version>19.3.0</version>
100+
<version>21.4.2</version>
101101
<scope>system</scope>
102102
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
103103
</dependency>
104104
<dependency>
105105
<groupId>oracle</groupId>
106106
<artifactId>oracle.sqldeveloper.worksheet</artifactId>
107-
<version>19.3.0</version>
107+
<version>21.4.2</version>
108108
<scope>system</scope>
109109
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
110110
</dependency>
111111
<dependency>
112112
<groupId>oracle</groupId>
113113
<artifactId>oracle.sqldeveloper.schemabrowser</artifactId>
114-
<version>19.3.0</version>
114+
<version>21.4.2</version>
115115
<scope>system</scope>
116116
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.schemabrowser.jar</systemPath>
117117
</dependency>
118118
<dependency>
119119
<groupId>oracle</groupId>
120120
<artifactId>ojdbc8</artifactId>
121-
<version>19.3.0</version>
121+
<version>21.4.0</version>
122122
<scope>system</scope>
123123
<systemPath>${sqldev.basedir}/jdbc/lib/ojdbc8.jar</systemPath>
124124
</dependency>
125125
<dependency>
126126
<groupId>oracle</groupId>
127127
<artifactId>dbapi</artifactId>
128-
<version>19.3.0</version>
128+
<version>21.4.2</version>
129129
<scope>system</scope>
130130
<systemPath>${sqldev.basedir}/ide/lib/dbapi.jar</systemPath>
131131
</dependency>
132132
<dependency>
133133
<groupId>oracle</groupId>
134134
<artifactId>oracle.ide.db</artifactId>
135-
<version>19.3.0</version>
135+
<version>21.4.2</version>
136136
<scope>system</scope>
137137
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.db.jar</systemPath>
138138
</dependency>
139139
<dependency>
140140
<groupId>oracle</groupId>
141141
<artifactId>oracle.jdeveloper.db.connection</artifactId>
142-
<version>19.3.0</version>
142+
<version>21.4.2</version>
143143
<scope>system</scope>
144144
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.db.connection.jar</systemPath>
145145
</dependency>
146146
<dependency>
147147
<groupId>oracle</groupId>
148148
<artifactId>oracle.jdeveloper.java.core.jar</artifactId>
149-
<version>13.0.0</version>
149+
<version>12.2.1</version>
150150
<scope>system</scope>
151151
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
152152
</dependency>
153153
<dependency>
154154
<groupId>oracle</groupId>
155155
<artifactId>oracle.jdeveloper.runner.jar</artifactId>
156-
<version>13.0.0</version>
156+
<version>12.2.1</version>
157157
<scope>system</scope>
158158
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.runner.jar</systemPath>
159159
</dependency>
160160
<dependency>
161161
<groupId>oracle</groupId>
162162
<artifactId>oracle.ide.runner</artifactId>
163-
<version>19.3.0</version>
163+
<version>12.2.1</version>
164164
<scope>system</scope>
165165
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.runner.jar</systemPath>
166166
</dependency>
167+
<dependency>
168+
<!-- overriding oddgen dependency -->
169+
<groupId>oracle</groupId>
170+
<artifactId>javatools-nodeps</artifactId>
171+
<version>12.2.1</version>
172+
<scope>system</scope>
173+
<systemPath>${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar</systemPath>
174+
</dependency>
167175
<!-- SQL Developer specific dependencies part 2 (used for tests only) -->
168176
<dependency>
169177
<groupId>oracle</groupId>
170178
<artifactId>jewt4.jar</artifactId>
171-
<version>13.0.0</version>
179+
<version>12.2.1</version>
172180
<scope>system</scope>
173181
<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
174182
</dependency>
175183
<dependency>
176184
<groupId>oracle</groupId>
177185
<artifactId>share.jar</artifactId>
178-
<version>13.0.0</version>
186+
<version>12.2.1</version> <!-- original version is JEWT_MAIN_GENERIC_210114.0102.S, that's basically a date -->
179187
<scope>system</scope>
180188
<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
181189
</dependency>
182190
<!-- SQL Developer specific dependencies part 3 (available in public maven repositories) -->
183191
<dependency>
184-
<!-- SQL Developer is using this older version -->
192+
<groupId>com.google.code.findbugs</groupId>
193+
<artifactId>jsr305</artifactId>
194+
<version>3.0.2</version>
195+
<scope>provided</scope>
196+
</dependency>
197+
<dependency>
198+
<!-- SQL Developer is using this older version, osgi.core-5.0.0.jar -->
185199
<groupId>org.osgi</groupId>
186200
<artifactId>org.osgi.core</artifactId>
187201
<version>5.0.0</version>
@@ -192,19 +206,19 @@
192206
<!-- used mainly to access the database via JdbcTemplate -->
193207
<groupId>org.springframework</groupId>
194208
<artifactId>spring-jdbc</artifactId>
195-
<version>5.3.2</version>
209+
<version>5.3.16</version>
196210
</dependency>
197211
<dependency>
198212
<!-- transitive reference, but IntelliJ wants to have it explicit (to avoid warnings) -->
199213
<groupId>org.springframework</groupId>
200214
<artifactId>spring-core</artifactId>
201-
<version>5.3.2</version>
215+
<version>5.3.16</version>
202216
</dependency>
203217
<dependency>
204218
<!-- used for HtmlUtils.htmlEscape in RunnerPanel -->
205219
<groupId>org.springframework</groupId>
206220
<artifactId>spring-web</artifactId>
207-
<version>5.3.2</version>
221+
<version>5.3.16</version>
208222
</dependency>
209223
<dependency>
210224
<!-- optional, for RunGenerator and TestGenerator -->
@@ -216,13 +230,13 @@
216230
<dependency>
217231
<groupId>junit</groupId>
218232
<artifactId>junit</artifactId>
219-
<version>4.13.1</version>
233+
<version>4.13.2</version>
220234
<scope>test</scope>
221235
</dependency>
222236
<dependency>
223237
<groupId>org.jetbrains</groupId>
224238
<artifactId>annotations</artifactId>
225-
<version>20.1.0</version>
239+
<version>23.0.0</version>
226240
<scope>compile</scope>
227241
</dependency>
228242
</dependencies>
@@ -242,7 +256,7 @@
242256
<plugins>
243257
<plugin>
244258
<groupId>org.apache.maven.plugins</groupId>
245-
<version>3.8.1</version>
259+
<version>3.10.0</version>
246260
<artifactId>maven-compiler-plugin</artifactId>
247261
<configuration>
248262
<source>${jdk.version}</source>
@@ -458,6 +472,7 @@
458472
org.springframework.core.style,
459473
org.springframework.lang
460474
</_exportcontents>
475+
<_noee>true</_noee>
461476
<Require-Bundle>
462477
oracle.javatools,
463478
oracle.javatools-nodeps,
@@ -584,7 +599,7 @@
584599
<plugin>
585600
<groupId>org.codehaus.mojo</groupId>
586601
<artifactId>buildnumber-maven-plugin</artifactId>
587-
<version>1.4</version>
602+
<version>3.0.0</version>
588603
</plugin>
589604
</plugins>
590605
</pluginManagement>

0 commit comments

Comments
 (0)