Skip to content
This repository was archived by the owner on Feb 7, 2018. It is now read-only.

Commit 1f3237a

Browse files
shoreashorea
committed
Merge pull request #17 from imdario/master. Tomcat 8 support, backwards compatible with Tomcat 7.
1 parent 5cc688f commit 1f3237a

File tree

6 files changed

+376
-331
lines changed

6 files changed

+376
-331
lines changed

‎NOTICE.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@ Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33

44
This product includes software developed by
55
Amazon Technologies, Inc (http://www.amazon.com/).
6-
7-
**********************
8-
THIRD PARTY COMPONENTS
9-
**********************
10-
This software includes third party software subject to the following copyrights:
11-
- JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org.
12-
13-
The licenses for these third party components are included in LICENSE.txt

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For more information on using the session manager, see the
1818
Developer Information
1919
---------------------
2020

21-
You can check out the source for the session manager here, and build it with Maven (mvn package).
21+
You can check out the source for the session manager here, and build it with Maven.
2222
The official release builds use JarJar
2323
to package all the dependencies in the session manager jar *(to provide an easy, one-jar install)* and rename classes
2424
*(to avoid exposing the SDK code to all web apps running in Tomcat)*. To run with a development build,

‎pom.xml

Lines changed: 146 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.amazonaws</groupId>
66
<artifactId>aws-dynamodb-session-tomcat</artifactId>
77
<packaging>jar</packaging>
88
<name>Amazon DynamoDB Session Manager for Tomcat</name>
9-
<version>1.0.2</version>
9+
<version>1.0.4</version>
1010
<description>The Amazon DynamoDB Session Manager for Tomcat provides a custom session manager for Tomcat 7 that stores session data in Amazon DynamoDB, Amazon's fully managed NoSQL database service.</description>
1111
<url>https://aws.amazon.com/java</url>
1212

@@ -34,156 +34,161 @@
3434
</developers>
3535

3636
<dependencies>
37-
<dependency>
38-
<groupId>com.amazonaws</groupId>
39-
<artifactId>aws-java-sdk</artifactId>
40-
<version>1.9.10</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.apache.tomcat</groupId>
44-
<artifactId>tomcat-catalina</artifactId>
45-
<version>8.0.14</version>
46-
<scope>provided</scope>
47-
</dependency>
37+
<dependency>
38+
<groupId>com.amazonaws</groupId>
39+
<artifactId>aws-java-sdk-dynamodb</artifactId>
40+
<version>1.9.23</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.apache.tomcat</groupId>
44+
<artifactId>tomcat-catalina</artifactId>
45+
<version>8.0.14</version>
46+
<scope>provided</scope>
47+
</dependency>
4848
</dependencies>
4949

5050
<build>
51-
<resources>
52-
<resource>
53-
<directory>${basedir}</directory>
54-
<includes>
55-
<include>LICENSE.txt</include>
56-
<include>NOTICE.txt</include>
57-
<include>README.txt</include>
58-
</includes>
59-
</resource>
60-
</resources>
51+
<resources>
52+
<resource>
53+
<directory>${basedir}</directory>
54+
<includes>
55+
<include>LICENSE.txt</include>
56+
<include>NOTICE.txt</include>
57+
<include>README.md</include>
58+
</includes>
59+
</resource>
60+
</resources>
6161

62-
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-compiler-plugin</artifactId>
66-
<version>2.3</version>
67-
<configuration>
68-
<source>1.5</source>
69-
<target>1.5</target>
70-
<encoding>UTF-8</encoding>
71-
</configuration>
72-
</plugin>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-compiler-plugin</artifactId>
66+
<version>2.3</version>
67+
<configuration>
68+
<source>1.6</source>
69+
<target>1.6</target>
70+
<encoding>UTF-8</encoding>
71+
</configuration>
72+
</plugin>
7373

74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-shade-plugin</artifactId>
77-
<version>2.2</version>
78-
<executions>
79-
<execution>
80-
<phase>package</phase>
81-
<goals>
82-
<goal>shade</goal>
83-
</goals>
84-
<configuration>
85-
<minimizeJar>true</minimizeJar>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-shade-plugin</artifactId>
77+
<version>2.2</version>
78+
<executions>
79+
<execution>
80+
<phase>package</phase>
81+
<goals>
82+
<goal>shade</goal>
83+
</goals>
84+
<configuration>
85+
<transformers>
86+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
87+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
88+
<addHeader>false</addHeader>
89+
</transformer>
90+
</transformers>
91+
<minimizeJar>true</minimizeJar>
8692

87-
<relocations>
88-
<relocation>
89-
<pattern>com.amazonaws</pattern>
90-
<shadedPattern>com.amazonaws.tomcatsessionmanager.amazonaws</shadedPattern>
91-
<excludes>
92-
<!-- Don't shade this class, since we reference it by name in Tomcat configuration -->
93-
<exclude>com.amazonaws.services.dynamodb.sessionmanager.DynamoDBSessionManager</exclude>
94-
</excludes>
95-
</relocation>
96-
<relocation>
97-
<pattern>org.apache.http</pattern>
98-
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.http</shadedPattern>
99-
</relocation>
100-
<relocation>
101-
<pattern>org.apache.commons.logging</pattern>
102-
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.commons.logging</shadedPattern>
103-
</relocation>
104-
<relocation>
105-
<pattern>org.apache.commons.codec</pattern>
106-
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.commons.codec</shadedPattern>
107-
</relocation>
108-
<relocation>
109-
<pattern>com.fasterxml</pattern>
110-
<shadedPattern>com.amazonaws.tomcatsessionmanager.fasterxml</shadedPattern>
111-
</relocation>
112-
<relocation>
113-
<pattern>org.joda.time</pattern>
114-
<shadedPattern>com.amazonaws.tomcatsessionmanager.joda.time</shadedPattern>
115-
</relocation>
116-
</relocations>
117-
118-
<artifactSet>
119-
<includes>
120-
<include>com.amazonaws:aws-java-sdk*</include>
121-
<include>commons-logging:*</include>
122-
<include>org.apache.httpcomponents:*</include>
123-
<include>commons-codec:*</include>
124-
<include>com.fasterxml.jackson.core:*</include>
125-
<include>joda-time:*</include>
126-
</includes>
127-
</artifactSet>
93+
<relocations>
94+
<relocation>
95+
<pattern>com.amazonaws</pattern>
96+
<shadedPattern>com.amazonaws.tomcatsessionmanager.amazonaws</shadedPattern>
97+
<excludes>
98+
<!-- Don't shade this class, since we reference it by name in Tomcat configuration -->
99+
<exclude>com.amazonaws.services.dynamodb.sessionmanager.DynamoDBSessionManager</exclude>
100+
</excludes>
101+
</relocation>
102+
<relocation>
103+
<pattern>org.apache.http</pattern>
104+
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.http</shadedPattern>
105+
</relocation>
106+
<relocation>
107+
<pattern>org.apache.commons.logging</pattern>
108+
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.commons.logging</shadedPattern>
109+
</relocation>
110+
<relocation>
111+
<pattern>org.apache.commons.codec</pattern>
112+
<shadedPattern>com.amazonaws.tomcatsessionmanager.apache.commons.codec</shadedPattern>
113+
</relocation>
114+
<relocation>
115+
<pattern>com.fasterxml</pattern>
116+
<shadedPattern>com.amazonaws.tomcatsessionmanager.fasterxml</shadedPattern>
117+
</relocation>
118+
<relocation>
119+
<pattern>org.joda.time</pattern>
120+
<shadedPattern>com.amazonaws.tomcatsessionmanager.joda.time</shadedPattern>
121+
</relocation>
122+
</relocations>
128123

129-
<filters>
130-
<filter>
131-
<!-- Pull in everything from commons-logging, so that we pick up all the adapter
132-
implementations that may not be statically referenced, but could be needed. -->
133-
<artifact>commons-logging:commons-logging</artifact>
134-
<includes>
135-
<include>**</include>
136-
</includes>
137-
</filter>
138-
<filter>
139-
<artifact>com.fasterxml.jackson.core:*</artifact>
140-
<includes>
141-
<include>**</include>
142-
</includes>
143-
</filter>
144-
</filters>
124+
<artifactSet>
125+
<includes>
126+
<include>com.amazonaws:aws-java-sdk*</include>
127+
<include>commons-logging:*</include>
128+
<include>org.apache.httpcomponents:*</include>
129+
<include>commons-codec:*</include>
130+
<include>com.fasterxml.jackson.core:*</include>
131+
<include>joda-time:*</include>
132+
</includes>
133+
</artifactSet>
145134

146-
</configuration>
147-
</execution>
148-
</executions>
149-
</plugin>
150-
</plugins>
135+
<filters>
136+
<filter>
137+
<!-- Pull in everything from commons-logging, so that we pick up all the adapter
138+
implementations that may not be statically referenced, but could be needed. -->
139+
<artifact>commons-logging:commons-logging</artifact>
140+
<includes>
141+
<include>**</include>
142+
</includes>
143+
</filter>
144+
<filter>
145+
<artifact>com.fasterxml.jackson.core:*</artifact>
146+
<includes>
147+
<include>**</include>
148+
</includes>
149+
</filter>
150+
</filters>
151+
</configuration>
152+
</execution>
153+
</executions>
154+
</plugin>
155+
</plugins>
151156
</build>
152157

153158
<profiles>
154-
<profile>
155-
<id>publishing</id>
156-
157-
<build>
158-
<plugins>
159-
<plugin>
160-
<groupId>org.apache.maven.plugins</groupId>
161-
<artifactId>maven-gpg-plugin</artifactId>
162-
<executions>
163-
<execution>
164-
<id>sign-artifacts</id>
165-
<phase>verify</phase>
166-
<goals>
167-
<goal>sign</goal>
168-
</goals>
169-
</execution>
170-
</executions>
171-
</plugin>
159+
<profile>
160+
<id>publishing</id>
161+
162+
<build>
163+
<plugins>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-gpg-plugin</artifactId>
167+
<executions>
168+
<execution>
169+
<id>sign-artifacts</id>
170+
<phase>verify</phase>
171+
<goals>
172+
<goal>sign</goal>
173+
</goals>
174+
</execution>
175+
</executions>
176+
</plugin>
172177

173-
<plugin>
174-
<groupId>org.sonatype.plugins</groupId>
175-
<artifactId>nexus-staging-maven-plugin</artifactId>
176-
<version>1.5.1</version>
177-
<extensions>true</extensions>
178-
<configuration>
179-
<serverId>sonatype-nexus-staging</serverId>
180-
<nexusUrl>https://oss.sonatype.org</nexusUrl>
181-
<releaseAfterClose>true</releaseAfterClose>
182-
</configuration>
183-
</plugin>
184-
</plugins>
185-
</build>
186-
</profile>
178+
<plugin>
179+
<groupId>org.sonatype.plugins</groupId>
180+
<artifactId>nexus-staging-maven-plugin</artifactId>
181+
<version>1.5.1</version>
182+
<extensions>true</extensions>
183+
<configuration>
184+
<serverId>sonatype-nexus-staging</serverId>
185+
<nexusUrl>https://oss.sonatype.org</nexusUrl>
186+
<releaseAfterClose>true</releaseAfterClose>
187+
</configuration>
188+
</plugin>
189+
</plugins>
190+
</build>
191+
</profile>
187192
</profiles>
188193

189194
</project>

0 commit comments

Comments
 (0)