Skip to content

Commit

Permalink
Merge pull request #3 from csarmiento/update-libs
Browse files Browse the repository at this point in the history
Updated Libraries:
  • Loading branch information
magro committed Feb 19, 2015
2 parents 00faba7 + c0a1832 commit 5457e47
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 9 deletions.
97 changes: 97 additions & 0 deletions .gitignore
@@ -0,0 +1,97 @@
# Created by .ignore support plugin (hsz.mobi)
### Eclipse template
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# PDT-specific
.buildpath

# sbteclipse plugin
.target

# TeXlipse plugin
.texlipse


### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties


### Java template
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
17 changes: 8 additions & 9 deletions pom.xml
@@ -1,14 +1,13 @@
<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/maven-v4_0_0.xsd"
>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.javakaffee.msm.sample</groupId>
<artifactId>msm-sample-webapp</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<!-- TODO project name -->
<name>msm-sample-webapp</name>
<description></description>
<description>A sample (wicket) webapp for playing with memcached-session-manager</description>
<!--
TODO <organization> <name>company name</name> <url>company
url</url> </organization>
Expand Down Expand Up @@ -74,7 +73,7 @@
<dependency>
<groupId>de.javakaffee.msm</groupId>
<artifactId>msm-kryo-serializer</artifactId>
<version>1.6.3</version>
<version>1.8.3</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -137,11 +136,11 @@
<id>msm maven repo</id>
<url>http://memcached-session-manager.googlecode.com/svn/maven</url>
</repository>
<repository>
<id>sonatype-releases</id>
<name>sonatype releases repo</name>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
<repository>
<id>sonatype-releases</id>
<name>sonatype releases repo</name>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
</repositories>

</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 5457e47

Please sign in to comment.