Skip to content

Commit d3a30e9

Browse files
zbynekzbynek
committed
Merge repositories
1 parent a0f659d commit d3a30e9

File tree

484 files changed

+7705
-4
lines changed

Some content is hidden

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

484 files changed

+7705
-4
lines changed

‎.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gwt-site.iml
55
npm-debug.log
66
node/
77
node_modules/
8-
src/main/site/assets/build/css/
9-
src/main/site/assets/build/img/
10-
src/main/site/assets/build/js/global.js
11-
src/main/site/assets/build/js/global.min.js
8+
content/src/main/site/assets/build/css/
9+
content/src/main/site/assets/build/img/
10+
content/src/main/site/assets/build/js/global.js
11+
content/src/main/site/assets/build/js/global.min.js

‎content/pom.xml

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.gwtproject.site</groupId>
7+
<version>2.0-SNAPSHOT</version>
8+
<artifactId>gwt-site-parent</artifactId>
9+
</parent>
10+
<artifactId>gwt-site</artifactId>
11+
12+
<packaging>jar</packaging>
13+
14+
15+
<name>markdown</name>
16+
<url>http://www.gwtproject.org</url>
17+
18+
<properties>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<maven.compiler.target>1.8</maven.compiler.target>
21+
<maven.compiler.source>1.8</maven.compiler.source>
22+
</properties>
23+
24+
<build>
25+
<finalName>generated-site</finalName>
26+
<resources>
27+
<resource>
28+
<directory>src/main/markdown</directory>
29+
</resource>
30+
<resource>
31+
<directory>src/main/site</directory>
32+
</resource>
33+
<resource>
34+
<directory>src/main/resources</directory>
35+
</resource>
36+
</resources>
37+
<plugins>
38+
<plugin>
39+
<groupId>org.codehaus.mojo</groupId>
40+
<artifactId>exec-maven-plugin</artifactId>
41+
<version>1.1.1</version>
42+
<executions>
43+
<execution>
44+
<phase>prepare-package</phase>
45+
<goals>
46+
<goal>java</goal>
47+
</goals>
48+
<configuration>
49+
<mainClass>com.google.gwt.site.markdown.MarkDown</mainClass>
50+
<arguments>
51+
<argument>${basedir}/src/main/markdown/</argument>
52+
<argument>${basedir}/target/generated-site</argument>
53+
<argument>${basedir}/src/main/resources/main.tpl</argument>
54+
<argument>${basedir}/src/main/resources/toc.md</argument>
55+
</arguments>
56+
</configuration>
57+
</execution>
58+
</executions>
59+
</plugin>
60+
61+
<plugin>
62+
<artifactId>maven-resources-plugin</artifactId>
63+
<version>2.6</version>
64+
<executions>
65+
<execution>
66+
<id>copy doc resources</id>
67+
<!-- here the phase you need -->
68+
<phase>prepare-package</phase>
69+
<goals>
70+
<goal>copy-resources</goal>
71+
</goals>
72+
<configuration>
73+
<nonFilteredFileExtensions>
74+
<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
75+
<nonFilteredFileExtension>woff</nonFilteredFileExtension>
76+
<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
77+
<nonFilteredFileExtension>eot</nonFilteredFileExtension>
78+
</nonFilteredFileExtensions>
79+
<outputDirectory>${basedir}/target/generated-site</outputDirectory>
80+
<resources>
81+
<resource>
82+
<directory>src/main/site/</directory>
83+
<excludes>
84+
<exclude>assets/img/*</exclude>
85+
<exclude>assets/js/*</exclude>
86+
<exclude>assets/less/*</exclude>
87+
</excludes>
88+
<filtering>true</filtering>
89+
</resource>
90+
</resources>
91+
</configuration>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
<plugin>
96+
<artifactId>maven-dependency-plugin</artifactId>
97+
<executions>
98+
<execution>
99+
<id>unpack</id>
100+
<phase>prepare-package</phase>
101+
<goals>
102+
<goal>unpack</goal>
103+
</goals>
104+
<configuration>
105+
<artifactItems>
106+
<artifactItem>
107+
<groupId>org.gwtproject</groupId>
108+
<artifactId>gwt-dev</artifactId>
109+
<version>2.12.2</version>
110+
<classifier>javadoc</classifier>
111+
</artifactItem>
112+
</artifactItems>
113+
<outputDirectory>${project.build.directory}/generated-site/javadoc/latest</outputDirectory>
114+
</configuration>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
<plugin>
119+
<artifactId>maven-assembly-plugin</artifactId>
120+
<executions>
121+
<execution>
122+
<id>assemble</id>
123+
<phase>package</phase>
124+
<goals>
125+
<goal>single</goal>
126+
</goals>
127+
</execution>
128+
</executions>
129+
<configuration>
130+
<descriptors>
131+
<descriptor>src/main/assembly/generated-site.xml</descriptor>
132+
</descriptors>
133+
</configuration>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.eclipse.jetty</groupId>
137+
<artifactId>jetty-maven-plugin</artifactId>
138+
<version>9.4.28.v20200408</version>
139+
<configuration>
140+
<httpConnector>
141+
<port>9999</port>
142+
</httpConnector>
143+
<supportedPackagings>
144+
<supportedPackaging>jar</supportedPackaging>
145+
</supportedPackagings>
146+
<webAppSourceDirectory>${project.build.directory}/generated-site</webAppSourceDirectory>
147+
</configuration>
148+
</plugin>
149+
</plugins>
150+
</build>
151+
152+
<dependencies>
153+
<dependency>
154+
<groupId>junit</groupId>
155+
<artifactId>junit</artifactId>
156+
<version>4.13.1</version>
157+
<scope>test</scope>
158+
</dependency>
159+
160+
<dependency>
161+
<groupId>org.commonmark</groupId>
162+
<artifactId>commonmark</artifactId>
163+
<!-- last version supporting Java 8 -->
164+
<version>0.21.0</version>
165+
</dependency>
166+
167+
<dependency>
168+
<groupId>org.commonmark</groupId>
169+
<artifactId>commonmark-ext-gfm-tables</artifactId>
170+
<!-- last version supporting Java 8 -->
171+
<version>0.21.0</version>
172+
</dependency>
173+
<dependency>
174+
<groupId>commons-io</groupId>
175+
<artifactId>commons-io</artifactId>
176+
<version>2.7</version>
177+
</dependency>
178+
</dependencies>
179+
180+
<profiles>
181+
<profile>
182+
<id>grunt</id>
183+
184+
<build>
185+
<plugins>
186+
<plugin>
187+
<groupId>com.github.eirslett</groupId>
188+
<artifactId>frontend-maven-plugin</artifactId>
189+
<version>1.9.1</version>
190+
<executions>
191+
<execution>
192+
<id>install node and npm</id>
193+
<phase>generate-resources</phase>
194+
<goals>
195+
<goal>install-node-and-npm</goal>
196+
</goals>
197+
<configuration>
198+
<nodeVersion>v10.16.0</nodeVersion>
199+
<npmVersion>6.9.0</npmVersion>
200+
</configuration>
201+
</execution>
202+
<execution>
203+
<id>npm install</id>
204+
<phase>generate-resources</phase>
205+
<goals>
206+
<goal>npm</goal>
207+
</goals>
208+
<configuration>
209+
<arguments>install</arguments>
210+
</configuration>
211+
</execution>
212+
<execution>
213+
<id>grunt build</id>
214+
<phase>generate-resources</phase>
215+
<goals>
216+
<goal>grunt</goal>
217+
</goals>
218+
<configuration>
219+
<arguments>
220+
concat uglify imagemin less
221+
</arguments>
222+
</configuration>
223+
</execution>
224+
</executions>
225+
</plugin>
226+
</plugins>
227+
</build>
228+
</profile>
229+
</profiles>
230+
</project>

‎src/main/assembly/generated-site.xml renamed to ‎content/src/main/assembly/generated-site.xml

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/MDHelper.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/MDHelper.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/MDHelperException.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/MDHelperException.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/MDTranslator.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/MDTranslator.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/MarkDown.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/MarkDown.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/MarkupWriter.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/MarkupWriter.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/TranslatorException.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/TranslatorException.java

File renamed without changes.

‎src/main/java/com/google/gwt/site/markdown/Util.java renamed to ‎content/src/main/java/com/google/gwt/site/markdown/Util.java

File renamed without changes.

0 commit comments

Comments
 (0)