Fix various build errors.

This commit is contained in:
robin shine 2013-10-24 10:43:50 +08:00
parent 6a60e59199
commit c1ae93e29d
9 changed files with 816 additions and 678 deletions

View File

@ -37,6 +37,13 @@
<artifactId>commons.loader</artifactId> <artifactId>commons.loader</artifactId>
<version>1.0.31</version> <version>1.0.31</version>
</dependency> </dependency>
<dependency>
<groupId>com.pmease</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.31</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>

View File

@ -31,22 +31,18 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId> <artifactId>jetty-servlets</artifactId>
<version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId> <artifactId>jetty-servlet</artifactId>
<version>${jettyVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId> <artifactId>jetty-websocket</artifactId>
<version>${jettyVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
@ -68,6 +64,5 @@
</repositories> </repositories>
<properties> <properties>
<moduleClass>com.pmease.commons.jetty.JettyModule</moduleClass> <moduleClass>com.pmease.commons.jetty.JettyModule</moduleClass>
<jettyVersion>8.1.10.v20130312</jettyVersion>
</properties> </properties>
</project> </project>

View File

@ -1,77 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>commons.loader</artifactId> <modelVersion>4.0.0</modelVersion>
<parent> <artifactId>commons.loader</artifactId>
<groupId>com.pmease</groupId> <parent>
<artifactId>parent.general</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>parent.general</artifactId>
</parent> <version>1.0.31</version>
<build> </parent>
<plugins> <build>
<plugin> <plugins>
<groupId>com.pmease</groupId> <plugin>
<artifactId>plugin.maven</artifactId> <groupId>com.pmease</groupId>
</plugin> <artifactId>plugin.maven</artifactId>
<plugin> </plugin>
<artifactId>maven-source-plugin</artifactId> <plugin>
</plugin> <artifactId>maven-source-plugin</artifactId>
<plugin> </plugin>
<artifactId>maven-javadoc-plugin</artifactId> <plugin>
</plugin> <artifactId>maven-javadoc-plugin</artifactId>
</plugins> </plugin>
</build> <plugin>
<dependencies> <artifactId>maven-jar-plugin</artifactId>
<dependency> <executions>
<groupId>com.pmease</groupId> <execution>
<artifactId>commons.bootstrap</artifactId> <goals>
<version>1.0.31</version> <goal>test-jar</goal>
</dependency> </goals>
<dependency> </execution>
<groupId>com.pmease</groupId> </executions>
<artifactId>commons.util</artifactId> </plugin>
<version>1.0.31</version> </plugins>
</dependency> </build>
<dependency> <dependencies>
<groupId>com.google.inject</groupId> <dependency>
<artifactId>guice</artifactId> <groupId>com.pmease</groupId>
<version>${guiceVersion}</version> <artifactId>commons.bootstrap</artifactId>
</dependency> <version>1.0.31</version>
<dependency> </dependency>
<groupId>com.google.inject.extensions</groupId> <dependency>
<artifactId>guice-assistedinject</artifactId> <groupId>com.pmease</groupId>
<version>${guiceVersion}</version> <artifactId>commons.util</artifactId>
</dependency> <version>1.0.31</version>
<dependency> </dependency>
<groupId>com.google.inject.extensions</groupId> <dependency>
<artifactId>guice-servlet</artifactId> <groupId>com.google.inject</groupId>
<version>${guiceVersion}</version> <artifactId>guice</artifactId>
</dependency> <version>${guiceVersion}</version>
<dependency> </dependency>
<groupId>com.google.inject.extensions</groupId> <dependency>
<artifactId>guice-multibindings</artifactId> <groupId>com.google.inject.extensions</groupId>
<version>${guiceVersion}</version> <artifactId>guice-assistedinject</artifactId>
</dependency> <version>${guiceVersion}</version>
</dependencies> </dependency>
<repositories> <dependency>
<repository> <groupId>com.google.inject.extensions</groupId>
<id>pmeaseRepo</id> <artifactId>guice-servlet</artifactId>
<name>PMEase Repository</name> <version>${guiceVersion}</version>
<releases> </dependency>
<enabled>true</enabled> <dependency>
<updatePolicy>never</updatePolicy> <groupId>com.google.inject.extensions</groupId>
<checksumPolicy>fail</checksumPolicy> <artifactId>guice-multibindings</artifactId>
</releases> <version>${guiceVersion}</version>
<snapshots> </dependency>
<enabled>true</enabled> </dependencies>
<updatePolicy>always</updatePolicy> <repositories>
<checksumPolicy>fail</checksumPolicy> <repository>
</snapshots> <id>pmeaseRepo</id>
<url>http://artifact.pmease.com/</url> <name>PMEase Repository</name>
</repository> <releases>
</repositories> <enabled>true</enabled>
<properties> <updatePolicy>never</updatePolicy>
<guiceVersion>4.0-beta</guiceVersion> <checksumPolicy>fail</checksumPolicy>
</properties> </releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>http://artifact.pmease.com/</url>
</repository>
</repositories>
<properties>
<guiceVersion>4.0-beta</guiceVersion>
</properties>
</project> </project>

View File

@ -1,75 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<artifactId>gitop.core</artifactId> <modelVersion>4.0.0</modelVersion>
<parent> <artifactId>gitop.core</artifactId>
<groupId>com.pmease</groupId> <parent>
<artifactId>parent.general</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>parent.general</artifactId>
</parent> <version>1.0.31</version>
<build> </parent>
<plugins> <build>
<plugin> <plugins>
<groupId>com.pmease</groupId> <plugin>
<artifactId>plugin.maven</artifactId> <groupId>com.pmease</groupId>
</plugin> <artifactId>plugin.maven</artifactId>
<plugin> </plugin>
<artifactId>maven-archetype-plugin</artifactId> <plugin>
</plugin> <artifactId>maven-archetype-plugin</artifactId>
<plugin> </plugin>
<artifactId>maven-source-plugin</artifactId> <plugin>
</plugin> <artifactId>maven-source-plugin</artifactId>
<plugin> </plugin>
<artifactId>maven-javadoc-plugin</artifactId> <plugin>
</plugin> <artifactId>maven-javadoc-plugin</artifactId>
</plugins> </plugin>
</build> </plugins>
<dependencies> </build>
<dependency> <dependencies>
<groupId>com.pmease</groupId> <dependency>
<artifactId>commons.loader</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>commons.loader</artifactId>
</dependency> <version>1.0.31</version>
<dependency> </dependency>
<groupId>com.pmease</groupId> <dependency>
<artifactId>commons.shiro</artifactId> <groupId>com.pmease</groupId>
<version>1.0.30</version> <artifactId>commons.shiro</artifactId>
</dependency> <version>1.0.30</version>
<dependency> </dependency>
<groupId>com.pmease</groupId> <dependency>
<artifactId>commons.git</artifactId> <groupId>com.pmease</groupId>
<version>1.0.0</version> <artifactId>commons.git</artifactId>
</dependency> <version>1.0.0</version>
<dependency> </dependency>
<groupId>com.pmease</groupId> <dependency>
<artifactId>commons.editable</artifactId> <groupId>com.pmease</groupId>
<version>1.0.0</version> <artifactId>commons.editable</artifactId>
</dependency> <version>1.0.0</version>
<dependency> </dependency>
<groupId>com.pmease</groupId> <dependency>
<artifactId>commons.jetty</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>commons.jetty</artifactId>
</dependency> <version>1.0.31</version>
</dependencies> </dependency>
<repositories> <dependency>
<repository> <groupId>com.pmease</groupId>
<id>pmeaseRepo</id> <artifactId>commons.loader</artifactId>
<name>PMEase Repository</name> <version>1.0.31</version>
<releases> <type>test-jar</type>
<enabled>true</enabled> <scope>test</scope>
<updatePolicy>never</updatePolicy> </dependency>
<checksumPolicy>fail</checksumPolicy> </dependencies>
</releases> <repositories>
<snapshots> <repository>
<enabled>true</enabled> <id>pmeaseRepo</id>
<updatePolicy>always</updatePolicy> <name>PMEase Repository</name>
<checksumPolicy>fail</checksumPolicy> <releases>
</snapshots> <enabled>true</enabled>
<url>http://artifact.pmease.com/</url> <updatePolicy>never</updatePolicy>
</repository> <checksumPolicy>fail</checksumPolicy>
</repositories> </releases>
<properties> <snapshots>
<moduleClass>com.pmease.gitop.core.CoreModule</moduleClass> <enabled>true</enabled>
</properties> <updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>http://artifact.pmease.com/</url>
</repository>
</repositories>
<properties>
<moduleClass>com.pmease.gitop.core.CoreModule</moduleClass>
</properties>
</project> </project>

View File

@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
import com.pmease.commons.editable.annotation.Editable; import com.pmease.commons.editable.annotation.Editable;
import com.pmease.commons.hibernate.AbstractEntity; import com.pmease.commons.hibernate.AbstractEntity;
import com.pmease.gitop.core.Gitop; import com.pmease.gitop.core.Gitop;
import com.pmease.gitop.core.gatekeeper.AlwaysAccept; import com.pmease.gitop.core.gatekeeper.ApprovedByAuthorizedUsers;
import com.pmease.gitop.core.gatekeeper.GateKeeper; import com.pmease.gitop.core.gatekeeper.GateKeeper;
import com.pmease.gitop.core.manager.BranchManager; import com.pmease.gitop.core.manager.BranchManager;
import com.pmease.gitop.core.manager.UserManager; import com.pmease.gitop.core.manager.UserManager;
@ -62,7 +62,7 @@ public class Project extends AbstractEntity implements UserBelonging {
private GeneralOperation defaultAuthorizedOperation = GeneralOperation.NO_ACCESS; private GeneralOperation defaultAuthorizedOperation = GeneralOperation.NO_ACCESS;
@Column(nullable=false) @Column(nullable=false)
private GateKeeper gateKeeper = new AlwaysAccept(); private GateKeeper gateKeeper = new ApprovedByAuthorizedUsers();
@Column(nullable=false) @Column(nullable=false)
private Date createdAt = new Date(); private Date createdAt = new Date();

View File

@ -109,7 +109,11 @@ public class GitFilter implements Filter {
} }
git.upload().input(ServletUtils.getInputStream(request)).output(response.getOutputStream()).call(); git.upload().input(ServletUtils.getInputStream(request)).output(response.getOutputStream()).call();
} else { } else {
if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofProjectWrite(project))) { /*
* We intentionally use read permission here for write operation so that gate keeper gets the
* chance to run to possibly create a merge request for non-permitted user.
*/
if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofProjectRead(project))) {
throw new UnauthorizedException("You do not have permission to push to this project."); throw new UnauthorizedException("You do not have permission to push to this project.");
} }
git.receive().input(ServletUtils.getInputStream(request)).output(response.getOutputStream()).call(); git.receive().input(ServletUtils.getInputStream(request)).output(response.getOutputStream()).call();
@ -143,7 +147,11 @@ public class GitFilter implements Filter {
writeInitial(response, service); writeInitial(response, service);
git.advertiseUploadRefs().output(response.getOutputStream()).call(); git.advertiseUploadRefs().output(response.getOutputStream()).call();
} else { } else {
if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofProjectWrite(project))) { /*
* We intentionally use read permission here for write operation so that gate keeper gets the
* chance to run to possibly create a merge request for non-permitted user.
*/
if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofProjectRead(project))) {
throw new UnauthorizedException("You do not have permission to push to this project."); throw new UnauthorizedException("You do not have permission to push to this project.");
} }
writeInitial(response, service); writeInitial(response, service);

