Skip to content

Commit c4cf6b1

Browse files
thomaswoehlkethomaswoehlke
committed
Issue #273 resort Issues, Milestones and Releases
1 parent 428f901 commit c4cf6b1

20 files changed

+64
-49
lines changed

‎etc/TODO.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,14 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
104104
* Update Spring-Boot to 2.3.0 #255
105105
* Fixed #255 - working on: Update Spring-Boot to 2.3.0
106106

107+
## 26.08.2020
108+
* fixed #273 resort Issues, Milestones and Releases
109+
* Issue #268 update webjars
110+
* Issue #262 setup on my current Linux Machines
111+
107112
## 2.3.23
108113
* Issue #274 add Annotations to suppress Deprecation Warnings
109-
* Issue #273 resort Issues, Milestones and Releases
114+
* fixed #273 resort Issues, Milestones and Releases
110115
* Issue #272 prepare Release 2.3.23
111116
* Issue #271 Milestone Burndown: Update Spring-Boot to current Version 2.3.3
112117
* Issue #270 Update to Spring Framework for Spring-Boot 2.3.3

‎etc/docker-start.sh‎

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

‎etc/docker-stop.sh‎

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

‎pom.xml‎

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,33 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<groupId>org.woehlke</groupId>
6+
<artifactId>simpleworklist</artifactId>
7+
<version>2.3.23-SNAPSHOT</version>
8+
<packaging>jar</packaging>
9+
510
<parent>
611
<groupId>org.springframework.boot</groupId>
712
<artifactId>spring-boot-starter-parent</artifactId>
813
<version>2.3.2.RELEASE</version>
914
</parent>
1015

11-
<groupId>org.woehlke</groupId>
12-
<artifactId>simpleworklist</artifactId>
13-
<version>2.3.23-SNAPSHOT</version>
14-
<packaging>jar</packaging>
16+
<scm>
17+
<connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
18+
<developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
19+
<url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
20+
<tag>master</tag>
21+
</scm>
1522

1623
<name>simpleworklist</name>
1724
<description>Your Todo-List for Getting Things Done</description>
18-
19-
<url>https://woehlke.org/p/simpleworklist</url>
25+
<url>https://woehlke.org/java/simpleworklist</url>
2026
<inceptionYear>2012</inceptionYear>
2127

2228
<organization>
2329
<name>Spring-Framework-Java-Apps</name>
2430
<url>https://github.com/Spring-Framework-Java-Apps/</url>
2531
</organization>
26-
2732
<developers>
2833
<developer>
2934
<name>Thomas Wöhlke</name>
@@ -39,13 +44,6 @@
3944
</license>
4045
</licenses>
4146

42-
<scm>
43-
<connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
44-
<developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
45-
<url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
46-
<tag>master</tag>
47-
</scm>
48-
4947
<issueManagement>
5048
<system>Github</system>
5149
<url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues</url>
@@ -54,8 +52,18 @@
5452
<distributionManagement>
5553
<site>
5654
<id>simpleworklist.public_html</id>
57-
<url>file://${user.home}/public_html/p/simpleworklist</url>
55+
<url>file://${user.home}/public_html/java/simpleworklist</url>
5856
</site>
57+
<snapshotRepository>
58+
<id>snapshots</id>
59+
<name>tw-thinkpad-snapshots</name>
60+
<url>file://${user.home}/public_html/java/libs-snapshot-local</url>
61+
</snapshotRepository>
62+
<repository>
63+
<id>central</id>
64+
<name>tw-thinkpad-releases</name>
65+
<url>file://${user.home}/public_html/java/libs-release-local</url>
66+
</repository>
5967
</distributionManagement>
6068

6169
<properties>
@@ -102,16 +110,27 @@
102110
<doxia-module.version>1.9.1</doxia-module.version>
103111

104112
<!-- Docker -->
105-
<version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
113+
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
106114
<docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
107115
<docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
108116
<docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
117+
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
118+
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
119+
120+
<!-- Webjars -->
121+
<webjars.bootstrap.version>4.5.2</webjars.bootstrap.version>
122+
<webjars.jquery.version>3.5.1</webjars.jquery.version>
123+
<webjars.popper.js.version>1.16.0</webjars.popper.js.version>
124+
<webjars.font-awesome.version>5.14.0</webjars.font-awesome.version>
125+
<webjars.ckeditor.version>18.0.0</webjars.ckeditor.version>
109126

110127
<!-- Frontend Client Site -->
128+
<!--
111129
<webjars.jquery.version>3.4.1</webjars.jquery.version>
112130
<webjars.bootstrap.version>4.4.1-1</webjars.bootstrap.version>
113131
<webjars.font-awesome.version>5.13.0</webjars.font-awesome.version>
114132
<webjars.ckeditor.version>4.14.0</webjars.ckeditor.version>
133+
-->
115134

116135
<!-- Frontend Server Site: Thymeleaf Templates -->
117136
<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
@@ -124,12 +143,15 @@
124143

