Skip to content

Commit 0984e9c

Browse files
ph4r05ph4r05
committed
Merge branch 'master' of https://github.com/licel/jcardsim 
2 parents d5a357b + 6c0cd78 commit 0984e9c

File tree

4 files changed

+322
-116
lines changed

4 files changed

+322
-116
lines changed

‎pom.xml‎

Lines changed: 60 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>com.klinec</groupId>
6-
<version>3.0.5.9</version>
5+
<groupId>com.licel</groupId>
6+
<version>3.0.5-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<url>http://maven.apache.org</url>
99

@@ -41,103 +41,83 @@
4141
<java.version>1.7</java.version>
4242
<jcApiVersion>3.0.5</jcApiVersion>
4343
</properties>
44-
45-
<!-- Maven distribution repositories -->
44+
4645
<distributionManagement>
47-
<snapshotRepository>
48-
<id>ossrh</id>
49-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
50-
</snapshotRepository>
5146
<repository>
52-
<id>ossrh</id>
53-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
47+
<id>bintray-jcardsim-maven-jCardSim</id>
48+
<name>jcardsim-maven-jCardSim</name>
49+
<url>https://api.bintray.com/maven/jcardsim/maven/jCardSim</url>
5450
</repository>
5551
</distributionManagement>
5652

5753
<scm>
58-
<connection>scm:git:[email protected]:ph4r05/jcardsim.git</connection>
59-
<developerConnection>scm:git:[email protected]:ph4r05/jcardsim.git</developerConnection>
60-
<url>[email protected]:ph4r05/jcardsim.git</url>
54+
<connection>scm:git:[email protected]:licel/jcardsim.git</connection>
55+
<developerConnection>scm:git:[email protected]:licel/jcardsim.git</developerConnection>
56+
<url>[email protected]:licel/jcardsim.git</url>
6157
</scm>
62-
63-
<!-- Releasing: http://central.sonatype.org/pages/apache-maven.html -->
58+
6459
<profiles>
6560
<profile>
66-
<id>release</id>
61+
<id>sign</id>
62+
<activation>
63+
<property>
64+
<name>keystoreLocation</name>
65+
</property>
66+
</activation>
6767
<build>
6868
<plugins>
69-
70-
<!-- Release -->
71-
<plugin>
72-
<groupId>org.sonatype.plugins</groupId>
73-
<artifactId>nexus-staging-maven-plugin</artifactId>
74-
<version>1.6.3</version>
75-
<extensions>true</extensions>
76-
<configuration>
77-
<serverId>ossrh</serverId>
78-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
79-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
80-
</configuration>
81-
</plugin>
82-
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-release-plugin</artifactId>
86-
<version>2.5</version>
87-
<configuration>
88-
<autoVersionSubmodules>true</autoVersionSubmodules>
89-
<useReleaseProfile>false</useReleaseProfile>
90-
<releaseProfiles>release</releaseProfiles>
91-
<goals>deploy</goals>
92-
</configuration>
93-
</plugin>
94-
95-
<!-- Sources & Javadocs -->
9669
<plugin>
9770
<groupId>org.apache.maven.plugins</groupId>
9871
<artifactId>maven-source-plugin</artifactId>
9972
<version>2.2.1</version>
10073
<executions>
10174
<execution>
10275
<id>attach-sources</id>
76+
<phase>verify</phase>
10377
<goals>
10478
<goal>jar-no-fork</goal>
10579
</goals>
10680
</execution>
10781
</executions>
108-
</plugin>
82+
</plugin>
10983
<plugin>
11084
<groupId>org.apache.maven.plugins</groupId>
11185
<artifactId>maven-javadoc-plugin</artifactId>
112-
<version>2.9.1</version>
86+
<version>${maven-javadoc-plugin.version}</version>
87+
<configuration>
88+
<author>false</author>
89+
<bottom>&nbsp;</bottom>
90+
</configuration>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.apache.maven.plugins</groupId>
94+
<artifactId>maven-jarsigner-plugin</artifactId>
95+
<version>1.2</version>
11396
<executions>
11497
<execution>
115-
<id>attach-javadocs</id>
98+
<id>sign</id>
11699
<goals>
117-
<goal>jar</goal>
100+
<goal>sign</goal>
118101
</goals>
119102
</execution>
120-
</executions>
121-
</plugin>
122-
123-
<!-- GPG signature -->
124-
<plugin>
125-
<groupId>org.apache.maven.plugins</groupId>
126-
<artifactId>maven-gpg-plugin</artifactId>
127-
<version>1.5</version>
128-
<executions>
129103
<execution>
130-
<id>sign-artifacts</id>
131-
<phase>verify</phase>
104+
<id>verify</id>
132105
<goals>
133-
<goal>sign</goal>
106+
<goal>verify</goal>
134107
</goals>
135108
</execution>
136109
</executions>
137-
</plugin>
110+
<configuration>
111+
<keystore>${keystoreLocation}</keystore>
112+
<alias>${keyAlias}</alias>
113+
<storepass>${keystorePass}</storepass>
114+
<keypass>${keyPass}</keypass>
115+
<storetype>${storeType}</storetype>
116+
</configuration>
117+
</plugin>
138118
</plugins>
139119
</build>
140-
</profile>
120+
</profile>
141121
</profiles>
142122