View File

@ -1,403 +1,465 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.pmease</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>parent.general</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>parent.general</artifactId>
<packaging>pom</packaging> <version>1.0.31</version>
<prerequisites> <packaging>pom</packaging>
<maven>3.0</maven> <prerequisites>
</prerequisites> <maven>3.0</maven>
<build> </prerequisites>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> <build>
<resources> <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
<resource> <resources>
<directory>src/main/resources</directory> <resource>
<filtering>true</filtering> <directory>src/main/resources</directory>
<includes> <filtering>true</filtering>
<include>archetype-resource/pom.xml</include> <includes>
</includes> <include>archetype-resource/pom.xml</include>
</resource> </includes>
<resource> </resource>
<directory>src/main/resources</directory> <resource>
<excludes> <directory>src/main/resources</directory>
<exclude>archetype-resource/pom.xml</exclude> <excludes>
</excludes> <exclude>archetype-resource/pom.xml</exclude>
</resource> </excludes>
<resource> </resource>
<directory>src/main/java</directory> <resource>
<excludes> <directory>src/main/java</directory>
<exclude>**/*.java</exclude> <excludes>
</excludes> <exclude>**/*.java</exclude>
</resource> </excludes>
</resources> </resource>
<testResources> </resources>
<testResource> <testResources>
<directory>src/test/resources</directory> <testResource>
</testResource> <directory>src/test/resources</directory>
<testResource> </testResource>
<directory>src/test/java</directory> <testResource>
<excludes> <directory>src/test/java</directory>
<exclude>**/*.java</exclude> <excludes>
</excludes> <exclude>**/*.java</exclude>
</testResource> </excludes>
</testResources> </testResource>
<pluginManagement> </testResources>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.eclipse.m2e</groupId> <plugin>
<artifactId>lifecycle-mapping</artifactId> <groupId>org.eclipse.m2e</groupId>
<version>1.0.0</version> <artifactId>lifecycle-mapping</artifactId>
<configuration> <version>1.0.0</version>
<lifecycleMappingMetadata> <configuration>
<pluginExecutions> <lifecycleMappingMetadata>
<pluginExecution> <pluginExecutions>
<pluginExecutionFilter> <pluginExecution>
<groupId>com.pmease</groupId> <pluginExecutionFilter>
<artifactId>plugin.maven</artifactId> <groupId>org.apache.maven.plugins</groupId>
<versionRange>[1.0.0,]</versionRange> <artifactId>maven-enforcer-plugin</artifactId>
<goals> <versionRange>[1.0.0,)</versionRange>
<goal>check-project-dependencies</goal> <goals>
<goal>generate-artifact-descriptor</goal> <goal>enforce</goal>
<goal>generate-plugin-resources</goal> </goals>
<goal>generate-product-resources</goal> </pluginExecutionFilter>
<goal>create-product-sandbox</goal> <action>
<goal>run-ant</goal> <ignore />
</goals> </action>
</pluginExecutionFilter> </pluginExecution>
<action> <pluginExecution>
<execute> <pluginExecutionFilter>
<runOnIncremental>true</runOnIncremental> <groupId>com.pmease</groupId>
<runOnConfiguration>true</runOnConfiguration> <artifactId>plugin.maven</artifactId>
</execute> <versionRange>[1.0.0,]</versionRange>
</action> <goals>
</pluginExecution> <goal>check-project-dependencies</goal>
<pluginExecution> <goal>generate-artifact-descriptor</goal>
<pluginExecutionFilter> <goal>generate-plugin-resources</goal>
<groupId>org.apache.maven.plugins</groupId> <goal>generate-product-resources</goal>
<artifactId>maven-jar-plugin</artifactId> <goal>create-product-sandbox</goal>
<versionRange>[1.0.0,]</versionRange> <goal>run-ant</goal>
<goals> </goals>
<goal>jar</goal> </pluginExecutionFilter>
</goals> <action>
</pluginExecutionFilter> <execute>
<action> <runOnIncremental>true</runOnIncremental>
<ignore/> <runOnConfiguration>true</runOnConfiguration>
</action> </execute>
</pluginExecution> </action>
</pluginExecutions> </pluginExecution>
</lifecycleMappingMetadata> <pluginExecution>
</configuration> <pluginExecutionFilter>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-jar-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId> <versionRange>[1.0.0,]</versionRange>
<configuration> <goals>
<source>1.7</source> <goal>jar</goal>
<target>1.7</target> </goals>
</configuration> </pluginExecutionFilter>
</plugin> <action>
<plugin> <ignore />
<artifactId>maven-archetype-plugin</artifactId> </action>
<version>2.2</version> </pluginExecution>
<executions> </pluginExecutions>
<execution> </lifecycleMappingMetadata>
<id>install-archetype</id> </configuration>
<phase>install</phase> </plugin>
<goals> <plugin>
<goal>update-local-catalog</goal> <artifactId>maven-compiler-plugin</artifactId>
</goals> <configuration>
</execution> <source>1.7</source>
</executions> <target>1.7</target>
</plugin> </configuration>
<plugin> </plugin>
<artifactId>maven-resources-plugin</artifactId> <plugin>
<version>2.5</version> <artifactId>maven-archetype-plugin</artifactId>
<configuration> <version>2.2</version>
<escapeString>\</escapeString> <executions>
</configuration> <execution>
</plugin> <id>install-archetype</id>
<plugin> <phase>install</phase>
<artifactId>maven-jar-plugin</artifactId> <goals>
<version>2.4</version> <goal>update-local-catalog</goal>
<executions> </goals>
<execution> </execution>
<id>default-jar</id> </executions>
<phase>never</phase> </plugin>
<configuration> <plugin>
<finalName>unwanted</finalName> <artifactId>maven-resources-plugin</artifactId>
<classifier>unwanted</classifier> <version>2.5</version>
</configuration> <configuration>
</execution> <escapeString>\</escapeString>
</executions> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>1.7</version> <version>2.4</version>
<dependencies> <executions>
<dependency> <execution>
<groupId>ant</groupId> <id>default-jar</id>
<artifactId>ant-apache-regexp</artifactId> <phase>never</phase>
<version>1.6.5</version> <configuration>
</dependency> <finalName>unwanted</finalName>
<dependency> <classifier>unwanted</classifier>
<groupId>org.codehaus.groovy</groupId> </configuration>
<artifactId>groovy-all</artifactId> </execution>
<version>1.8.6</version> </executions>
</dependency> </plugin>
<dependency> <plugin>
<groupId>org.codehaus.gant</groupId> <artifactId>maven-antrun-plugin</artifactId>
<artifactId>gant_groovy1.8</artifactId> <version>1.7</version>
<version>1.9.7</version> <dependencies>
</dependency> <dependency>
</dependencies> <groupId>ant</groupId>
</plugin> <artifactId>ant-apache-regexp</artifactId>
<plugin> <version>1.6.5</version>
<groupId>com.pmease</groupId> </dependency>
<artifactId>plugin.maven</artifactId> <dependency>
<version>1.0.31</version> <groupId>org.codehaus.groovy</groupId>
<executions> <artifactId>groovy-all</artifactId>
<execution> <version>1.8.6</version>
<id>check-project-dependencies</id> </dependency>
<phase>compile</phase> <dependency>
<goals> <groupId>org.codehaus.gant</groupId>
<goal>check-project-dependencies</goal> <artifactId>gant_groovy1.8</artifactId>
</goals> <version>1.9.7</version>
</execution> </dependency>
<execution> </dependencies>
<id>generate-artifact-descriptor</id> </plugin>
<phase>compile</phase> <plugin>
<goals> <groupId>com.pmease</groupId>
<goal>generate-artifact-descriptor</goal> <artifactId>plugin.maven</artifactId>
</goals> <version>1.0.31</version>
</execution> <executions>
<execution> <execution>
<id>package-artifact</id> <id>check-project-dependencies</id>
<phase>package</phase> <phase>compile</phase>
<goals> <goals>
<goal>package-artifact</goal> <goal>check-project-dependencies</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>generate-plugin-resources</id> <id>generate-artifact-descriptor</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>generate-plugin-resources</goal> <goal>generate-artifact-descriptor</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>generate-product-resources</id> <id>package-artifact</id>
<phase>compile</phase> <phase>package</phase>
<goals> <goals>
<goal>generate-product-resources</goal> <goal>package-artifact</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>create-product-sandbox</id> <id>generate-plugin-resources</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>create-product-sandbox</goal> <goal>generate-plugin-resources</goal>
</goals> </goals>
</execution> </execution>
</executions> <execution>
</plugin> <id>generate-product-resources</id>
<plugin> <phase>compile</phase>
<artifactId>maven-source-plugin</artifactId> <goals>
<version>2.1.2</version> <goal>generate-product-resources</goal>
<executions> </goals>
<execution> </execution>
<id>attach-sources</id> <execution>
<phase>package</phase> <id>create-product-sandbox</id>
<goals> <phase>compile</phase>
<goal>jar-no-fork</goal> <goals>
</goals> <goal>create-product-sandbox</goal>
</execution> </goals>
</executions> </execution>
</plugin> </executions>
<plugin> </plugin>
<artifactId>maven-javadoc-plugin</artifactId> <plugin>
<version>2.8.1</version> <artifactId>maven-source-plugin</artifactId>
<executions> <version>2.1.2</version>
<execution> <executions>
<id>attach-javadocs</id> <execution>
<phase>package</phase> <id>attach-sources</id>
<goals> <phase>package</phase>
<goal>jar</goal> <goals>
</goals> <goal>jar-no-fork</goal>
</execution> </goals>
</executions> </execution>
</plugin> </executions>
</plugins> </plugin>
</pluginManagement> <plugin>
</build> <artifactId>maven-javadoc-plugin</artifactId>
<dependencyManagement> <version>2.8.1</version>
<dependencies> <executions>
<dependency> <execution>
<groupId>org.slf4j</groupId> <id>attach-javadocs</id>
<artifactId>slf4j-api</artifactId> <phase>package</phase>
<version>${slf4jVersion}</version> <goals>
</dependency> <goal>jar</goal>
<dependency> </goals>
<groupId>org.slf4j</groupId> </execution>
<artifactId>jul-to-slf4j</artifactId> </executions>
<version>${slf4jVersion}</version> </plugin>
</dependency> </plugins>
<dependency> </pluginManagement>
<groupId>ch.qos.logback</groupId> <plugins>
<artifactId>logback-core</artifactId> <plugin>
<version>${logbackVersion}</version> <groupId>org.apache.maven.plugins</groupId>
</dependency> <artifactId>maven-enforcer-plugin</artifactId>
<dependency> <version>1.3.1</version>
<groupId>ch.qos.logback</groupId> <executions>
<artifactId>logback-classic</artifactId> <execution>
<version>${logbackVersion}</version> <id>enforce-java</id>
</dependency> <goals>
<dependency> <goal>enforce</goal>
<groupId>org.apache.commons</groupId> </goals>
<artifactId>commons-lang3</artifactId> <configuration>
<version>3.1</version> <rules>
</dependency> <requireJavaVersion>
<dependency> <version>1.7.0</version>
<groupId>commons-codec</groupId> </requireJavaVersion>
<artifactId>commons-codec</artifactId> </rules>
<version>1.7</version> </configuration>
</dependency> </execution>
<dependency> </executions>
<groupId>javax.servlet</groupId> </plugin>
<artifactId>javax.servlet-api</artifactId> </plugins>
<version>3.1-b09</version> </build>
</dependency> <dependencyManagement>
<dependency> <dependencies>
<groupId>commons-io</groupId> <dependency>
<artifactId>commons-io</artifactId> <groupId>org.slf4j</groupId>
<version>2.4</version> <artifactId>slf4j-api</artifactId>
</dependency> <version>${slf4jVersion}</version>
<dependency> </dependency>
<groupId>com.google.code.findbugs</groupId> <dependency>
<artifactId>jsr305</artifactId> <groupId>org.slf4j</groupId>
<version>2.0.1</version> <artifactId>jul-to-slf4j</artifactId>
</dependency> <version>${slf4jVersion}</version>
<dependency> </dependency>
<groupId>com.google.guava</groupId> <dependency>
<artifactId>guava</artifactId> <groupId>ch.qos.logback</groupId>
<version>14.0.1</version> <artifactId>logback-core</artifactId>
</dependency> <version>${logbackVersion}</version>
<dependency> </dependency>
<groupId>org.quartz-scheduler</groupId> <dependency>
<artifactId>quartz</artifactId> <groupId>ch.qos.logback</groupId>
<version>2.1.7</version> <artifactId>logback-classic</artifactId>
</dependency> <version>${logbackVersion}</version>
<dependency> </dependency>
<groupId>dom4j</groupId> <dependency>
<artifactId>dom4j</artifactId> <groupId>org.apache.commons</groupId>
<version>1.6.1</version> <artifactId>commons-lang3</artifactId>
</dependency> <version>3.1</version>
<dependency> </dependency>
<groupId>org.apache.velocity</groupId> <dependency>
<artifactId>velocity</artifactId> <groupId>commons-codec</groupId>
<version>1.7</version> <artifactId>commons-codec</artifactId>
</dependency> <version>1.7</version>
<dependency> </dependency>
<groupId>commons-httpclient</groupId> <dependency>
<artifactId>commons-httpclient</artifactId> <groupId>javax.servlet</groupId>
<version>3.1</version> <artifactId>javax.servlet-api</artifactId>
</dependency> <version>3.1-b09</version>
<dependency> </dependency>
<groupId>joda-time</groupId> <dependency>
<artifactId>joda-time</artifactId> <groupId>commons-io</groupId>
<version>2.2</version> <artifactId>commons-io</artifactId>
</dependency> <version>2.4</version>
<dependency> </dependency>
<groupId>commons-collections</groupId> <dependency>
<artifactId>commons-collections</artifactId> <groupId>com.google.code.findbugs</groupId>
<version>3.2.1</version> <artifactId>jsr305</artifactId>
</dependency> <version>2.0.1</version>
<dependency> </dependency>
<groupId>org.javassist</groupId> <dependency>
<artifactId>javassist</artifactId> <groupId>com.google.guava</groupId>
<version>3.18.0-GA</version> <artifactId>guava</artifactId>
</dependency> <version>14.0.1</version>
<dependency> </dependency>
<groupId>org.apache.ant</groupId> <dependency>
<artifactId>ant</artifactId> <groupId>org.quartz-scheduler</groupId>
<version>1.9.1</version> <artifactId>quartz</artifactId>
</dependency> <version>2.1.7</version>
</dependencies> </dependency>
</dependencyManagement> <dependency>
<dependencies> <groupId>dom4j</groupId>
<dependency> <artifactId>dom4j</artifactId>
<groupId>junit</groupId> <version>1.6.1</version>
<artifactId>junit</artifactId> </dependency>
<version>4.11</version> <dependency>
<scope>test</scope> <groupId>org.apache.velocity</groupId>
</dependency> <artifactId>velocity</artifactId>
<dependency> <version>1.7</version>
<groupId>org.mockito</groupId> </dependency>
<artifactId>mockito-all</artifactId> <dependency>
<version>1.9.5</version> <groupId>commons-httpclient</groupId>
<scope>test</scope> <artifactId>commons-httpclient</artifactId>
</dependency> <version>3.1</version>
<dependency> </dependency>
<groupId>org.powermock</groupId> <dependency>
<artifactId>powermock-module-junit4</artifactId> <groupId>joda-time</groupId>
<version>${powermockVersion}</version> <artifactId>joda-time</artifactId>
<scope>test</scope> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>commons-collections</groupId>
<artifactId>powermock-api-mockito</artifactId> <artifactId>commons-collections</artifactId>
<version>${powermockVersion}</version> <version>3.2.1</version>
<scope>test</scope> </dependency>
</dependency> <dependency>
</dependencies> <groupId>org.javassist</groupId>
<pluginRepositories> <artifactId>javassist</artifactId>
<pluginRepository> <version>3.18.0-GA</version>
<releases> </dependency>
<enabled>true</enabled> <dependency>
<updatePolicy>never</updatePolicy> <groupId>org.apache.ant</groupId>
<checksumPolicy>fail</checksumPolicy> <artifactId>ant</artifactId>
</releases> <version>1.9.1</version>
<snapshots> </dependency>
<enabled>true</enabled> <dependency>
<updatePolicy>never</updatePolicy> <groupId>org.eclipse.jetty</groupId>
<checksumPolicy>fail</checksumPolicy> <artifactId>jetty-server</artifactId>
</snapshots> <version>${jettyVersion}</version>
<id>pmeaseRepo</id> </dependency>
<name>PMEase Repository</name> <dependency>
<url>http://artifact.pmease.com/</url> <groupId>org.eclipse.jetty</groupId>
</pluginRepository> <artifactId>jetty-servlets</artifactId>
</pluginRepositories> <version>${jettyVersion}</version>
<repositories> </dependency>
<repository> <dependency>
<id>pmeaseRepo</id> <groupId>org.eclipse.jetty</groupId>
<name>PMEase Repository</name> <artifactId>jetty-servlet</artifactId>
<releases> <version>${jettyVersion}</version>
<enabled>true</enabled> </dependency>
<updatePolicy>never</updatePolicy> <dependency>
<checksumPolicy>fail</checksumPolicy> <groupId>org.eclipse.jetty</groupId>
</releases> <artifactId>jetty-websocket</artifactId>
<snapshots> <version>${jettyVersion}</version>
<enabled>true</enabled> </dependency>
<updatePolicy>always</updatePolicy> <dependency>
<checksumPolicy>fail</checksumPolicy> <groupId>org.eclipse.jetty</groupId>
</snapshots> <artifactId>jetty-util</artifactId>
<url>http://artifact.pmease.com/</url> <version>${jettyVersion}</version>
</repository> </dependency>
</repositories> </dependencies>
<distributionManagement> </dependencyManagement>
<repository> <dependencies>
<id>pmeaseRepo</id> <dependency>
<url>http://artifact.pmease.com/</url> <groupId>junit</groupId>
</repository> <artifactId>junit</artifactId>
</distributionManagement> <version>4.11</version>
<properties> <scope>test</scope>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </dependency>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <dependency>
<slf4jVersion>1.7.5</slf4jVersion> <groupId>org.mockito</groupId>
<logbackVersion>1.0.11</logbackVersion> <artifactId>mockito-all</artifactId>
<dropwizardVersion>0.7.0-SNAPSHOT</dropwizardVersion> <version>1.9.5</version>
<jerseyVersion>1.17.1</jerseyVersion> <scope>test</scope>
<jacksonVersion>2.2.3</jacksonVersion> </dependency>
<powermockVersion>1.5.1</powermockVersion> <dependency>
</properties> <groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermockVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermockVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<id>pmeaseRepo</id>
<name>PMEase Repository</name>
<url>http://artifact.pmease.com/</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>pmeaseRepo</id>
<name>PMEase Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>http://artifact.pmease.com/</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>pmeaseRepo</id>
<url>http://artifact.pmease.com/</url>
</repository>
</distributionManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4jVersion>1.7.5</slf4jVersion>
<logbackVersion>1.0.11</logbackVersion>
<dropwizardVersion>0.7.0-SNAPSHOT</dropwizardVersion>
<jerseyVersion>1.17.1</jerseyVersion>
<jettyVersion>8.1.10.v20130312</jettyVersion>
<jacksonVersion>2.2.3</jacksonVersion>
<powermockVersion>1.5.1</powermockVersion>
</properties>
</project> </project>