125144
<!-- Spring Boot and Spring Frameworks -->
126145
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
127-
<spring-session-bom.version>Dragonfruit-RELEASE</spring-session-bom.version>
146+
128147
<spring-data-releasetrain.version>Neumann-SR2</spring-data-releasetrain.version>
129-
<spring-framework.version>5.2.6.RELEASE</spring-framework.version>
148+
<spring-session-bom.version>Dragonfruit-RELEASE</spring-session-bom.version>
149+
<spring-framework.version>5.2.8.RELEASE</spring-framework.version>
130150
<spring-security.version>5.3.2.RELEASE</spring-security.version>
131151
<spring-boot-admin.version>2.2.1</spring-boot-admin.version>
132152

153+
<opencsv.version>5.2</opencsv.version>
154+
133155
<!-- Unit and Integration Testing -->
134156
<junit-jupiter.version>5.6.2</junit-jupiter.version>
135157
<xmlunit2.version>2.6.4</xmlunit2.version>
@@ -846,11 +868,9 @@
846868
(http://maven.apache.org/plugins/maven-invoker-plugin/)!
847869
</message>
848870
</bannedPlugins>
849-
850871
<requireMavenVersion>
851872
<version>${version.maven}</version>
852873
</requireMavenVersion>
853-
854874
<requireJavaVersion>
855875
<version>${java.version}</version>
856876
</requireJavaVersion>
@@ -863,23 +883,21 @@
863883
<files>
864884
<file>${project.basedir}/README.md</file>
865885
<file>${project.basedir}/LICENSE</file>
866-
<file>${project.basedir}/docker-compose.yml</file>
886+
<file>${project.basedir}/src/main/docker/docker-compose.yml</file>
867887
<file>${project.basedir}/app.json</file>
868888
<file>${project.basedir}/_config.yml</file>
869889
<file>${project.basedir}/Procfile</file>
870890
<file>${project.basedir}/src/site/markdown/Requirements.md</file>
871891
<file>${project.basedir}/src/site/markdown/Requirements_Nonfunctional.md</file>
872892
<file>${project.basedir}/src/site/markdown/About.md</file>
873893
<file>${project.basedir}/src/site/site.xml</file>
894+
<file>${project.basedir}/build.sh</file>
874895
<file>${project.basedir}/run.sh</file>
875-
<!--
876-
<file>${project.basedir}/etc/setenv.sh</file>
877-
-->
878-
<file>${project.basedir}/etc/psql.sh</file>
879-
<file>${project.basedir}/etc/docker-start.sh</file>
880-
<file>${project.basedir}/etc/docker-stop.sh</file>
881-
<file>${project.basedir}/etc/db/db-createdb-and-user-linux.sql</file>
882-
<file>${project.basedir}/etc/db/db-createdb-and-user-win10.sql</file>
896+
<file>${project.basedir}/src/main/bash/psql.sh</file>
897+
<file>${project.basedir}/docker-start.sh</file>
898+
<file>${project.basedir}/docker-stop.sh</file>
899+
<file>${project.basedir}/src/main/sql/db-createdb-and-user-linux.sql</file>
900+
<file>${project.basedir}/src/main/sql/db-createdb-and-user-win10.sql</file>
883901
</files>
884902
</requireFilesExist>
885903
</rules>
@@ -933,12 +951,12 @@
933951
<groupId>com.dkanejs.maven.plugins</groupId>
934952
<artifactId>docker-compose-maven-plugin</artifactId>
935953
<configuration>
936-
<composeFile>${project.basedir}/docker-compose.yml</composeFile>
954+
<composeFile>${project.basedir}/src/main/docker/docker-compose.yml</composeFile>
937955
<verbose>${docker-compose-maven-plugin.verbose}</verbose>
938956
<removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
939-
<removeVolumes>true</removeVolumes>
940-
<ignorePullFailures>true</ignorePullFailures>
941-
<detachedMode>true</detachedMode>
957+
<removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
958+
<ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}</ignorePullFailures>
959+
<detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
942960
</configuration>
943961
</plugin>
944962
<plugin>

‎etc/serialversions/getserialversionid.sh‎ renamed to ‎src/main/bash/getserialversionid.sh‎

File renamed without changes.

‎etc/psql.sh‎ renamed to ‎src/main/bash/psql.sh‎

File renamed without changes.

‎etc/setenv-sample.sh‎ renamed to ‎src/main/bash/setenv-sample.sh‎

File renamed without changes.

‎etc/serialversions/getserialversionid.cmd‎ renamed to ‎src/main/cmd/getserialversionid.cmd‎

File renamed without changes.

‎etc/java/set_java11.cmd‎ renamed to ‎src/main/cmd/set_java11.cmd‎

File renamed without changes.

‎etc/java/set_java13.cmd‎ renamed to ‎src/main/cmd/set_java13.cmd‎

File renamed without changes.

0 commit comments

Comments
 (0)