Skip to content

Commit 3d9053a

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #359 from Spring-Framework-Java-Apps/master
update
2 parents 385d40c + 098f0aa commit 3d9053a

Some content is hidden

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

41 files changed

+467
-380
lines changed

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

‎pom.xml

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

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.63-SNAPSHOT</version>
7+
<version>2.3.66-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -72,7 +72,7 @@
7272

7373
<properties>
7474
<java.version>11</java.version>
75-
<version.maven>3.6.2</version.maven>
75+
<version.maven>3.6.3</version.maven>
7676
<maven.compiler.source>${java.version}</maven.compiler.source>
7777
<maven.compiler.target>${java.version}</maven.compiler.target>
7878
<spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
@@ -124,7 +124,7 @@
124124
<version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
125125
<version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
126126
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
127-
<version.plantuml-maven-plugin>1.4.0</version.plantuml-maven-plugin>
127+
<version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
128128
<version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
129129
</properties>
130130

@@ -1397,156 +1397,6 @@
13971397
<groupId>org.apache.maven.plugins</groupId>
13981398
<artifactId>maven-dependency-plugin</artifactId>
13991399
<executions>
1400-
<!--
1401-
<execution>
1402-
<id>unpack-dependency-classes-install</id>
1403-
<phase>pre-site</phase>
1404-
<goals>
1405-
<goal>resolve</goal>
1406-
<goal>collect</goal>
1407-
<goal>copy-dependencies</goal>
1408-
<goal>unpack-dependencies</goal>
1409-
</goals>
1410-
<configuration>
1411-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1412-
<overWriteReleases>true</overWriteReleases>
1413-
<overWriteSnapshots>true</overWriteSnapshots>
1414-
<outputFile>${project.build.outputDirectory}/classes/</outputFile>
1415-
<excludeTypes>pom,maven-plugin</excludeTypes>
1416-
<excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby
1417-
</excludeGroupIds>
1418-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete
1419-
</excludeArtifactIds>
1420-
</configuration>
1421-
</execution>
1422-
<execution>
1423-
<id>unpack-dependency-classes-deploy</id>
1424-
<phase>pre-site</phase>
1425-
<goals>
1426-
<goal>resolve</goal>
1427-
<goal>collect</goal>
1428-
<goal>copy-dependencies</goal>
1429-
<goal>unpack-dependencies</goal>
1430-
</goals>
1431-
<configuration>
1432-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1433-
<overWriteReleases>true</overWriteReleases>
1434-
<overWriteSnapshots>true</overWriteSnapshots>
1435-
<outputFile>${project.build.outputDirectory}/classes/</outputFile>
1436-
<excludeTypes>pom,maven-plugin</excludeTypes>
1437-
<excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby
1438-
</excludeGroupIds>
1439-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
1440-
</excludeArtifactIds>
1441-
</configuration>
1442-
</execution>
1443-
<execution>
1444-
<id>unpack-dependencies-classpath</id>
1445-
<phase>site</phase>
1446-
<goals>
1447-
<goal>analyze-only</goal>
1448-
<goal>analyze-dep-mgt</goal>
1449-
<goal>analyze-report</goal>
1450-
<goal>sources</goal>
1451-
<goal>resolve</goal>
1452-
<goal>resolve-plugins</goal>
1453-
<goal>collect</goal>
1454-
<goal>copy-dependencies</goal>
1455-
<goal>unpack-dependencies</goal>
1456-
<goal>build-classpath</goal>
1457-
</goals>
1458-
<configuration>
1459-
<overWriteReleases>true</overWriteReleases>
1460-
<overWriteSnapshots>true</overWriteSnapshots>
1461-
<outputFile>${project.build.outputDirectory}/classpath.txt</outputFile>
1462-
<failOnWarning>false</failOnWarning>
1463-
<ignoreNonCompile>true</ignoreNonCompile>
1464-
<excludeTypes>pom</excludeTypes>
1465-
<excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby
1466-
</excludeGroupIds>
1467-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
1468-
</excludeArtifactIds>
1469-
<ignoredDependencies>
1470-
<ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
1471-
</ignoredDependencies>
1472-
<ignoredUsedUndeclaredDependencies>
1473-
<ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin
1474-
</ignoredUsedUndeclaredDependency>
1475-
</ignoredUsedUndeclaredDependencies>
1476-
<ignoredUnusedDeclaredDependencies>
1477-
<ignoredUnusedDeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin
1478-
</ignoredUnusedDeclaredDependency>
1479-
</ignoredUnusedDeclaredDependencies>
1480-
</configuration>
1481-
</execution>
1482-
<execution>
1483-
<id>check-dependencies-1</id>
1484-
<phase>site</phase>
1485-
<goals>
1486-
<goal>list</goal>
1487-
<goal>list-repositories</goal>
1488-
<goal>properties</goal>
1489-
</goals>
1490-
</execution>
1491-
<execution>
1492-
<id>check-dependencies-2</id>
1493-
<phase>site</phase>
1494-
<goals>
1495-
<goal>analyze</goal>
1496-
<goal>analyze-dep-mgt</goal>
1497-
<goal>analyze-duplicate</goal>
1498-
<goal>analyze-report</goal>
1499-
</goals>
1500-
</execution>
1501-
<execution>
1502-
<id>check-dependencies-3</id>
1503-
<phase>site</phase>
1504-
<goals>
1505-
<goal>tree</goal>
1506-
</goals>
1507-
</execution>
1508-
1509-
<execution>
1510-
<id>report</id>
1511-
<phase>site</phase>
1512-
<configuration>
1513-
<excludeGroupIds>org.webjars</excludeGroupIds>
1514-
<excludeGroupIds>
1515-
org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby
1516-
</excludeGroupIds>
1517-
<excludeArtifactIds>
1518-
weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
1519-
</excludeArtifactIds>
1520-
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
1521-
<reportSets>
1522-
<reportSet>
1523-
<reports>
1524-
<report>analyze-report</report>
1525-
</reports>
1526-
</reportSet>
1527-
</reportSets>
1528-
</configuration>
1529-
</execution>
1530-
1531-
<execution>
1532-
<id>get-dependency-sources</id>
1533-
<phase>site</phase>
1534-
<goals>
1535-
<goal>sources</goal>
1536-
<goal>resolve</goal>
1537-
<goal>resolve-plugins</goal>
1538-
<goal>collect</goal>
1539-
</goals>
1540-
<configuration>
1541-
<classifier>sources</classifier>
1542-
<excludeTypes>pom,maven-plugin</excludeTypes>
1543-
<excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby
1544-
</excludeGroupIds>
1545-
<excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api
1546-
</excludeArtifactIds>
1547-
</configuration>
1548-
</execution>
1549-
-->
15501400
<execution>
15511401
<id>copy-dependencies</id>
15521402
<phase>package</phase>
@@ -1557,8 +1407,8 @@
15571407
<includeScope>compile</includeScope>
15581408
<excludeTypes>maven-plugin</excludeTypes>
15591409
<excludeScope>test,provided</excludeScope>
1560-
<excludeGroupIds>org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asm</excludeGroupIds>
1561-
<excludeArtifactIds>spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api</excludeArtifactIds>
1410+
<excludeGroupIds>org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module, </excludeGroupIds>
1411+
<excludeArtifactIds>jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api</excludeArtifactIds>
15621412
</configuration>
15631413
</execution>
15641414
</executions>

‎src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.Locale;
3030

3131
import static java.util.Locale.GERMAN;
32+
import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.*;
3233

3334
/**
3435
* Created by tw on 14.02.16.
@@ -107,8 +108,18 @@ public final List<Context> getContexts(){
107108

108109
@ModelAttribute("listTaskState")
109110
public final List<TaskState> getTaskStates(){
110-
List<TaskState> listTaskState = new ArrayList<>(TaskState.values().length);
111-
for(TaskState taskState:TaskState.values()){
111+
TaskState[] listTaskStateArray = {
112+
INBOX,
113+
TODAY,
114+
NEXT,
115+
WAITING,
116+
SCHEDULED,
117+
SOMEDAY,
118+
FOCUS,
119+
COMPLETED
120+
};
121+
List<TaskState> listTaskState = new ArrayList<>(listTaskStateArray.length);
122+
for(TaskState taskState:listTaskStateArray){
112123
listTaskState.add(taskState);
113124
}
114125
return listTaskState;

0 commit comments

Comments
 (0)