Skip to content

Commit fb72230

Browse files
GedMarcGedMarc
committed
Split of Core and Client
1 parent 2855f84 commit fb72230

File tree

384 files changed

+3238
-20346
lines changed

Some content is hidden

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

384 files changed

+3238
-20346
lines changed

‎pom.xml

Lines changed: 26 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<parent>
66
<groupId>com.jwebmp</groupId>
7-
<artifactId>jwebmp-parent</artifactId>
7+
<artifactId>parent</artifactId>
88
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

@@ -21,11 +21,15 @@
2121
<project.scm.nameUrl>/JWebMP/Core</project.scm.nameUrl>
2222

2323
<ignore.moditect>true</ignore.moditect>
24-
<flatten.pom>false</flatten.pom>
2524
</properties>
2625

2726
<dependencies>
2827

28+
<dependency>
29+
<groupId>com.jwebmp.client</groupId>
30+
<artifactId>jwebmp-client</artifactId>
31+
</dependency>
32+
2933
<dependency>
3034
<groupId>com.jwebmp.core</groupId>
3135
<artifactId>jwebmp-testlib</artifactId>
@@ -45,6 +49,7 @@
4549
<dependency>
4650
<groupId>com.guicedee</groupId>
4751
<artifactId>guice-injection</artifactId>
52+
<scope>test</scope>
4853
</dependency>
4954

5055
<dependency>
@@ -133,82 +138,26 @@
133138
</dependencyManagement>
134139

135140
<build>
136-
<resources>
137-
<resource>
138-
<directory>src/main/webapp</directory>
139-
<includes>
140-
<include>**/*.js</include>
141-
<include>**/*.json</include>
142-
<include>**/*.css</include>
143-
<include>**/*.min</include>
144-
<include>**/*.html</include>
145-
<include>**/*.htm</include>
146-
<include>**/*.txt</include>
147-
<include>**/*.sql</include>
148-
</includes>
149-
</resource>
150-
<resource>
151-
<directory>src/main/java</directory>
152-
<includes>
153-
<include>**/*.js</include>
154-
<include>**/*.json</include>
155-
<include>**/*.css</include>
156-
<include>**/*.min</include>
157-
<include>**/*.html</include>
158-
<include>**/*.htm</include>
159-
<include>**/*.txt</include>
160-
<include>**/*.sql</include>
161-
</includes>
162-
</resource>
163-
<resource>
164-
<directory>src/main/resources</directory>
165-
<excludes>
166-
<exclude>**/*.gzip</exclude>
167-
<exclude>**/*.map</exclude>
168-
<exclude>**/*.md</exclude>
169-
<exclude>**/*.md</exclude>
170-
<exclude>**/package.json</exclude>
171-
<exclude>**/bower.json</exclude>
172-
<exclude>**/.bower.json</exclude>
173-
<exclude>**/.gitignore</exclude>
174-
<exclude>**/.jshint</exclude>
175-
<exclude>**/.jshint</exclude>
176-
<exclude>**/Gruntfile.js</exclude>
177-
<exclude>**/*.sh</exclude>
178-
</excludes>
179-
</resource>
180-
<resource>
181-
<directory>src/main/java</directory>
182-
<includes>
183-
<include>**/*.java</include>
184-
<include>**/*.xml</include>
185-
<include>**/*.txt</include>
186-
</includes>
187-
</resource><resource>
188-
<directory>jar-resources</directory>
189-
<targetPath>${project.build.outputDirectory}/META-INF/resources/</targetPath>
190-
<excludes>
191-
<exclude>**/*.gzip</exclude>
192-
<exclude>**/*.md</exclude>
193-
<exclude>**/*.md</exclude>
194-
<exclude>**/package.json</exclude>
195-
<exclude>**/bower.json</exclude>
196-
<exclude>**/.bower.json</exclude>
197-
<exclude>**/.gitignore</exclude>
198-
<exclude>**/.jshint</exclude>
199-
<exclude>**/.jshint</exclude>
200-
<exclude>**/Gruntfile.js</exclude>
201-
<exclude>**/*.sh</exclude>
202-
</excludes>
203-
</resource>
204-
</resources>
205-
206-
<plugins>
141+
<!--<plugins>
207142
<plugin>
208-
<groupId>org.codehaus.mojo</groupId>
209-
<artifactId>flatten-maven-plugin</artifactId>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-compiler-plugin</artifactId>
145+
<inherited>true</inherited>
146+
<configuration>
147+
<annotationProcessorPaths>
148+
<annotationProcessorPath>
149+
<groupId>org.projectlombok</groupId>
150+
<artifactId>lombok</artifactId>
151+
<version>${lombok.version}</version>
152+
</annotationProcessorPath>
153+
</annotationProcessorPaths>
154+
<annotationProcessors>
155+
<annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor
156+
</annotationProcessor>
157+
</annotationProcessors>
158+
<failOnError>true</failOnError>
159+
</configuration>
210160
</plugin>
211-
</plugins>
161+
</plugins>-->
212162
</build>
213-
214163
</project>

‎src/jre11/java/.gitignore

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

‎src/jre11/resources/.gitignore

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

‎src/jre8/java/.gitignore

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

‎src/jre8/resources/.gitignore

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

‎src/main/java/com/jwebmp/core/CSSComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @since 2015/04/24
3737
*/
3838
public class CSSComponent<J extends CSSComponent<J>>
39-
extends Component<IComponentHierarchyBase<?,?>, NoAttributes, GlobalFeatures, GlobalEvents, J>
39+
extends Component<GlobalChildren, NoAttributes, GlobalFeatures, GlobalEvents, J>
4040
implements GlobalChildren
4141
{
4242
/**

0 commit comments

Comments
 (0)