diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
commit | aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (patch) | |
tree | 0798f107e13d8a8546c1b15c6432e5360a656e92 /repository/iaik/iaik_tsl/1.0 | |
parent | 576f5ea5cfaf2ea174f198dc5df238c1ca0c331a (diff) | |
parent | c3e07d7fb87b2d132ffc838e4878b9479da361a7 (diff) | |
download | moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.gz moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.bz2 moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.zip |
Update to MOA-SPSS 3.0.0-RC1
Merge branch 'moa-id-3.2_(OPB)' into moa-id_with_moa-sig_and_eccelerate
Conflicts:
id/moa-spss-container/pom.xml
pom.xml
Diffstat (limited to 'repository/iaik/iaik_tsl/1.0')
-rw-r--r-- | repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar | bin | 549794 -> 0 bytes | |||
-rw-r--r-- | repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom | 251 |
2 files changed, 0 insertions, 251 deletions
diff --git a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar b/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar Binary files differdeleted file mode 100644 index 596ec60ea..000000000 --- a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar +++ /dev/null diff --git a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom b/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom deleted file mode 100644 index 2ffb92b70..000000000 --- a/repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom +++ /dev/null @@ -1,251 +0,0 @@ -<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"> - <modelVersion>4.0.0</modelVersion> - <groupId>iaik</groupId> - <artifactId>iaik_tsl</artifactId> - <packaging>jar</packaging> - <version>1.0</version> - <name>TSL_library</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> - </properties> - - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - </resources> - - <finalName>${project.artifactId}</finalName> - - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>validate</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${endorsed.dir}</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeArtifactIds>jaxb-api,jaxb-impl</includeArtifactIds> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> - <configuration> - <compilerArguments> - <verbose /> - <endorseddirs>${endorsed.dir}</endorseddirs> - </compilerArguments> - <source>${java.version}</source> - <target>${java.version}</target> - <fork>true</fork> - <compilerVersion>${java.version}</compilerVersion> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireJavaVersion> - <version>1.5</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.0,)</versionRange> - <goals> - <goal>copy-dependencies</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <id>profile-for-jdk1.6</id> - <activation> - <activeByDefault>false</activeByDefault> - <jdk>[1.6,)</jdk> - </activation> - <properties> - <java.version>1.6</java.version> - <envClassifier>jdk${java.version}</envClassifier> - </properties> - <build> - <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName> - </build> - <dependencies> - <!-- Requires JAVA 1.6 --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2.6</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2.6</version> - </dependency> - - </dependencies> - </profile> - <profile> - <id>profile-for-jdk1.5</id> - <activation> - <activeByDefault>true</activeByDefault> - <jdk>(,1.5]</jdk> - </activation> - <properties> - <java.version>1.5</java.version> - <envClassifier>jdk${java.version}</envClassifier> - </properties> - <build> - <finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName> - </build> - <dependencies> - <!-- Last Version with JAVA 1.5 --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2.4</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2.4-1</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <dependencies> - - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_xsect_eval</artifactId> - <version>1.1709142</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_ecc_signed</artifactId> - <version>2.19</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jce_eval_signed</artifactId> - <version>3.181</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_pki_module</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_javax_crypto</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_util</artifactId> - <!-- <version>0.23 (snapshot 20121011-125127 eval)</version>--> - <version>0.23</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_jsse</artifactId> - <version>4.4</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>iaik_ssl</artifactId> - <version>4.4</version> - </dependency> - <dependency> - <groupId>iaik</groupId> - <artifactId>w3c_http</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.xerial</groupId> - <artifactId>sqlite-jdbc</artifactId> - <version>3.7.2</version> - </dependency> - - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.7.1</version> - </dependency> - </dependencies> - -</project>
\ No newline at end of file |