Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8b9555f

Browse files
Merge pull request SmartBear#505 from SmartBear/openjdk12
Openjdk12
2 parents d2ba74a + c8f8c2c commit 8b9555f

File tree

15 files changed

+455
-277
lines changed

15 files changed

+455
-277
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ By downloading our software, you agree to our [license](https://www.soapui.org/d
3636

3737
### Prerequisites
3838

39-
* [JDK 8 (update 112 or later)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
40-
* [Maven (version 3.0.0 or later)](http://maven.apache.org/)
39+
* [JDK 12](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
40+
* [Maven (version 3.0.5 or later)](http://maven.apache.org/)
4141
* [Git (version 1.8 or later)](http://git-scm.com)
4242

4343
### Get the source code for the first time

RELEASENOTES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
* update junit jar versions. junit:4.12
1616

17+
* move to openjdk 12
18+
1719
### Bug Fixes ###
1820

1921
* SoapUI 5.5.0 will not run project or suites - Toolkit not initialized error

pom.xml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,18 @@
1616
<url>https://www.soapui.org/repository/maven2</url>
1717
</repository>
1818
</repositories>
19+
<pluginRepositories>
20+
<pluginRepository>
21+
<id>smartbear-plugin-repository</id>
22+
<url>https://www.soapui.org/repository/maven2</url>
23+
</pluginRepository>
24+
</pluginRepositories>
1925

2026
<properties>
2127
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2228
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
29+
<requireMavenVersion-value>3.0.5</requireMavenVersion-value>
30+
<maxJdkVersion-value>12</maxJdkVersion-value>
2331

2432
<!-- Custom properties -->
2533
<assembly.build.directory>${project.build.directory}/assemblies</assembly.build.directory>
@@ -30,9 +38,7 @@
3038
<project.name.visible>SoapUI</project.name.visible>
3139
<project.src.artifactId>soapui</project.src.artifactId>
3240

33-
<javafx.version>2.2</javafx.version>
34-
<!-- Set this property to the location of your JavaFX runtime jar if you want to compile with Java 6 -->
35-
<javafx.runtime.lib.jar>${java.home}/lib/jfxrt.jar</javafx.runtime.lib.jar>
41+
<analytics.version>5.5.1</analytics.version>
3642

3743
<!-- org.apache.maven.plugins -->
3844
<maven-enforcer-plugin-version>3.0.0-M2</maven-enforcer-plugin-version>
@@ -47,14 +53,24 @@
4753
<maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
4854
<maven-failsafe-plugin-version>3.0.0-M3</maven-failsafe-plugin-version>
4955
<maven-assembly-plugin-version>3.1.1</maven-assembly-plugin-version>
56+
<!-- org.apache.xmlbeans -->
57+
<xmlbeans-version>3.1.1-sb-fixed</xmlbeans-version>
58+
<xmlbeans-xpath-version>2.6.0</xmlbeans-xpath-version>
59+
<xmlbeans-xmlpublic-version>2.6.0</xmlbeans-xmlpublic-version>
5060
<!-- org.codehaus.mojo -->
5161
<versions-maven-plugin-version>2.7</versions-maven-plugin-version>
5262
<exec-maven-plugin-version>1.6.0</exec-maven-plugin-version>
53-
63+
<xmlbeans-maven-plugin-version>2.3.5-sb-fixed</xmlbeans-maven-plugin-version>
64+
<!-- org.openjfx-->
65+
<javafx-base-version>12</javafx-base-version>
66+
<javafx-controls-version>12</javafx-controls-version>
67+
<javafx-graphics-version>12</javafx-graphics-version>
68+
<javafx-media-version>12</javafx-media-version>
69+
<javafx-web-version>12</javafx-web-version>
70+
<javafx-swing-version>12</javafx-swing-version>
5471
<!-- other -->
5572
<maven-gitlog-plugin-version>1.9.1</maven-gitlog-plugin-version>
5673

57-
<requireMavenVersion-value>3.0.5</requireMavenVersion-value>
5874
</properties>
5975

6076
<modules>
@@ -97,7 +113,7 @@
97113
<version>${maven-compiler-plugin-version}</version>
98114
<configuration>
99115
<source>1.8</source>
100-
<target>1.8</target>
116+
<target>1.9</target>
101117
</configuration>
102118
</plugin>
103119
<plugin>
@@ -106,7 +122,6 @@
106122
<version>${maven-javadoc-plugin-version}</version>
107123
<configuration>
108124
<maxmemory>1024m</maxmemory>
109-
<additionalparam>-Xdoclint:none</additionalparam>
110125
</configuration>
111126
</plugin>
112127
<plugin>
@@ -134,9 +149,8 @@
134149
</goals>
135150
<configuration>
136151
<rules>
137-
<!-- http://mojo.codehaus.org/extra-enforcer-rules/enforceBytecodeVersion.html -->
138152
<enforceBytecodeVersion>
139-
<maxJdkVersion>1.8</maxJdkVersion>
153+
<maxJdkVersion>${maxJdkVersion-value}</maxJdkVersion>
140154
</enforceBytecodeVersion>
141155
</rules>
142156
<fail>true</fail>

soapui-installer/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
<descriptor>src/main/assembly/dist.xml</descriptor>
6969
<descriptor>src/main/assembly/dist-standalone.xml</descriptor>
7070
<descriptor>src/main/assembly/windows-bin.xml</descriptor>
71-
<descriptor>src/main/assembly/win32-standalone-bin.xml</descriptor>
7271
<descriptor>src/main/assembly/linux-bin.xml</descriptor>
7372
<descriptor>src/main/assembly/mac-bin.xml</descriptor>
7473
</descriptors>
@@ -169,25 +168,16 @@
169168
<file>
170169
${assembly.build.directory}/${project.name.visible}-${project.version}-windows-bin.zip
171170
</file>
172-
<file>
173-
${assembly.build.directory}/${project.name.visible}-${project.version}-win32-standalone-bin.zip
174-
</file>
175171
<file>
176172
${assembly.build.directory}/${project.name.visible}-${project.version}-linux-bin.tar.gz
177173
</file>
178174
<file>
179175
${assembly.build.directory}/${project.name.visible}-${project.version}-mac-bin.zip
180176
</file>
181177
<!-- Installers -->
182-
<file>
183-
${installer.build.directory}/${project.name.visible}-x32-${project.version}.exe
184-
</file>
185178
<file>
186179
${installer.build.directory}/${project.name.visible}-x64-${project.version}.exe
187180
</file>
188-
<file>
189-
${installer.build.directory}/${project.name.visible}-x32-${project.version}.sh
190-
</file>
191181
<file>
192182
${installer.build.directory}/${project.name.visible}-x64-${project.version}.sh
193183
</file>
Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
202+

0 commit comments

Comments
 (0)