View File

@ -1,126 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.pmease</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>plugin.maven</artifactId> <groupId>com.pmease</groupId>
<version>1.0.31</version> <artifactId>plugin.maven</artifactId>
<packaging>maven-plugin</packaging> <version>1.0.31</version>
<prerequisites> <packaging>maven-plugin</packaging>
<maven>${mavenVersion}</maven> <prerequisites>
</prerequisites> <maven>${mavenVersion}</maven>
<build> </prerequisites>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> <build>
<pluginManagement> <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.eclipse.m2e</groupId> <plugin>
<artifactId>lifecycle-mapping</artifactId> <groupId>org.eclipse.m2e</groupId>
<version>1.0.0</version> <artifactId>lifecycle-mapping</artifactId>
<configuration> <version>1.0.0</version>
<lifecycleMappingMetadata> <configuration>
<pluginExecutions> <lifecycleMappingMetadata>
<pluginExecution> <pluginExecutions>
<pluginExecutionFilter> <pluginExecution>
<groupId>org.apache.maven.plugins</groupId> <pluginExecutionFilter>
<artifactId>maven-jar-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<versionRange>[1.0.0,]</versionRange> <artifactId>maven-jar-plugin</artifactId>
<goals> <versionRange>[1.0.0,]</versionRange>
<goal>jar</goal> <goals>
</goals> <goal>jar</goal>
</pluginExecutionFilter> </goals>
<action> </pluginExecutionFilter>
<ignore/> <action>
</action> <ignore />
</pluginExecution> </action>
</pluginExecutions> </pluginExecution>
</lifecycleMappingMetadata> </pluginExecutions>
</configuration> </lifecycleMappingMetadata>
</plugin> </configuration>
<plugin> </plugin>
<artifactId>maven-compiler-plugin</artifactId> <plugin>
<configuration> <artifactId>maven-compiler-plugin</artifactId>
<source>1.7</source> <configuration>
<target>1.7</target> <source>1.7</source>
</configuration> <target>1.7</target>
</plugin> </configuration>
</plugins> </plugin>
</pluginManagement> <plugin>
</build> <groupId>org.eclipse.m2e</groupId>
<dependencies> <artifactId>lifecycle-mapping</artifactId>
<dependency> <version>1.0.0</version>
<groupId>org.apache.maven</groupId> <configuration>
<artifactId>maven-plugin-api</artifactId> <lifecycleMappingMetadata>
<version>${mavenVersion}</version> <pluginExecutions>
</dependency> <pluginExecution>
<dependency> <pluginExecutionFilter>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>${mavenVersion}</version> <versionRange>[1.0.0,)</versionRange>
</dependency> <goals>
<dependency> <goal>enforce</goal>
<groupId>org.apache.maven</groupId> </goals>
<artifactId>maven-model</artifactId> </pluginExecutionFilter>
<version>${mavenVersion}</version> <action>
</dependency> <ignore />
<dependency> </action>
<groupId>org.apache.maven</groupId> </pluginExecution>
<artifactId>maven-core</artifactId> </pluginExecutions>
<version>${mavenVersion}</version> </lifecycleMappingMetadata>
</dependency> </configuration>
<dependency> </plugin>
<groupId>org.apache.maven</groupId> </plugins>
<artifactId>maven-archiver</artifactId> </pluginManagement>
<version>2.5</version> <plugins>
</dependency> <plugin>
<dependency> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.codehaus.plexus</groupId> <artifactId>maven-enforcer-plugin</artifactId>
<artifactId>plexus-archiver</artifactId> <version>1.3.1</version>
<version>2.1.1</version> <executions>
</dependency> <execution>
<dependency> <id>enforce-java</id>
<groupId>org.codehaus.plexus</groupId> <goals>
<artifactId>plexus-utils</artifactId> <goal>enforce</goal>
<version>3.0</version> </goals>
</dependency> <configuration>
<dependency> <rules>
<groupId>org.codehaus.plexus</groupId> <requireJavaVersion>
<artifactId>plexus-io</artifactId> <version>1.7.0</version>
<version>2.0.4</version> </requireJavaVersion>
</dependency> </rules>
<dependency> </configuration>
<groupId>org.apache.maven.plugins</groupId> </execution>
<artifactId>maven-antrun-plugin</artifactId> </executions>
<version>1.7</version> </plugin>
<optional>true</optional> </plugins>
</dependency> </build>
</dependencies> <dependencies>
<distributionManagement> <dependency>
<repository> <groupId>org.apache.maven</groupId>
<id>pmeaseRepo</id> <artifactId>maven-plugin-api</artifactId>
<url>http://artifact.pmease.com/</url> <version>${mavenVersion}</version>
</repository> </dependency>
</distributionManagement> <dependency>
<repositories> <groupId>org.apache.maven</groupId>
<repository> <artifactId>maven-artifact</artifactId>
<id>pmeaseRepo</id> <version>${mavenVersion}</version>
<name>PMEase Repository</name> </dependency>
<releases> <dependency>
<enabled>true</enabled> <groupId>org.apache.maven</groupId>
<updatePolicy>never</updatePolicy> <artifactId>maven-model</artifactId>
<checksumPolicy>fail</checksumPolicy> <version>${mavenVersion}</version>
</releases> </dependency>
<snapshots> <dependency>
<enabled>true</enabled> <groupId>org.apache.maven</groupId>
<updatePolicy>always</updatePolicy> <artifactId>maven-core</artifactId>
<checksumPolicy>fail</checksumPolicy> <version>${mavenVersion}</version>
</snapshots> </dependency>
<url>http://artifact.pmease.com/</url> <dependency>
</repository> <groupId>org.apache.maven</groupId>
</repositories> <artifactId>maven-archiver</artifactId>
<properties> <version>2.5</version>
<mavenVersion>3.0</mavenVersion> </dependency>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dependency>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <groupId>org.codehaus.plexus</groupId>
</properties> <artifactId>plexus-archiver</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<optional>true</optional>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>pmeaseRepo</id>
<url>http://artifact.pmease.com/</url>
</repository>
</distributionManagement>
<repositories>
<repository>
<id>pmeaseRepo</id>
<name>PMEase Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>http://artifact.pmease.com/</url>
</repository>
</repositories>
<properties>
<mavenVersion>3.0</mavenVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
</project> </project>