Remove deprecated build configuration and libscrypt references.
This commit is contained in:
		@@ -1,55 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
        <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
        <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password Algorithm Implementation</name>
 | 
					 | 
				
			||||||
    <description>The implementation of the Master Password algorithm</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <artifactId>masterpassword-algorithm</artifactId>
 | 
					 | 
				
			||||||
    <packaging>jar</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
					 | 
				
			||||||
    <dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- PROJECT REFERENCES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.lhunath.opal</groupId>
 | 
					 | 
				
			||||||
            <artifactId>opal-system</artifactId>
 | 
					 | 
				
			||||||
            <version>1.7.-p1</version>
 | 
					 | 
				
			||||||
            <exclusions>
 | 
					 | 
				
			||||||
                <exclusion>
 | 
					 | 
				
			||||||
                    <groupId>joda-time</groupId>
 | 
					 | 
				
			||||||
                    <artifactId>joda-time</artifactId>
 | 
					 | 
				
			||||||
                </exclusion>
 | 
					 | 
				
			||||||
            </exclusions>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.lhunath.opal</groupId>
 | 
					 | 
				
			||||||
            <artifactId>opal-crypto</artifactId>
 | 
					 | 
				
			||||||
            <version>1.7-p1</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- EXTERNAL DEPENDENCIES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lambdaworks</groupId>
 | 
					 | 
				
			||||||
            <artifactId>scrypt</artifactId>
 | 
					 | 
				
			||||||
            <version>1.4.0</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.fasterxml.jackson.core</groupId>
 | 
					 | 
				
			||||||
            <artifactId>jackson-annotations</artifactId>
 | 
					 | 
				
			||||||
            <version>2.9.5</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
@@ -1,56 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
        <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
        <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password Site Model</name>
 | 
					 | 
				
			||||||
    <description>A persistence model for Master Password sites.</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <artifactId>masterpassword-model</artifactId>
 | 
					 | 
				
			||||||
    <packaging>jar</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
					 | 
				
			||||||
    <dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- PROJECT REFERENCES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
            <artifactId>masterpassword-algorithm</artifactId>
 | 
					 | 
				
			||||||
            <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- EXTERNAL DEPENDENCIES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>joda-time</groupId>
 | 
					 | 
				
			||||||
            <artifactId>joda-time</artifactId>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.google.auto.value</groupId>
 | 
					 | 
				
			||||||
            <artifactId>auto-value</artifactId>
 | 
					 | 
				
			||||||
            <version>1.0-rc1</version>
 | 
					 | 
				
			||||||
            <scope>provided</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- TESTING -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>org.testng</groupId>
 | 
					 | 
				
			||||||
            <artifactId>testng</artifactId>
 | 
					 | 
				
			||||||
            <scope>test</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>ch.qos.logback</groupId>
 | 
					 | 
				
			||||||
            <artifactId>logback-classic</artifactId>
 | 
					 | 
				
			||||||
            <scope>test</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
@@ -1,44 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
        <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
        <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password Test Suite</name>
 | 
					 | 
				
			||||||
    <description>The standard test suite to ensure the Master Password algorithm is operating as it should</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <artifactId>masterpassword-tests</artifactId>
 | 
					 | 
				
			||||||
    <packaging>jar</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
					 | 
				
			||||||
    <dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- PROJECT REFERENCES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
            <artifactId>masterpassword-algorithm</artifactId>
 | 
					 | 
				
			||||||
            <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- TESTING -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>org.testng</groupId>
 | 
					 | 
				
			||||||
            <artifactId>testng</artifactId>
 | 
					 | 
				
			||||||
            <scope>test</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>ch.qos.logback</groupId>
 | 
					 | 
				
			||||||
            <artifactId>logback-classic</artifactId>
 | 
					 | 
				
			||||||
            <scope>test</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
