diff --git a/jtalks-common-model/pom.xml b/jtalks-common-model/pom.xml index addc50ed..0f89a268 100644 --- a/jtalks-common-model/pom.xml +++ b/jtalks-common-model/pom.xml @@ -20,11 +20,6 @@ - - - ru.javatalks.utils - core-utils - org.springframework diff --git a/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtils.java b/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtils.java new file mode 100644 index 00000000..45edf2e6 --- /dev/null +++ b/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtils.java @@ -0,0 +1,9 @@ +package ru.javatalks.utils.datetime; + +import org.joda.time.DateTime; + +public class DateTimeUtils { + public DateTime getNow() { + return new DateTime(); + } +} diff --git a/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtilsFactory.java b/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtilsFactory.java new file mode 100644 index 00000000..2ab7b6b6 --- /dev/null +++ b/jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtilsFactory.java @@ -0,0 +1,7 @@ +package ru.javatalks.utils.datetime; + +public class DateTimeUtilsFactory { + public static DateTimeUtils getDateTimeUtils() { + return new DateTimeUtils(); + } +} diff --git a/jtalks-common-model/src/main/java/ru/javatalks/utils/general/Assert.java b/jtalks-common-model/src/main/java/ru/javatalks/utils/general/Assert.java new file mode 100644 index 00000000..9fe4da16 --- /dev/null +++ b/jtalks-common-model/src/main/java/ru/javatalks/utils/general/Assert.java @@ -0,0 +1,8 @@ +package ru.javatalks.utils.general; + +public class Assert { + public static void throwIfNull(Object v, String message) { + if(v == null) + throw new IllegalArgumentException(message); + } +} diff --git a/jtalks-common-security/pom.xml b/jtalks-common-security/pom.xml index e2efdd06..e01f8da9 100644 --- a/jtalks-common-security/pom.xml +++ b/jtalks-common-security/pom.xml @@ -52,10 +52,6 @@ joda-time joda-time - - ru.javatalks.utils - core-utils - diff --git a/jtalks-common-service/pom.xml b/jtalks-common-service/pom.xml index 3839d567..24688fac 100644 --- a/jtalks-common-service/pom.xml +++ b/jtalks-common-service/pom.xml @@ -46,9 +46,5 @@ joda-time joda-time - - ru.javatalks.utils - core-utils - diff --git a/libs/org/springframework/security/spring-security-acl/3.1.1.CI-SNAPSHOT/spring-security-acl-3.1.1.CI-SNAPSHOT.jar b/libs/org/springframework/security/spring-security-acl/3.1.1.CI-SNAPSHOT/spring-security-acl-3.1.1.CI-SNAPSHOT.jar new file mode 100644 index 00000000..a4df6fd1 Binary files /dev/null and b/libs/org/springframework/security/spring-security-acl/3.1.1.CI-SNAPSHOT/spring-security-acl-3.1.1.CI-SNAPSHOT.jar differ diff --git a/pom.xml b/pom.xml index 7d07fea1..d9917666 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ org.springframework.security spring-security-acl - 3.1.1.JAVATALKS-PATCH3.RELEASE + 3.1.1.CI-SNAPSHOT org.springframework.security @@ -276,11 +276,6 @@ commons-io 2.0.1 - - ru.javatalks.utils - core-utils - 0.1 - @@ -293,6 +288,14 @@ guava 10.0.1 + + + + + + + + @@ -415,6 +418,10 @@ jtalks-common-0.60 + + local + file:${project.basedir}/lib + jtalks-nexus jtalks nexus @@ -441,7 +448,7 @@ ${basedir} 3.6.10.Final - 3.0.5.RELEASE + 5.2.2.RELEASE UTF-8 false