Skip to content

Commit de93eed

Browse files
authored
Merge pull request #1444 from jeffgbutler/eclipse-build-improvements
Eclipse build improvements
2 parents e642182 + 323b9b1 commit de93eed

File tree

10 files changed

+51
-379
lines changed

10 files changed

+51
-379
lines changed

eclipse/.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<extension>
2121
<groupId>org.eclipse.tycho</groupId>
2222
<artifactId>tycho-build</artifactId>
23-
<version>5.0.2</version>
23+
<version>${tycho-version}</version>
2424
</extension>
2525
<extension>
2626
<groupId>fr.jcgay.maven</groupId>

eclipse/.mvn/maven.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5
22
-Daether.connector.smartChecksums=false
33
--no-transfer-progress
4+
-Dtycho-version=5.0.2
5+

eclipse/org.mybatis.generator.core/build.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ bin.includes = META-INF/,\
2424
NOTICE
2525
src.includes = LICENSE,\
2626
NOTICE\
27-
28-
customBuildCallbacks=customBuildCallbacks.xml

eclipse/org.mybatis.generator.core/customBuildCallbacks.xml

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ <h2>Eclipse Workspace Setup</h2>
151151
<code>org.mybatis.generator.core</code> project. There are two ways to solve this:
152152
<ol type="a">
153153
<li>If you are comfortable with Maven, then you can run the Maven build by
154-
executing "./mvnw clean integration-test" on the <code>pom.xml</code> in the
154+
executing "./mvnw clean verify" on the <code>pom.xml</code> in the
155155
parent directory of all Eclipse projects (../eclipse)
156156
A slight warning: this will download many
157157
dependent JARs from Maven central and eclipse.org the first time you run it.
@@ -255,7 +255,7 @@ <h2>Building the Feature for Local Distribution</h2>
255255
<p>If you want to build an updated version of the feature and distribute it locally, then
256256
follow these steps:</p>
257257
<ol>
258-
<li>Run the Maven build by running "./mvnw clean integration-test" in the parent directory of
258+
<li>Run the Maven build by running "./mvnw clean verify" in the parent directory of
259259
all projects (".../eclipse")</li>
260260
<li>Once the build completes the feature will be available in the <code>target/repository</code>
261261
directory of the <code>org.mybatis.generator.eclipse.site</code> project.</li>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@ <h1>Publishing a New Version</h1>
3636
<li>Follow the instructions in <a href="buildingFromSource.html">Building from Source</a> to
3737
checkout the source and setup the projects in Eclipse. You can use the steps
3838
on that page to debug any changes and ensure that the build works properly.</li>
39-
<li>Once you are ready to publish, run "<code>./mvnw -Prelease-composite clean integration-test</code>"
39+
<li>Once you are ready to publish, run "<code>./mvnw clean verify -Prelease-composite</code>"
4040
on the <code>pom.xml</code> in the parent directory of all eclipse projects ("../eclipse"). This turns on
4141
the "release-composite"
4242
profile which adds build steps to retrieve the current P2 metadata from GitHub and prepare
4343
the release artifacts for uploading.
4444
</li>
45+
<li>The "release-composite" profile also includes artifact signing with GPG
46+
so make sure you have your key setup and know your password.
47+
If you are running the release on a Mac or Linux, you might get an error during the signing phase
48+
related to "Inappropriate ioctl for device".
49+
You can usually resolve this by entering <code>export GPG_TTY=$(tty)</code> in your terminal.
50+
</li>
4551
<li>After the build runs, you should see a new subdirectory "<code>target/p2-composite-repo</code>" in the
4652
<code>org.mybatis.generator.eclipse.site</code> project. That directory will contain all
4753
the updated artifacts for uploading to GitHub.

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

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

0 commit comments

Comments
 (0)