Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit584cc33

Browse files
Merge pull request#104 from utPLSQL/bugfix/issue-101-xtend-to-java
Bugfix/issue 101 xtend to java
2 parentsb068f2e +df98a06 commit584cc33

File tree

156 files changed

+12533
-10123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+12533
-10123
lines changed

‎sqldev/pom.xml

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -5,150 +5,155 @@
55
<!-- The Basics-->
66
<groupId>org.utplsql</groupId>
77
<artifactId>org.utplsql.sqldev</artifactId>
8-
<version>1.1.2-SNAPSHOT</version>
8+
<version>1.2.0-SNAPSHOT</version>
99
<packaging>bundle</packaging>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<jdk.version>1.8</jdk.version>
1313
<jdk.version.test>1.8</jdk.version.test>
14-
<xtend.version>2.20.0</xtend.version>
1514
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8)-->
1615
<sqldev.basedir>/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1716
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
17+
<!-- arguments to by added by jacoco plugin for test runs with coverage-->
18+
<!-- -noverify is required in some environments to avoid java.lang.VerifyError-->
19+
<argLine>-noverify -Djava.util.logging.config.file=${project.basedir}/src/test/resources/logging.conf</argLine>
1820
</properties>
1921
<dependencies>
20-
<!-- SQL Developer specific dependencies part 1 (not available in public maven repositories)-->
22+
<!-- SQL Developer specific dependencies part 1 (not available in public Maven repositories)-->
23+
<!-- Versions of scope system are based on SQL Developer 19.4.0.-->
24+
<!-- The actual version is not that important, since the these libraries are provided.-->
25+
<!-- Therefore it is not planned to update them with every change of sqldev.basedir.-->
2126
<dependency>
2227
<groupId>oracle</groupId>
2328
<artifactId>idert</artifactId>
24-
<version>12.2.0</version>
29+
<version>13.0.0</version>
2530
<scope>system</scope>
2631
<systemPath>${sqldev.basedir}/ide/lib/idert.jar</systemPath>
2732
</dependency>
2833
<dependency>
2934
<groupId>oracle</groupId>
3035
<artifactId>javatools-nodeps</artifactId>
31-
<version>12.2.0</version>
36+
<version>13.0.0</version>
3237
<scope>system</scope>
3338
<systemPath>${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar</systemPath>
3439
</dependency>
3540
<dependency>
3641
<groupId>oracle</groupId>
3742
<artifactId>javatools</artifactId>
38-
<version>12.2.0</version>
43+
<version>13.0.0</version>
3944
<scope>system</scope>
4045
<systemPath>${sqldev.basedir}/ide/lib/javatools.jar</systemPath>
4146
</dependency>
4247
<dependency>
4348
<groupId>oracle</groupId>
4449
<artifactId>oracle.ide.ceditor</artifactId>
45-
<version>12.2.0</version>
50+
<version>13.0.0</version>
4651
<scope>system</scope>
4752
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.ceditor.jar</systemPath>
4853
</dependency>
4954
<dependency>
5055
<groupId>oracle</groupId>
5156
<artifactId>oracle.ide</artifactId>
52-
<version>12.2.0</version>
57+
<version>13.0.0</version>
5358
<scope>system</scope>
5459
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.jar</systemPath>
5560
</dependency>
5661
<dependency>
5762
<groupId>oracle</groupId>
5863
<artifactId>uic</artifactId>
59-
<version>12.2.2</version>
64+
<version>13.0.0</version>
6065
<scope>system</scope>
6166
<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
6267
</dependency>
6368
<dependency>
6469
<groupId>oracle</groupId>
6570
<artifactId>oracle.ide.navigator</artifactId>
66-
<version>12.2.0</version>
71+
<version>13.0.0</version>
6772
<scope>system</scope>
6873
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.navigator.jar</systemPath>
6974
</dependency>
7075
<dependency>
7176
<groupId>oracle</groupId>
7277
<artifactId>javax-ide</artifactId>
73-
<version>12.2.0</version>
78+
<version>13.0.0</version>
7479
<scope>system</scope>
7580
<systemPath>${sqldev.basedir}/ide/lib/javax-ide.jar</systemPath>
7681
</dependency>
7782
<dependency>
7883
<groupId>oracle</groupId>
7984
<artifactId>oracle.dbtools-common</artifactId>
80-
<version>12.2.0</version>
85+
<version>19.4.0</version>
8186
<scope>system</scope>
8287
<systemPath>${sqldev.basedir}/sqldeveloper/lib/dbtools-common.jar</systemPath>
8388
</dependency>
8489
<dependency>
8590
<groupId>oracle</groupId>
8691
<artifactId>oracle.sqldeveloper</artifactId>
87-
<version>12.2.0</version>
92+
<version>19.3.0</version>
8893
<scope>system</scope>
8994
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.jar</systemPath>
9095
</dependency>
9196
<dependency>
9297
<groupId>oracle</groupId>
9398
<artifactId>oracle.sqldeveloper.utils</artifactId>
94-
<version>12.2.0</version>
99+
<version>19.3.0</version>
95100
<scope>system</scope>
96101
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
97102
</dependency>
98103
<dependency>
99104
<groupId>oracle</groupId>
100105
<artifactId>oracle.sqldeveloper.worksheet</artifactId>
101-
<version>12.2.0</version>
106+
<version>19.3.0</version>
102107
<scope>system</scope>
103108
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar</systemPath>
104109
</dependency>
105110
<dependency>
106111
<groupId>oracle</groupId>
107112
<artifactId>ojdbc8</artifactId>
108-
<version>12.2.0.1.0</version>
113+
<version>19.3.0</version>
109114
<scope>system</scope>
110115
<systemPath>${sqldev.basedir}/jdbc/lib/ojdbc8.jar</systemPath>
111116
</dependency>
112117
<dependency>
113118
<groupId>oracle</groupId>
114119
<artifactId>dbapi</artifactId>
115-
<version>12.2.1</version>
120+
<version>19.3.0</version>
116121
<scope>system</scope>
117122
<systemPath>${sqldev.basedir}/ide/lib/dbapi.jar</systemPath>
118123
</dependency>
119124
<dependency>
120125
<groupId>oracle</groupId>
121126
<artifactId>oracle.ide.db</artifactId>
122-
<version>12.2.1</version>
127+
<version>19.3.0</version>
123128
<scope>system</scope>
124129
<systemPath>${sqldev.basedir}/ide/extensions/oracle.ide.db.jar</systemPath>
125130
</dependency>
126131
<dependency>
127132
<groupId>oracle</groupId>
128133
<artifactId>oracle.jdeveloper.db.connection</artifactId>
129-
<version>12.2.1</version>
134+
<version>19.3.0</version>
130135
<scope>system</scope>
131136
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.db.connection.jar</systemPath>
132137
</dependency>
133138
<dependency>
134139
<groupId>oracle</groupId>
135140
<artifactId>oracle.jdeveloper.java.core.jar</artifactId>
136-
<version>12.2.1</version>
141+
<version>13.0.0</version>
137142
<scope>system</scope>
138143
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
139144
</dependency>
140145
<!-- SQL Developer specific dependencies part 2 (used for tests only)-->
141146
<dependency>
142147
<groupId>oracle</groupId>
143148
<artifactId>jewt4.jar</artifactId>
144-
<version>12.2.1</version>
149+
<version>13.0.0</version>
145150
<scope>system</scope>
146151
<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
147152
</dependency>
148153
<dependency>
149154
<groupId>oracle</groupId>
150155
<artifactId>share.jar</artifactId>
151-
<version>12.2.1</version>
156+
<version>13.0.0</version>
152157
<scope>system</scope>
153158
<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
154159
</dependency>
@@ -162,22 +167,19 @@
162167
</dependency>
163168
<!-- other dependencies-->
164169
<dependency>
165-
<!-- Xtend comes with some runtime dependencies...-->
166-
<groupId>org.eclipse.xtend</groupId>
167-
<artifactId>org.eclipse.xtend.lib</artifactId>
168-
<version>${xtend.version}</version>
169-
</dependency>
170-
<dependency>
170+
<!-- used mainly to access the database via JdbcTemplate-->
171171
<groupId>org.springframework</groupId>
172172
<artifactId>spring-jdbc</artifactId>
173-
<version>5.2.4.RELEASE</version>
173+
<version>5.2.6.RELEASE</version>
174174
</dependency>
175175
<dependency>
176+
<!-- used for HtmlUtils.htmlEscape in RunnerPanel-->
176177
<groupId>org.springframework</groupId>
177178
<artifactId>spring-web</artifactId>
178-
<version>5.2.4.RELEASE</version>
179+
<version>5.2.6.RELEASE</version>
179180
</dependency>
180181
<dependency>
182+
<!-- optional, for RunGenerator and TestGenerator-->
181183
<groupId>org.oddgen</groupId>
182184
<artifactId>org.oddgen.sqldev</artifactId>
183185
<version>0.3.1</version>
@@ -204,34 +206,6 @@
204206
</resource>
205207
</resources>
206208
<plugins>
207-
<plugin>
208-
<groupId>org.eclipse.xtend</groupId>
209-
<artifactId>xtend-maven-plugin</artifactId>
210-
<!-- change version might need "mvn -U" to update snapshots-->
211-
<version>${xtend.version}</version>
212-
<executions>
213-
<execution>
214-
<id>main</id>
215-
<goals>
216-
<goal>compile</goal>
217-
</goals>
218-
<configuration>
219-
<javaSourceVersion>${jdk.version}</javaSourceVersion>
220-
<outputDirectory>${project.basedir}/src/main/xtend-gen</outputDirectory>
221-
</configuration>
222-
</execution>
223-
<execution>
224-
<id>test</id>
225-
<goals>
226-
<goal>testCompile</goal>
227-
</goals>
228-
<configuration>
229-
<javaSourceVersion>${jdk.version.test}</javaSourceVersion>
230-
<testOutputDirectory>${project.basedir}/src/test/xtend-gen</testOutputDirectory>
231-
</configuration>
232-
</execution>
233-
</executions>
234-
</plugin>
235209
<plugin>
236210
<groupId>org.apache.maven.plugins</groupId>
237211
<version>3.8.1</version>
@@ -266,9 +240,7 @@
266240
<artifactId>maven-surefire-plugin</artifactId>
267241
<version>2.22.2</version>
268242
<configuration>
269-
<!-- -noverify is required in some environments to avoid java.lang.VerifyError-->
270-
<argLine>-noverify
271-
-Djava.util.logging.config.file=${project.basedir}/src/test/resources/logging.conf</argLine>
243+
<!-- argline moved to properties, to make it work with jacoco plugin-->
272244
<includes>
273245
<include>**/*.java</include>
274246
</includes>
@@ -296,7 +268,7 @@
296268
<plugin>
297269
<groupId>org.apache.maven.plugins</groupId>
298270
<artifactId>maven-antrun-plugin</artifactId>
299-
<version>1.8</version><!--$NO-MVN-MAN-VER$-->
271+
<version>3.0.0</version><!--$NO-MVN-MAN-VER$-->
300272
<executions>
301273
<execution>
302274
<phase>prepare-package</phase>
@@ -424,13 +396,13 @@
424396
org.utplsql.sqldev.resources
425397
</Export-Package>
426398
<_exportcontents>
427-
org.eclipse.xtext.xbase.lib,
428399
org.aspectj.runtime.internal,
429400
org.aspectj.lang,
430401
org.aspectj.runtime,
431402
org.aspectj.lang.reflect
432403
</_exportcontents>
433404
<Require-Bundle>
405+
oracle.javatools,
434406
oracle.javatools-nodeps,
435407
oracle.jdeveloper.db.connection,
436408
oracle.idert,
@@ -450,7 +422,7 @@
450422
</plugin>
451423
<plugin>
452424
<artifactId>maven-assembly-plugin</artifactId>
453-
<version>3.2.0</version><!--$NO-MVN-MAN-VER$-->
425+
<version>3.3.0</version><!--$NO-MVN-MAN-VER$-->
454426
<configuration>
455427
<finalName>${final.name}</finalName>
456428
<appendAssemblyId>false</appendAssemblyId>
@@ -472,7 +444,7 @@
472444
<plugin>
473445
<groupId>net.nicoulaj.maven.plugins</groupId>
474446
<artifactId>checksum-maven-plugin</artifactId>
475-
<version>1.8</version>
447+
<version>1.9</version>
476448
<executions>
477449
<execution>
478450
<id>calculate-checksums</id>
@@ -483,10 +455,30 @@
483455
</execution>
484456
</executions>
485457
</plugin>
458+
<plugin>
459+
<groupId>org.jacoco</groupId>
460+
<artifactId>jacoco-maven-plugin</artifactId>
461+
<version>0.8.5</version>
462+
<executions>
463+
<execution>
464+
<goals>
465+
<goal>prepare-agent</goal>
466+
</goals>
467+
</execution>
468+
<execution>
469+
<id>report</id>
470+
<phase>prepare-package</phase>
471+
<goals>
472+
<goal>report</goal>
473+
</goals>
474+
</execution>
475+
</executions>
476+
</plugin>
486477
</plugins>
487478
<pluginManagement>
488479
<plugins>
489480
<plugin>
481+
<!-- Dummy plugin used in Eclipse IDE only-->
490482
<groupId>org.eclipse.m2e</groupId>
491483
<artifactId>lifecycle-mapping</artifactId>
492484
<version>1.0.0</version>
@@ -497,7 +489,7 @@
497489
<pluginExecutionFilter>
498490
<groupId>org.apache.maven.plugins</groupId>
499491
<artifactId>maven-dependency-plugin</artifactId>
500-
<versionRange>[3.1.1,)</versionRange>
492+
<versionRange>[3.1.2,)</versionRange>
501493
<goals>
502494
<goal>copy-dependencies</goal>
503495
</goals>
@@ -515,7 +507,7 @@
515507
build-helper-maven-plugin
516508
</artifactId>
517509
<versionRange>
518-
[3.0.0,)
510+
[3.1.0,)
519511
</versionRange>
520512
<goals>
521513
<goal>parse-version</goal>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp