Skip to content

Commit

Permalink
Work on version, gitignores, obsolet eclipse files and dirs.
Browse files Browse the repository at this point in the history
Rename version 1.4.16-SNAPSHOT to 1.4-SNAPSHOT to synchronise wicketstuff versioning with the wicket version it depends on. Remove scattered .gitignore files, leave the job to the one in the root dir. Remove .classpat, .settings and .project, let mvn eclipse:eclipse rebuild them. Add EclipseCodeFormat.xml from wicket

Signed-off-by: Martin Funk <mafulafunk@googlemail.com>
  • Loading branch information
mafulafunk committed Jan 10, 2011
1 parent 8f3e43a commit eeac734
Show file tree
Hide file tree
Showing 163 changed files with 499 additions and 585 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
target
*~
/.settings
/.project
velocity.log
.project
.classpath
.settings
185 changes: 185 additions & 0 deletions EclipseCodeFormat.xml

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions jdk-1.5-parent/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion jdk-1.5-parent/annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>annotation</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jdk-1.5-parent/artwork-parent/artwork-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>artwork-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down Expand Up @@ -101,4 +101,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
</project>
</project>
2 changes: 1 addition & 1 deletion jdk-1.5-parent/artwork-parent/artwork/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>artwork-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/artwork-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jdk-1.5-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>calendarviews-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>calendarviews-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/calendarviews-parent/calendarviews/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>calendarviews-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>calendarviews</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/calendarviews-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>calendarviews-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/client-and-server-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>client-and-server-validation</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>datatable-autocomplete-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>datatable-autocomplete-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>datatable-autocomplete-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>datatable-autocomplete-examples</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<parent>
<artifactId>datatable-autocomplete-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<groupId>org.wicketstuff</groupId>
<artifactId>datatable-autocomplete-test</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<name>DataTable Autocomplete Test</name>
<description>Test code for visualizing a Trie. Seperated so that projects can use the JUNG visualization against their actual production data</description>

Expand Down Expand Up @@ -65,4 +65,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>datatable-autocomplete-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>datatable-autocomplete</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/datatable-autocomplete-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>datatable-autocomplete-parent</artifactId>
Expand Down
34 changes: 0 additions & 34 deletions jdk-1.5-parent/ddcalendar-parent/ddcalendar-examples/.classpath

This file was deleted.

13 changes: 0 additions & 13 deletions jdk-1.5-parent/ddcalendar-parent/ddcalendar-examples/.project

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>ddcalendar-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down
23 changes: 0 additions & 23 deletions jdk-1.5-parent/ddcalendar-parent/ddcalendar/.classpath

This file was deleted.

13 changes: 0 additions & 13 deletions jdk-1.5-parent/ddcalendar-parent/ddcalendar/.project

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion jdk-1.5-parent/ddcalendar-parent/ddcalendar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>ddcalendar-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/ddcalendar-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>ddcalendar-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/fixed-feedback-panel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<artifactId>fixed-feedback-panel</artifactId>
<packaging>jar</packaging>
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions jdk-1.5-parent/flot-parent/flot-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>flot-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down Expand Up @@ -111,4 +111,4 @@
<properties>
<wicket.version>1.4-rc4</wicket.version>
</properties>
</project>
</project>

This file was deleted.

4 changes: 2 additions & 2 deletions jdk-1.5-parent/flot-parent/flot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>flot-parent</artifactId>
<groupId>org.wicketstuff</groupId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wicketstuff</groupId>
Expand Down Expand Up @@ -95,4 +95,4 @@
<properties>
<wicket.version>1.4-rc4</wicket.version>
</properties>
</project>
</project>
2 changes: 1 addition & 1 deletion jdk-1.5-parent/flot-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>flot-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jdk-1.5-parent/gmap2-parent/gmap2-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>gmap2-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>gmap2-examples</artifactId>
Expand Down Expand Up @@ -48,4 +48,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
</project>
2 changes: 1 addition & 1 deletion jdk-1.5-parent/gmap2-parent/gmap2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>gmap2-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>gmap2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdk-1.5-parent/gmap2-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jdk-1.5-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>

<artifactId>gmap2-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>googlecharts-parent</artifactId>
<version>1.4.16-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
</parent>
<artifactId>googlecharts-examples</artifactId>
<packaging>war</packaging>
Expand Down
Loading

0 comments on commit eeac734

Please sign in to comment.