143123
<dependencies>
@@ -156,8 +136,7 @@
156136
<groupId>oracle.javacard</groupId>
157137
<artifactId>api_classic</artifactId>
158138
<version>${jcApiVersion}</version>
159-
<scope>provided</scope>
160-
<optional>true</optional>
139+
<scope>compile</scope>
161140
</dependency>
162141
<dependency>
163142
<groupId>org.ow2.asm</groupId>
@@ -240,14 +219,14 @@
240219
</execution>
241220
</executions>
242221
</plugin>
243-
<plugin>
222+
<plugin>
244223
<groupId>org.apache.maven.plugins</groupId>
245-
<artifactId>maven-surefire-plugin</artifactId>
246-
<version>2.19.1</version>
247-
<configuration>
248-
<argLine>-noverify</argLine>
249-
</configuration>
250-
</plugin>
224+
<artifactId>maven-surefire-plugin</artifactId>
225+
<version>2.21.0</version>
226+
<configuration>
227+
<argLine>-noverify</argLine>
228+
</configuration>
229+
</plugin>
251230
<!-- patch -->
252231
<plugin>
253232
<groupId>org.codehaus.mojo</groupId>
@@ -281,7 +260,6 @@
281260
</configuration>
282261
</execution>
283262
</executions>
284-
285263
</plugin>
286264
<plugin>
287265
<groupId>org.apache.maven.plugins</groupId>
@@ -314,9 +292,6 @@
314292
<include>org.bouncycastle:*</include>
315293
</includes>
316294
<excludes>
317-
<exclude>java.io:*</exclude>
318-
<exclude>java.lang:*</exclude>
319-
<exclude>java.rmi:*</exclude>
320295
<exclude>oracle.javacard:*</exclude>
321296
<exclude>oracle.javacard:*:*:*</exclude>
322297
<exclude>*:api_classic</exclude>
@@ -349,9 +324,6 @@
349324
<include>org.bouncycastle:*</include>
350325
</includes>
351326
<excludes>
352-
<exclude>java.io:*</exclude>
353-
<exclude>java.lang:*</exclude>
354-
<exclude>java.rmi:*</exclude>
355327
<exclude>oracle.javacard:*</exclude>
356328
<exclude>oracle.javacard:*:*:*</exclude>
357329
<exclude>*:api_classic</exclude>
@@ -419,13 +391,13 @@
419391
<artifactId>maven-antrun-plugin</artifactId>
420392
<version>1.8</version>
421393
<dependencies>
422-
<!-- <dependency>-->
423-
<!-- <groupId>com.sun</groupId>-->
424-
<!-- <artifactId>tools</artifactId>-->
425-
<!-- <version>1.5.0</version>-->
426-
<!-- <scope>system</scope>-->
427-
<!-- <systemPath>${java.home}/../lib/tools.jar</systemPath>-->
428-
<!-- </dependency>-->
394+
<dependency>
395+
<groupId>com.sun</groupId>
396+
<artifactId>tools</artifactId>
397+
<version>1.5.0</version>
398+
<scope>system</scope>
399+
<systemPath>${java.home}/../lib/tools.jar</systemPath>
400+
</dependency>
429401
<dependency>
430402
<groupId>org.apache.ant</groupId>
431403
<artifactId>ant-junit</artifactId>
@@ -438,7 +410,7 @@
438410
<configuration>
439411
<target>
440412
<path id="compileClasspath">
441-
<file name="${project.build.directory}/${project.artifactId}-${project.version}.jar" />
413+
<file name="${project.build.directory}/jcardsim-${project.version}.jar" />
442414
<file name="${user.home}/.m2/repository/junit/junit/${junit.version}/junit-${junit.version}.jar" />
443415
</path>
444416

@@ -448,7 +420,7 @@
448420
<mkdir dir="${ant.build.dir}/reports"/>
449421
<mkdir dir="${ant.build.dir}/bin/unpacked"/>
450422
<!-- remove sign -->
451-
<unzip src="${project.build.directory}/${project.artifactId}-${project.version}-android.jar"
423+
<unzip src="${project.build.directory}/jcardsim-${project.version}-android.jar"
452424
dest="${ant.build.dir}/bin/unpacked">
453425
<patternset>
454426
<exclude name="**/*.SF"/>
@@ -475,9 +447,9 @@
475447
<fileset dir="${project.basedir}/src/test/resources" />
476448
</copy>
477449

478-
<echo>Testing shaded JAR: ${project.artifactId}-${project.version}-android.jar</echo>
450+
<echo>Testing shaded JAR: jcardsim-${project.version}-android.jar</echo>
479451
<junit fork="yes" forkmode="once" haltonfailure="yes" printsummary="true">
480-
<jvmarg value="-noverify"/>
452+
<jvmarg value="-noverify"/>
481453
<classpath>
482454
<path refid="testClasspath" />
483455
<pathelement location="${ant.build.dir}/bin" />

0 commit comments

Comments
 (0)