Skip to content

Commit 6d7043a

Browse files
jeffgbutlerjeffgbutler
committed
[generator] Build upload bundle correctly and switch site to transitional xhtml format
1 parent f9291e4 commit 6d7043a

Some content is hidden

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

51 files changed

+177
-109
lines changed

‎mybatis-generator-core/README.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
Overview
33
--------
44
MyBatis Generator (MBG) is a code generator for the MyBatis (and iBATIS) SQL
5-
mapping framefork. MBG will introspect database tables (through JDBC
5+
mapping framework. MBG will introspect database tables (through JDBC
66
DatabaseMetaData) and generate SQL Map XML files, Java model object (POJOs)
77
that match the table, and (optionally) Java client classes that use the other
88
generated objects.
99

1010
For full documentation, please refer to the user's manual at
11-
doc/html/index.html in this distribution.
11+
docs/index.html in this distribution.
1212

1313
Dependencies
1414
------------

‎mybatis-generator-core/pom.xml‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,42 @@
3737
consolidated coverage information
3838
-->
3939
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-site-plugin</artifactId>
43+
<executions>
44+
<execution>
45+
<phase>prepare-package</phase>
46+
<goals>
47+
<goal>site</goal>
48+
</goals>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-source-plugin</artifactId>
55+
<executions>
56+
<execution>
57+
<phase>prepare-package</phase>
58+
<goals>
59+
<goal>jar-no-fork</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-javadoc-plugin</artifactId>
67+
<executions>
68+
<execution>
69+
<phase>prepare-package</phase>
70+
<goals>
71+
<goal>jar</goal>
72+
</goals>
73+
</execution>
74+
</executions>
75+
</plugin>
4076
<plugin>
4177
<groupId>org.codehaus.mojo</groupId>
4278
<artifactId>cobertura-maven-plugin</artifactId>
@@ -94,13 +130,13 @@
94130
<groupId>org.apache.maven.plugins</groupId>
95131
<artifactId>maven-assembly-plugin</artifactId>
96132
<configuration>
97-
<descriptorRefs>
98-
<descriptorRef>bin</descriptorRef>
99-
</descriptorRefs>
100-
</configuration>
133+
<descriptors>
134+
<descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
135+
</descriptors>
136+
</configuration>
101137
<executions>
102138
<execution>
103-
<id>make-assembly</id>
139+
<id>bundle</id>
104140
<goals>
105141
<goal>single</goal>
106142
</goals>
@@ -120,7 +156,7 @@
120156
<configuration>
121157
<uploads>
122158
<upload>
123-
<file>${project.build.directory}/${project.artifactId}-${project.version}-bin.zip</file>
159+
<file>${project.build.directory}/${project.artifactId}-${project.version}-bundle.zip</file>
124160
<summary>MyBatis Generator ${project.version}</summary>
125161
<labels>
126162
<label>Featured</label>

‎mybatis-generator-core/src/main/assembly/src.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
4+
<id>bundle</id>
5+
<formats>
6+
<format>zip</format>
7+
</formats>
8+
<fileSets>
9+
<fileSet>
10+
<includes>
11+
<include>${project.basedir}/README*</include>
12+
<include>${project.basedir}/LICENSE*</include>
13+
<include>${project.basedir}/NOTICE*</include>
14+
</includes>
15+
</fileSet>
16+
<fileSet>
17+
<directory>${project.build.directory}</directory>
18+
<outputDirectory>lib</outputDirectory>
19+
<includes>
20+
<include>*.jar</include>
21+
</includes>
22+
</fileSet>
23+
<fileSet>
24+
<directory>${project.build.directory}/site</directory>
25+
<outputDirectory>docs</outputDirectory>
26+
<includes>
27+
<include>**/*.*</include>
28+
</includes>
29+
</fileSet>
30+
</fileSets>
31+
</assembly>

‎mybatis-generator-core/src/site/xhtml/afterRunning.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>Tasks After Running MyBatis Generator</title>

‎mybatis-generator-core/src/site/xhtml/configreference/classPathEntry.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;classPathEntry&gt; Element</title>

‎mybatis-generator-core/src/site/xhtml/configreference/columnOverride.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;columnOverride&gt; Element</title>

‎mybatis-generator-core/src/site/xhtml/configreference/columnRenamingRule.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;columnRenamingRule&gt; Element</title>

‎mybatis-generator-core/src/site/xhtml/configreference/commentGenerator.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;commentGenerator&gt; Element</title>

‎mybatis-generator-core/src/site/xhtml/configreference/context.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;context&gt; Element</title>

‎mybatis-generator-core/src/site/xhtml/configreference/generatedKey.xhtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
3+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
66
<title>The &lt;generatedKey&gt; Element</title>

0 commit comments

Comments
 (0)