Skip to content
This repository was archived by the owner on Dec 21, 2021. It is now read-only.

Commit fc2f424

Browse files
jjg-123jjg-123
committed
Version 1.0 release. Needed to tweak pom to get javadoc to build correctly.
1 parent 02bbc6a commit fc2f424

File tree

7 files changed

+76
-41
lines changed

7 files changed

+76
-41
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>org.scitokens</groupId>
1111
<artifactId>scitokens-java</artifactId>
12-
<version>1.0-SNAPSHOT</version>
12+
<version>1.0</version>
1313
<name>Parent module for SciTokens.</name>
1414
<packaging>pom</packaging>
1515
<description>SciTokens Java library.</description>
@@ -98,7 +98,7 @@
9898
<artifactId>maven-gpg-plugin</artifactId>
9999
<version>1.6</version>
100100
<configuration>
101-
<skip>true</skip>
101+
<skip>false</skip>
102102
</configuration>
103103
<executions>
104104
<execution>

‎scitokens-cli/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.scitokens</groupId>
99
<artifactId>scitokens-java</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>1.0</version>
1111
</parent>
1212

1313
<artifactId>scitokens-cli</artifactId>
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.scitokens</groupId>
1919
<artifactId>scitokens-common</artifactId>
20-
<version>1.0-SNAPSHOT</version>
20+
<version>1.0</version>
2121
</dependency>
2222

2323
<!-- Need this for the monitor -->

‎scitokens-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.scitokens</groupId>
99
<artifactId>scitokens-java</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>1.0</version>
1111
</parent>
1212

1313
<artifactId>scitokens-client</artifactId>
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.scitokens</groupId>
1919
<artifactId>scitokens-common</artifactId>
20-
<version>1.0-SNAPSHOT</version>
20+
<version>1.0</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>edu.uiuc.ncsa.myproxy</groupId>

‎scitokens-common/buildNumber.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#maven.buildNumber.plugin properties file
2-
#Tue Dec 12 14:08:32 CST 2017
3-
buildNumber\\d*=37
2+
#Tue Dec 12 15:00:36 CST 2017
3+
buildNumber\\d*=64

‎scitokens-common/pom.xml‎

Lines changed: 64 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.scitokens</groupId>
99
<artifactId>scitokens-java</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>1.0</version>
1111
</parent>
1212

1313
<properties>
@@ -26,13 +26,13 @@
2626
<type>war</type>
2727
<scope>runtime</scope>
2828
</dependency>-->
29-
<!-- <dependency>
30-
<groupId>edu.uiuc.ncsa.myproxy</groupId>
31-
<artifactId>oa4mp-server-oauth2</artifactId>
32-
<version>3.5-SNAPSHOT</version>
33-
<type>test-jar</type>
34-
<scope>test</scope>
35-
</dependency>-->
29+
<!-- <dependency>
30+
<groupId>edu.uiuc.ncsa.myproxy</groupId>
31+
<artifactId>oa4mp-server-oauth2</artifactId>
32+
<version>3.5-SNAPSHOT</version>
33+
<type>test-jar</type>
34+
<scope>test</scope>
35+
</dependency>-->
3636
<dependency>
3737
<groupId>edu.uiuc.ncsa.myproxy</groupId>
3838
<artifactId>oa4mp-server-api</artifactId>
@@ -58,28 +58,28 @@
5858
<artifactId>oa4mp-server-loader-oauth2</artifactId>
5959
<version>3.5-SNAPSHOT</version>
6060
</dependency>
61-
<!-- <dependency>
62-
<groupId>edu.uiuc.ncsa.security</groupId>
63-
<artifactId>ncsa-security-core</artifactId>
64-
<version>3.5-SNAPSHOT</version>
65-
<type>test-jar</type>
66-
<scope>test</scope>
67-
</dependency>-->
68-
<!-- <dependency>
69-
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
70-
<artifactId>ncsa-security-delegation-common</artifactId>
71-
<version>3.5-SNAPSHOT</version>
72-
<type>test-jar</type>
73-
<scope>test</scope>
74-
</dependency>-->
61+
<!-- <dependency>
62+
<groupId>edu.uiuc.ncsa.security</groupId>
63+
<artifactId>ncsa-security-core</artifactId>
64+
<version>3.5-SNAPSHOT</version>
65+
<type>test-jar</type>
66+
<scope>test</scope>
67+
</dependency>-->
68+
<!-- <dependency>
69+
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
70+
<artifactId>ncsa-security-delegation-common</artifactId>
71+
<version>3.5-SNAPSHOT</version>
72+
<type>test-jar</type>
73+
<scope>test</scope>
74+
</dependency>-->
7575

76-
<!-- <dependency>
77-
<groupId>edu.uiuc.ncsa.myproxy</groupId>
78-
<artifactId>oa4mp-server-test</artifactId>
79-
<version>3.5-SNAPSHOT</version>
80-
<type>test-jar</type>
81-
<scope>test</scope>
82-
</dependency>-->
76+
<!-- <dependency>
77+
<groupId>edu.uiuc.ncsa.myproxy</groupId>
78+
<artifactId>oa4mp-server-test</artifactId>
79+
<version>3.5-SNAPSHOT</version>
80+
<type>test-jar</type>
81+
<scope>test</scope>
82+
</dependency>-->
8383
<dependency>
8484
<groupId>edu.uiuc.ncsa.security.delegation</groupId>
8585
<artifactId>ncsa-security-oauth-2.0</artifactId>
@@ -214,6 +214,41 @@
214214
215215
</configuration>
216216
</plugin>-->
217+
<plugin>
218+
<groupId>org.apache.maven.plugins</groupId>
219+
<artifactId>maven-source-plugin</artifactId>
220+
<version>3.0.0</version>
221+
<executions>
222+
<execution>
223+
<id>attach-sources</id>
224+
<goals>
225+
<goal>jar</goal>
226+
</goals>
227+
</execution>
228+
</executions>
229+
</plugin>
230+
<plugin>
231+
<groupId>org.apache.maven.plugins</groupId>
232+
<artifactId>maven-javadoc-plugin</artifactId>
233+
<version>2.9</version>
234+
<executions>
235+
<execution>
236+
<id>attach-javadocs</id>
237+
<goals>
238+
<goal>jar</goal>
239+
</goals>
240+
<configuration>
241+
<!-- Java 8 specific or empty javadoc tags make the build fail -->
242+
<additionalparam>-Xdoclint:none</additionalparam>
243+
<aggregate>true</aggregate>
244+
<use>false</use>
245+
246+
</configuration>
247+
248+
</execution>
249+
</executions>
250+
251+
</plugin>
217252
</plugins>
218253
<finalName>scitokens-common</finalName>
219254
</build>

‎scitokens-server/buildNumber.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#maven.buildNumber.plugin properties file
2-
#Tue Dec 12 14:08:57 CST 2017
3-
buildNumber\\d*=21
2+
#Tue Dec 12 15:01:05 CST 2017
3+
buildNumber\\d*=42

‎scitokens-server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.scitokens</groupId>
99
<artifactId>scitokens-java</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>1.0</version>
1111
</parent>
1212

1313
<properties>
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>org.scitokens</groupId>
2424
<artifactId>scitokens-common</artifactId>
25-
<version>1.0-SNAPSHOT</version>
25+
<version>1.0</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>edu.uiuc.ncsa.myproxy</groupId>

0 commit comments

Comments
 (0)