Skip to content

Commit

Permalink
Split of Core and Client
Browse files Browse the repository at this point in the history
  • Loading branch information
@GedMarc
GedMarc committed Mar 2, 2024
1 parent 2855f84 commit fb72230
Show file tree
Hide file tree
Showing 384 changed files with 3,238 additions and 20,346 deletions.
103 changes: 26 additions & 77 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<parent>
<groupId>com.jwebmp</groupId>
<artifactId>jwebmp-parent</artifactId>
<artifactId>parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

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

<ignore.moditect>true</ignore.moditect>
<flatten.pom>false</flatten.pom>
</properties>

<dependencies>

<dependency>
<groupId>com.jwebmp.client</groupId>
<artifactId>jwebmp-client</artifactId>
</dependency>

<dependency>
<groupId>com.jwebmp.core</groupId>
<artifactId>jwebmp-testlib</artifactId>
Expand All @@ -45,6 +49,7 @@
<dependency>
<groupId>com.guicedee</groupId>
<artifactId>guice-injection</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -133,82 +138,26 @@
</dependencyManagement>

<build>
<resources>
<resource>
<directory>src/main/webapp</directory>
<includes>
<include>**/*.js</include>
<include>**/*.json</include>
<include>**/*.css</include>
<include>**/*.min</include>
<include>**/*.html</include>
<include>**/*.htm</include>
<include>**/*.txt</include>
<include>**/*.sql</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.js</include>
<include>**/*.json</include>
<include>**/*.css</include>
<include>**/*.min</include>
<include>**/*.html</include>
<include>**/*.htm</include>
<include>**/*.txt</include>
<include>**/*.sql</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/*.gzip</exclude>
<exclude>**/*.map</exclude>
<exclude>**/*.md</exclude>
<exclude>**/*.md</exclude>
<exclude>**/package.json</exclude>
<exclude>**/bower.json</exclude>
<exclude>**/.bower.json</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/.jshint</exclude>
<exclude>**/.jshint</exclude>
<exclude>**/Gruntfile.js</exclude>
<exclude>**/*.sh</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
<include>**/*.xml</include>
<include>**/*.txt</include>
</includes>
</resource><resource>
<directory>jar-resources</directory>
<targetPath>${project.build.outputDirectory}/META-INF/resources/</targetPath>
<excludes>
<exclude>**/*.gzip</exclude>
<exclude>**/*.md</exclude>
<exclude>**/*.md</exclude>
<exclude>**/package.json</exclude>
<exclude>**/bower.json</exclude>
<exclude>**/.bower.json</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/.jshint</exclude>
<exclude>**/.jshint</exclude>
<exclude>**/Gruntfile.js</exclude>
<exclude>**/*.sh</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!--<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
<annotationProcessors>
<annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor
</annotationProcessor>
</annotationProcessors>
<failOnError>true</failOnError>
</configuration>
</plugin>
</plugins>
</plugins>-->
</build>

</project>
20 changes: 0 additions & 20 deletions src/jre11/java/.gitignore
View file

This file was deleted.

20 changes: 0 additions & 20 deletions src/jre11/resources/.gitignore
View file

This file was deleted.

20 changes: 0 additions & 20 deletions src/jre8/java/.gitignore
View file

This file was deleted.

20 changes: 0 additions & 20 deletions src/jre8/resources/.gitignore
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/com/jwebmp/core/CSSComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @since 2015/04/24
*/
public class CSSComponent<J extends CSSComponent<J>>
extends Component<IComponentHierarchyBase<?,?>, NoAttributes, GlobalFeatures, GlobalEvents, J>
extends Component<GlobalChildren, NoAttributes, GlobalFeatures, GlobalEvents, J>
implements GlobalChildren
{
/**
Expand Down
Loading

0 comments on commit fb72230

Please sign in to comment.