Skip to content

Commit

Permalink
group and cleanup (eugenp#3027)
Browse files Browse the repository at this point in the history
* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup
  • Loading branch information
Doha2012 authored and pivovarit committed Nov 13, 2017
1 parent 2a85b9c commit 2e5531e
Show file tree
Hide file tree
Showing 198 changed files with 20 additions and 15 deletions.
File renamed without changes.
3 changes: 2 additions & 1 deletion guava18/pom.xml → guava-modules/guava-18/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.baeldung</groupId>
<artifactId>guava18</artifactId>
<artifactId>guava-18</artifactId>
<version>0.1.0-SNAPSHOT</version>

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion guava19/pom.xml → guava-modules/guava-19/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.baeldung</groupId>
<artifactId>guava19</artifactId>
<artifactId>guava-19</artifactId>
<version>0.1.0-SNAPSHOT</version>

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion guava21/pom.xml → guava-modules/guava-21/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>guava21</artifactId>
<artifactId>guava-21</artifactId>
<version>1.0-SNAPSHOT</version>

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion jee7/pom.xml → jee-7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.baeldung</groupId>
<artifactId>jee7</artifactId>
<artifactId>jee-7</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
<description>JavaEE 7 Arquillian Archetype Sample</description>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added libraries-data/file.dat
Binary file not shown.
File renamed without changes.
1 change: 1 addition & 0 deletions log-mdc/pom.xml → logging-modules/log-mdc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions log4j/pom.xml → logging-modules/log4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion log4j2/pom.xml → logging-modules/log4j2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
<module>testing-modules/groovy-spock</module>
<module>gson</module>
<module>guava</module>
<module>guava18</module>
<module>guava19</module>
<module>guava21</module>
<module>guava-modules/guava-18</module>
<module>guava-modules/guava-19</module>
<module>guava-modules/guava-21</module>
<module>guice</module>
<module>disruptor</module>

Expand All @@ -90,7 +90,7 @@
<module>javax-servlets</module>
<module>javaxval</module>
<module>jaxb</module>
<module>jee7</module>
<module>jee-7</module>
<!-- <module>jhipster/jhipster-monolithic</module> -->
<module>jjwt</module>
<module>jpa-storedprocedure</module>
Expand All @@ -104,9 +104,9 @@
<module>libraries</module>
<module>libraries-data</module>
<module>linkrest</module>
<module>log-mdc</module>
<module>log4j</module>
<module>log4j2</module>
<module>logging-modules/log-mdc</module>
<module>logging-modules/log4j</module>
<module>logging-modules/log4j2</module>
<module>lombok</module>
<!-- <module>kotlin</module>-->
<module>mapstruct</module>
Expand Down Expand Up @@ -242,8 +242,8 @@
<module>video-tutorials</module>

<module>xml</module>
<module>xmlunit2</module>
<module>struts2</module>
<module>xmlunit-2</module>
<module>struts-2</module>
<module>apache-velocity</module>
<module>apache-solrj</module>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion xmlunit2/pom.xml → xmlunit-2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>xmlunit2</artifactId>
<artifactId>xmlunit-2</artifactId>
<version>1.0</version>
<name>XMLUnit-2</name>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2e5531e

Please sign in to comment.