@@ -1,60 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.lhunath</groupId>
 | 
					 | 
				
			||||||
        <artifactId>lyndir</artifactId>
 | 
					 | 
				
			||||||
        <version>1.22</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password</name>
 | 
					 | 
				
			||||||
    <description>A Java implementation of the Master Password algorithm.</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
    <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
    <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    <packaging>pom</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <modules>
 | 
					 | 
				
			||||||
        <module>masterpassword-tests</module>
 | 
					 | 
				
			||||||
        <module>masterpassword-algorithm</module>
 | 
					 | 
				
			||||||
        <module>masterpassword-model</module>
 | 
					 | 
				
			||||||
        <module>masterpassword-gui</module>
 | 
					 | 
				
			||||||
    </modules>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <profiles>
 | 
					 | 
				
			||||||
        <profile>
 | 
					 | 
				
			||||||
            <id>release</id>
 | 
					 | 
				
			||||||
            <modules>
 | 
					 | 
				
			||||||
                <module>masterpassword-android</module>
 | 
					 | 
				
			||||||
            </modules>
 | 
					 | 
				
			||||||
        </profile>
 | 
					 | 
				
			||||||
        <profile>
 | 
					 | 
				
			||||||
            <id>mod:android</id>
 | 
					 | 
				
			||||||
            <modules>
 | 
					 | 
				
			||||||
                <module>masterpassword-android</module>
 | 
					 | 
				
			||||||
            </modules>
 | 
					 | 
				
			||||||
        </profile>
 | 
					 | 
				
			||||||
    </profiles>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- REMOTE ARTIFACT REPOSITORIES -->
 | 
					 | 
				
			||||||
    <repositories>
 | 
					 | 
				
			||||||
        <repository>
 | 
					 | 
				
			||||||
            <id>lyndir</id>
 | 
					 | 
				
			||||||
            <name>Lyndir Repository</name>
 | 
					 | 
				
			||||||
            <url>http://maven.lyndir.com</url>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            <snapshots>
 | 
					 | 
				
			||||||
                <enabled>true</enabled>
 | 
					 | 
				
			||||||
                <updatePolicy>never</updatePolicy>
 | 
					 | 
				
			||||||
            </snapshots>
 | 
					 | 
				
			||||||
            <releases>
 | 
					 | 
				
			||||||
                <enabled>true</enabled>
 | 
					 | 
				
			||||||
                <updatePolicy>never</updatePolicy>
 | 
					 | 
				
			||||||
            </releases>
 | 
					 | 
				
			||||||
        </repository>
 | 
					 | 
				
			||||||
    </repositories>
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
@@ -43,5 +43,4 @@ dependencies {
 | 
				
			|||||||
    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.7.13-underscore'
 | 
					    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.7.13-underscore'
 | 
				
			||||||
    compile group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
 | 
					    compile group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
 | 
				
			||||||
    annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '8.5.1'
 | 
					    annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '8.5.1'
 | 
				
			||||||
    compile files( 'libs/scrypt-1.4.0-native.jar' )
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
										
											Binary file not shown.
										
									
								
							@@ -1,148 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
        <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
        <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password Android</name>
 | 
					 | 
				
			||||||
    <description>An Android application to the Master Password algorithm</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <artifactId>masterpassword-android</artifactId>
 | 
					 | 
				
			||||||
    <packaging>apk</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- BUILD CONFIGURATION -->
 | 
					 | 
				
			||||||
    <build>
 | 
					 | 
				
			||||||
        <plugins>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
 | 
					 | 
				
			||||||
                <artifactId>android-maven-plugin</artifactId>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                <configuration>
 | 
					 | 
				
			||||||
                    <zipalign>
 | 
					 | 
				
			||||||
                        <verbose>true</verbose>
 | 
					 | 
				
			||||||
                        <skip>false</skip>
 | 
					 | 
				
			||||||
                    </zipalign>
 | 
					 | 
				
			||||||
                    <sdk>
 | 
					 | 
				
			||||||
                        <platform>21</platform>
 | 
					 | 
				
			||||||
                    </sdk>
 | 
					 | 
				
			||||||
                </configuration>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
        </plugins>
 | 
					 | 
				
			||||||
    </build>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <profiles>
 | 
					 | 
				
			||||||
        <profile>
 | 
					 | 
				
			||||||
            <id>release</id>
 | 
					 | 
				
			||||||
            <build>
 | 
					 | 
				
			||||||
                <plugins>
 | 
					 | 
				
			||||||
                    <plugin>
 | 
					 | 
				
			||||||
                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
 | 
					 | 
				
			||||||
                        <artifactId>android-maven-plugin</artifactId>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <sign>
 | 
					 | 
				
			||||||
                                <debug>false</debug>
 | 
					 | 
				
			||||||
                            </sign>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                        <executions>
 | 
					 | 
				
			||||||
                            <execution>
 | 
					 | 
				
			||||||
                                <id>manifest-update</id>
 | 
					 | 
				
			||||||
                                <phase>process-resources</phase>
 | 
					 | 
				
			||||||
                                <goals>
 | 
					 | 
				
			||||||
                                    <goal>manifest-update</goal>
 | 
					 | 
				
			||||||
                                </goals>
 | 
					 | 
				
			||||||
                                <configuration>
 | 
					 | 
				
			||||||
                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
 | 
					 | 
				
			||||||
                                </configuration>
 | 
					 | 
				
			||||||
                            </execution>
 | 
					 | 
				
			||||||
                        </executions>
 | 
					 | 
				
			||||||
                    </plugin>
 | 
					 | 
				
			||||||
                    <plugin>
 | 
					 | 
				
			||||||
                        <groupId>org.apache.maven.plugins</groupId>
 | 
					 | 
				
			||||||
                        <artifactId>maven-jarsigner-plugin</artifactId>
 | 
					 | 
				
			||||||
                        <version>1.4</version>
 | 
					 | 
				
			||||||
                        <executions>
 | 
					 | 
				
			||||||
                            <execution>
 | 
					 | 
				
			||||||
                                <id>signing</id>
 | 
					 | 
				
			||||||
                                <goals>
 | 
					 | 
				
			||||||
                                    <goal>sign</goal>
 | 
					 | 
				
			||||||
                                </goals>
 | 
					 | 
				
			||||||
                                <phase>package</phase>
 | 
					 | 
				
			||||||
                                <inherited>true</inherited>
 | 
					 | 
				
			||||||
                                <configuration>
 | 
					 | 
				
			||||||
                                    <archiveDirectory />
 | 
					 | 
				
			||||||
                                    <includes>
 | 
					 | 
				
			||||||
                                        <include>target/*.apk</include>
 | 
					 | 
				
			||||||
                                    </includes>
 | 
					 | 
				
			||||||
                                    <keystore>masterpassword.keystore</keystore>
 | 
					 | 
				
			||||||
                                    <storepass>${env.STORE_PW}</storepass>
 | 
					 | 
				
			||||||
                                    <keypass>${env.KEY_PW_ANDROID}</keypass>
 | 
					 | 
				
			||||||
                                    <alias>masterpassword-android</alias>
 | 
					 | 
				
			||||||
                                    <arguments>
 | 
					 | 
				
			||||||
                                        <argument>-sigalg</argument>
 | 
					 | 
				
			||||||
                                        <argument>MD5withRSA</argument>
 | 
					 | 
				
			||||||
                                        <argument>-digestalg</argument>
 | 
					 | 
				
			||||||
                                        <argument>SHA1</argument>
 | 
					 | 
				
			||||||
                                    </arguments>
 | 
					 | 
				
			||||||
                                </configuration>
 | 
					 | 
				
			||||||
                            </execution>
 | 
					 | 
				
			||||||
                        </executions>
 | 
					 | 
				
			||||||
                    </plugin>
 | 
					 | 
				
			||||||
                </plugins>
 | 
					 | 
				
			||||||
            </build>
 | 
					 | 
				
			||||||
        </profile>
 | 
					 | 
				
			||||||
    </profiles>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
					 | 
				
			||||||
    <dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- PROJECT REFERENCES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
            <artifactId>masterpassword-algorithm</artifactId>
 | 
					 | 
				
			||||||
            <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
            <artifactId>masterpassword-tests</artifactId>
 | 
					 | 
				
			||||||
            <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- EXTERNAL DEPENDENCIES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.jakewharton</groupId>
 | 
					 | 
				
			||||||
            <artifactId>butterknife</artifactId>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>org.slf4j</groupId>
 | 
					 | 
				
			||||||
            <artifactId>slf4j-android</artifactId>
 | 
					 | 
				
			||||||
            <version>1.7.13-underscore</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>android</groupId>
 | 
					 | 
				
			||||||
            <artifactId>android</artifactId>
 | 
					 | 
				
			||||||
            <version>5.0.1_r2</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lambdaworks</groupId>
 | 
					 | 
				
			||||||
            <artifactId>scrypt</artifactId>
 | 
					 | 
				
			||||||
            <version>1.4.0-android</version>
 | 
					 | 
				
			||||||
            <type>jar</type>
 | 
					 | 
				
			||||||
            <classifier>native</classifier>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
@@ -1,161 +0,0 @@
 | 
				
			|||||||
<?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">
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- PROJECT METADATA -->
 | 
					 | 
				
			||||||
    <parent>
 | 
					 | 
				
			||||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
        <artifactId>masterpassword</artifactId>
 | 
					 | 
				
			||||||
        <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    </parent>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <name>Master Password GUI</name>
 | 
					 | 
				
			||||||
    <description>A GUI interface to the Master Password algorithm</description>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <artifactId>masterpassword-gui</artifactId>
 | 
					 | 
				
			||||||
    <packaging>jar</packaging>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- BUILD CONFIGURATION -->
 | 
					 | 
				
			||||||
    <build>
 | 
					 | 
				
			||||||
        <resources>
 | 
					 | 
				
			||||||
            <resource>
 | 
					 | 
				
			||||||
                <directory>src/main/resources</directory>
 | 
					 | 
				
			||||||
                <filtering>false</filtering>
 | 
					 | 
				
			||||||
            </resource>
 | 
					 | 
				
			||||||
        </resources>
 | 
					 | 
				
			||||||
        <plugins>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <groupId>org.codehaus.mojo</groupId>
 | 
					 | 
				
			||||||
                <artifactId>buildnumber-maven-plugin</artifactId>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <groupId>org.apache.maven.plugins</groupId>
 | 
					 | 
				
			||||||
                <artifactId>maven-jar-plugin</artifactId>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <groupId>org.apache.maven.plugins</groupId>
 | 
					 | 
				
			||||||
                <artifactId>maven-shade-plugin</artifactId>
 | 
					 | 
				
			||||||
                <version>2.2</version>
 | 
					 | 
				
			||||||
                <executions>
 | 
					 | 
				
			||||||
                    <execution>
 | 
					 | 
				
			||||||
                        <phase>package</phase>
 | 
					 | 
				
			||||||
                        <goals>
 | 
					 | 
				
			||||||
                            <goal>shade</goal>
 | 
					 | 
				
			||||||
                        </goals>
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <transformers>
 | 
					 | 
				
			||||||
                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 | 
					 | 
				
			||||||
                                    <mainClass>com.lyndir.masterpassword.gui.GUI</mainClass>
 | 
					 | 
				
			||||||
                                </transformer>
 | 
					 | 
				
			||||||
                            </transformers>
 | 
					 | 
				
			||||||
                            <filters>
 | 
					 | 
				
			||||||
                                <filter>
 | 
					 | 
				
			||||||
                                    <artifact>*:*</artifact>
 | 
					 | 
				
			||||||
                                    <excludes>
 | 
					 | 
				
			||||||
                                        <exclude>META-INF/*.SF</exclude>
 | 
					 | 
				
			||||||
                                        <exclude>META-INF/*.DSA</exclude>
 | 
					 | 
				
			||||||
                                        <exclude>META-INF/*.RSA</exclude>
 | 
					 | 
				
			||||||
                                    </excludes>
 | 
					 | 
				
			||||||
                                </filter>
 | 
					 | 
				
			||||||
                            </filters>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
                    </execution>
 | 
					 | 
				
			||||||
                </executions>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
        </plugins>
 | 
					 | 
				
			||||||
    </build>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <profiles>
 | 
					 | 
				
			||||||
        <profile>
 | 
					 | 
				
			||||||
            <id>release</id>
 | 
					 | 
				
			||||||
            <build>
 | 
					 | 
				
			||||||
                <plugins>
 | 
					 | 
				
			||||||
                    <plugin>
 | 
					 | 
				
			||||||
                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
 | 
					 | 
				
			||||||
                        <artifactId>android-maven-plugin</artifactId>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <sign>
 | 
					 | 
				
			||||||
                                <debug>false</debug>
 | 
					 | 
				
			||||||
                            </sign>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                        <executions>
 | 
					 | 
				
			||||||
                            <execution>
 | 
					 | 
				
			||||||
                                <id>manifest-update</id>
 | 
					 | 
				
			||||||
                                <phase>process-resources</phase>
 | 
					 | 
				
			||||||
                                <goals>
 | 
					 | 
				
			||||||
                                    <goal>manifest-update</goal>
 | 
					 | 
				
			||||||
                                </goals>
 | 
					 | 
				
			||||||
                                <configuration>
 | 
					 | 
				
			||||||
                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
 | 
					 | 
				
			||||||
                                </configuration>
 | 
					 | 
				
			||||||
                            </execution>
 | 
					 | 
				
			||||||
                        </executions>
 | 
					 | 
				
			||||||
                    </plugin>
 | 
					 | 
				
			||||||
                    <plugin>
 | 
					 | 
				
			||||||
                        <groupId>org.apache.maven.plugins</groupId>
 | 
					 | 
				
			||||||
                        <artifactId>maven-jarsigner-plugin</artifactId>
 | 
					 | 
				
			||||||
                        <version>1.4</version>
 | 
					 | 
				
			||||||
                        <executions>
 | 
					 | 
				
			||||||
                            <execution>
 | 
					 | 
				
			||||||
                                <id>signing</id>
 | 
					 | 
				
			||||||
                                <goals>
 | 
					 | 
				
			||||||
                                    <goal>sign</goal>
 | 
					 | 
				
			||||||
                                </goals>
 | 
					 | 
				
			||||||
                                <phase>package</phase>
 | 
					 | 
				
			||||||
                                <inherited>true</inherited>
 | 
					 | 
				
			||||||
                                <configuration>
 | 
					 | 
				
			||||||
                                    <archiveDirectory />
 | 
					 | 
				
			||||||
                                    <includes>
 | 
					 | 
				
			||||||
                                        <include>target/*.jar</include>
 | 
					 | 
				
			||||||
                                    </includes>
 | 
					 | 
				
			||||||
                                    <keystore>masterpassword.keystore</keystore>
 | 
					 | 
				
			||||||
                                    <storepass>${env.STORE_PW}</storepass>
 | 
					 | 
				
			||||||
                                    <keypass>${env.KEY_PW_DESKTOP}</keypass>
 | 
					 | 
				
			||||||
                                    <alias>masterpassword-desktop</alias>
 | 
					 | 
				
			||||||
                                    <arguments>
 | 
					 | 
				
			||||||
                                        <argument>-sigalg</argument>
 | 
					 | 
				
			||||||
                                        <argument>MD5withRSA</argument>
 | 
					 | 
				
			||||||
                                        <argument>-digestalg</argument>
 | 
					 | 
				
			||||||
                                        <argument>SHA1</argument>
 | 
					 | 
				
			||||||
                                    </arguments>
 | 
					 | 
				
			||||||
                                </configuration>
 | 
					 | 
				
			||||||
                            </execution>
 | 
					 | 
				
			||||||
                        </executions>
 | 
					 | 
				
			||||||
                    </plugin>
 | 
					 | 
				
			||||||
                </plugins>
 | 
					 | 
				
			||||||
            </build>
 | 
					 | 
				
			||||||
        </profile>
 | 
					 | 
				
			||||||
    </profiles>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
					 | 
				
			||||||
    <dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- PROJECT REFERENCES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
					 | 
				
			||||||
            <artifactId>masterpassword-model</artifactId>
 | 
					 | 
				
			||||||
            <version>GIT-SNAPSHOT</version>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- EXTERNAL DEPENDENCIES -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>ch.qos.logback</groupId>
 | 
					 | 
				
			||||||
            <artifactId>logback-classic</artifactId>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- STUBS -->
 | 
					 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <!-- http://ymasory.github.io/OrangeExtensions/ -->
 | 
					 | 
				
			||||||
            <groupId>com.yuvimasory</groupId>
 | 
					 | 
				
			||||||
            <artifactId>orange-extensions</artifactId>
 | 
					 | 
				
			||||||
            <version>1.3.0</version>
 | 
					 | 
				
			||||||
            <scope>provided</scope>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </dependencies>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user