Skip to content

Commit 3b1da92

Browse files
authored
Merge pull request #1439 from jeffgbutler/eclipse-cleanup
Eclipse Cleanup
2 parents 996597f + d9fc00f commit 3b1da92

File tree

7 files changed

+11
-52
lines changed

7 files changed

+11
-52
lines changed

core/mybatis-generator-core/src/site/xhtml/running/runningWithEclipse.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ol>
3737
</li>
3838
<li>Manually configure an update site that points to
39-
<a href="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/">https://mybatis.jfrog.io/artifactory/generator-eclipse-release/</a></li>
39+
<a href="https://jeffgbutler.github.io/mybatis-generator-update-site/">https://jeffgbutler.github.io/mybatis-generator-update-site/</a></li>
4040
<li>Download the zipped eclipse update site from the GitHub release page
4141
(https://github.com/mybatis/generator/releases), unzip, and configure
4242
an update site that points to your unzipped directory.</li>

eclipse/org.mybatis.generator.eclipse.core.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: junit-jupiter-api;bundle-version="6.0.2",
99
assertj-core;bundle-version="3.27.7"
1010
Automatic-Module-Name: org.mybatis.generator.eclipse.core.tests
11-
Export-Package: org.mybatis.generator.eclipse.core.tests,
12-
org.mybatis.generator.eclipse.core.tests.callback,
11+
Export-Package: org.mybatis.generator.eclipse.core.tests.callback,
1312
org.mybatis.generator.eclipse.core.tests.merge,
1413
org.mybatis.generator.eclipse.core.tests.merge.resources,
1514
org.mybatis.generator.eclipse.core.tests.merge.support

eclipse/org.mybatis.generator.eclipse.core.tests/src/org/mybatis/generator/eclipse/core/tests/RunAllTests.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

eclipse/org.mybatis.generator.eclipse.doc/html-src/eclipseui/buildingFromSource.html

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h2>Build Overview</h2>
3737
regular Eclipse projects.</p>
3838

3939
<h2>Feature Structure</h2>
40-
<p>There are eleven total projects that makeup the feature. Some projects are just for build support and testing.</p>
40+
<p>There are nine total projects that makeup the feature. Some projects are just for build support and testing.</p>
4141
<p>The published MBG feature is composed of five different Eclipse projects - a feature project,
4242
and four plugin projects.
4343
The feature project groups the four plugins together for easy installation.
@@ -130,16 +130,16 @@ <h2>Eclipse Workspace Setup</h2>
130130
</li>
131131

132132
<li>Start Eclipse and make a new workspace</li>
133-
<li><b>Important:</b> make sure that a version 8.0 or higher JDK is available and visible to Eclipse
133+
<li><b>Important:</b> make sure that a version 21 or higher JDK is available and visible to Eclipse
134134
(Window&gt;Preferences&gt;Java&gt;Installed JREs). A JDK is required - a JRE
135-
alone will fail because of JavaDoc generation in the build and Tycho requires JDK 8.0 or above.</li>
135+
alone will fail because of JavaDoc generation in the build and Tycho requires JDK 21 or above.</li>
136136
<li>Import the projects into the workspace
137137
<ol type="a">
138138
<li>Start the Eclipse project import wizard
139139
(File&gt;Import&gt;General&gt;Existing Projects into Workspace)
140140
</li>
141141
<li>Set the root directory to the "eclipse" sub-directory in your Git clone</li>
142-
<li>Select all eleven projects, do not copy the projects into
142+
<li>Select all nine projects, do not copy the projects into
143143
your workspace.
144144
The filled out wizard looks similar to this: <br />
145145
<p><img src="importWizard.png" alt="Eclipse Project Import Wizard"/></p>
@@ -149,7 +149,8 @@ <h2>Eclipse Workspace Setup</h2>
149149
</li>
150150
<li>The project includes Eclipse target platform definition files. The purpose is to set the minimum version
151151
of Eclipse supported by the feature and to ensure that you do not inadvertently use Eclipse features from later
152-
versions. Target platform files are in the <code>releng</code> project. To activate
152+
versions. The target platform files also provide access to dependencies needed during the build.
153+
Target platform files are in the <code>releng</code> project. To activate
153154
the target platform, open the proper target file and click on the link that says "Set as active target platform". This action
154155
may take a few minutes to complete. The README in the releng project contains information about which target platform file to use.
155156
</li>
@@ -252,9 +253,6 @@ <h2>Running the Unit Tests</h2>
252253
</ol>
253254
</li>
254255
</ul>
255-
<p>To run all tests, run the class <code>org.mybatis.generator.eclipse.core.tests.RunAllTests</code>
256-
which contains a test suite of all unit tests.
257-
</p>
258256

259257
<h2>Building the Documentation</h2>
260258
<p>The documentation for MBG is integrated into the Eclipse help system.
@@ -282,7 +280,7 @@ <h2>Building the Feature for Local Distribution</h2>
282280
that points to this directory (Help&gt;Install New Software...) and install
283281
the new version with P2.</p>
284282

285-
<p>If you are interested in publishing a new version to JFrog, please see the
283+
<p>If you are interested in publishing a new version to GitHub, please see the
286284
instructions on the <a href="publishing.html">Publishing</a> page.
287285
</body>
288286
</html>
128 KB
Loading

eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
qualifiedVersion (standard Tycho property)
2929
project.build.directory (standard Maven property - points to the target directory)
3030
p2.repo.base.directory (the location of the composite repo. This might have been initialized
31-
by pulling a current copy from jfrog)
31+
by pulling a current copy from GitHub)
3232
3333
-->
3434
<project name="project" default="updateRepo">

eclipse/org.mybatis.generator/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
</license>
237237

238238
<url>
239-
<update label="MyBatis Generator Update Site" url="https://mybatis.jfrog.io/artifactory/generator-eclipse-release/"/>
239+
<update label="MyBatis Generator Update Site" url="https://jeffgbutler.github.io/mybatis-generator-update-site/"/>
240240
</url>
241241

242242
<plugin

0 commit comments

Comments
 (0)