Skip to content

Bump springVersion from 3.0.5.RELEASE to 5.2.2.RELEASE #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump springVersion from 3.0.5.RELEASE to 5.2.2.RELEASE #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5723f7b
Make it compile after JTalks Nexus lost all its libraries
ctapobep Mar 4, 2020
512ad81
Bump springVersion from 3.0.5.RELEASE to 5.2.2.RELEASE
dependabot[bot] Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions jtalks-common-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
</properties>

<dependencies>
<!--javatalks dependencies -->
<dependency>
<groupId>ru.javatalks.utils</groupId>
<artifactId>core-utils</artifactId>
</dependency>
<!--spring -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down
9 changes: 9 additions & 0 deletions jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package ru.javatalks.utils.datetime;

import org.joda.time.DateTime;

public class DateTimeUtils {
public DateTime getNow() {
return new DateTime();
}
}
7 changes: 7 additions & 0 deletions jtalks-common-model/src/main/java/ru/javatalks/utils/datetime/DateTimeUtilsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ru.javatalks.utils.datetime;

public class DateTimeUtilsFactory {
public static DateTimeUtils getDateTimeUtils() {
return new DateTimeUtils();
}
}
8 changes: 8 additions & 0 deletions jtalks-common-model/src/main/java/ru/javatalks/utils/general/Assert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
4 changes: 0 additions & 4 deletions jtalks-common-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>ru.javatalks.utils</groupId>
<artifactId>core-utils</artifactId>
</dependency>
</dependencies>

</project>
4 changes: 0 additions & 4 deletions jtalks-common-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,5 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>ru.javatalks.utils</groupId>
<artifactId>core-utils</artifactId>
</dependency>
</dependencies>
</project>
Binary file added .../security/spring-security-acl/3.1.1.CI-SNAPSHOT/spring-security-acl-3.1.1.CI-SNAPSHOT.jar
View file
Open in desktop
Binary file not shown.
21 changes: 14 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
<version>3.1.1.JAVATALKS-PATCH3.RELEASE</version>
<version>3.1.1.CI-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down Expand Up @@ -276,11 +276,6 @@
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>ru.javatalks.utils</groupId>
<artifactId>core-utils</artifactId>
<version>0.1</version>
</dependency>

<!-- Collections -->
<dependency>
Expand All @@ -293,6 +288,14 @@
<artifactId>guava</artifactId>
<version>10.0.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.security</groupId>-->
<!-- <artifactId>spring-security-acl</artifactId>-->
<!-- <version>3.1.1.JAVATALKS-PATCH3.RELEASE</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${project.basedir}/libs/spring-security-acl-3.1.1.CI-SNAPSHOT.jar</systemPath>-->
<!-- &lt;!&ndash; <systemPath>/Users/stas/projects/jtalks-common/libs/spring-security-acl-3.1.1.CI-SNAPSHOT.jar</systemPath>&ndash;&gt;-->
<!-- </dependency>-->
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -415,6 +418,10 @@
<tag>jtalks-common-0.60</tag>
</scm>
<repositories>
<repository>
<id>local</id>
<url>file:${project.basedir}/lib</url>
</repository>
<repository>
<id>jtalks-nexus</id>
<name>jtalks nexus</name>
Expand All @@ -441,7 +448,7 @@
<properties>
<copyrightDir>${basedir}</copyrightDir>
<hibernateVersion>3.6.10.Final</hibernateVersion>
<springVersion>3.0.5.RELEASE</springVersion>
<springVersion>5.2.2.RELEASE</springVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
</properties>
Expand Down