Skip to content

Commit 7d6215e

Browse files
jdhoekjdhoek
committed
Remove unsupported Javadoc tag
1 parent d8ca817 commit 7d6215e

File tree

6 files changed

+463
-2
lines changed

6 files changed

+463
-2
lines changed

‎pom.xml.releaseBackup

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (C) 2014 Lable ([email protected])
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<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">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>org.lable.oss</groupId>
24+
<artifactId>parent</artifactId>
25+
<version>1.7</version>
26+
</parent>
27+
28+
<groupId>org.lable.oss.uniqueid</groupId>
29+
<artifactId>uniqueid</artifactId>
30+
<version>2.6-beta5-SNAPSHOT</version>
31+
<packaging>pom</packaging>
32+
33+
<name>UniqueID</name>
34+
<description>A unique ID generator that specialises in small IDs.</description>
35+
<inceptionYear>2014</inceptionYear>
36+
<url>https://github.com/LableOrg/java-uniqueid</url>
37+
38+
<modules>
39+
<module>uniqueid-core</module>
40+
<module>uniqueid-zookeeper</module>
41+
<module>uniqueid-etcd</module>
42+
</modules>
43+
44+
<properties>
45+
<java.language.level>1.8</java.language.level>
46+
47+
<dynamicconfig.version>2.9-beta4</dynamicconfig.version>
48+
<zookeeper.version>3.4.6</zookeeper.version>
49+
<jetcd-version>0.4.1</jetcd-version>
50+
<slf4j.version>1.7.21</slf4j.version>
51+
52+
<!-- For testing only. -->
53+
<log4j.version>2.7</log4j.version>
54+
<hamcrest.optional>1.0</hamcrest.optional>
55+
</properties>
56+
57+
<licenses>
58+
<license>
59+
<name>The Apache License, Version 2.0</name>
60+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
61+
</license>
62+
</licenses>
63+
64+
<scm>
65+
<connection>scm:git:[email protected]:LableOrg/java-uniqueid.git</connection>
66+
<developerConnection>scm:git:[email protected]:LableOrg/java-uniqueid.git</developerConnection>
67+
<url>https://github.com/LableOrg/java-uniqueid</url>
68+
<tag>HEAD</tag>
69+
</scm>
70+
71+
<developers>
72+
<developer>
73+
<id>jdhoek</id>
74+
<name>Jeroen Hoek</name>
75+
<email>[email protected]</email>
76+
<organization>Lable</organization>
77+
<organizationUrl>http://lable.nl</organizationUrl>
78+
</developer>
79+
</developers>
80+
81+
<dependencyManagement>
82+
<dependencies>
83+
<dependency>
84+
<artifactId>uniqueid-core</artifactId>
85+
<groupId>org.lable.oss.uniqueid</groupId>
86+
<version>${project.version}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.zookeeper</groupId>
90+
<artifactId>zookeeper</artifactId>
91+
<version>${zookeeper.version}</version>
92+
<exclusions>
93+
<!-- Cf. http://stackoverflow.com/questions/4908651/the-following-artifacts-could-not-be-resolved-javax-jmsjmsjar1-1 -->
94+
<exclusion>
95+
<groupId>com.sun.jmx</groupId>
96+
<artifactId>jmxri</artifactId>
97+
</exclusion>
98+
<exclusion>
99+
<groupId>com.sun.jdmk</groupId>
100+
<artifactId>jmxtools</artifactId>
101+
</exclusion>
102+
<exclusion>
103+
<groupId>javax.jms</groupId>
104+
<artifactId>jms</artifactId>
105+
</exclusion>
106+
</exclusions>
107+
</dependency>
108+
</dependencies>
109+
</dependencyManagement>
110+
111+
<dependencies>
112+
<dependency>
113+
<groupId>org.slf4j</groupId>
114+
<artifactId>slf4j-api</artifactId>
115+
<version>${slf4j.version}</version>
116+
</dependency>
117+
<!-- Testing dependencies. -->
118+
<dependency>
119+
<groupId>org.apache.logging.log4j</groupId>
120+
<artifactId>log4j-slf4j-impl</artifactId>
121+
<version>${log4j.version}</version>
122+
<scope>test</scope>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.apache.logging.log4j</groupId>
126+
<artifactId>log4j-core</artifactId>
127+
<version>${log4j.version}</version>
128+
<scope>test</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.apache.logging.log4j</groupId>
132+
<artifactId>log4j-web</artifactId>
133+
<version>${log4j.version}</version>
134+
<scope>test</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.slf4j</groupId>
138+
<artifactId>log4j-over-slf4j</artifactId>
139+
<version>${slf4j.version}</version>
140+
<scope>test</scope>
141+
</dependency>
142+
<dependency>
143+
<groupId>com.github.stefanbirkner</groupId>
144+
<artifactId>system-rules</artifactId>
145+
<version>1.4.0</version>
146+
<scope>test</scope>
147+
</dependency>
148+
<dependency>
149+
<groupId>commons-codec</groupId>
150+
<artifactId>commons-codec</artifactId>
151+
<version>1.9</version>
152+
<scope>test</scope>
153+
</dependency>
154+
<dependency>
155+
<groupId>net.ggtools.junit</groupId>
156+
<artifactId>junit-categories</artifactId>
157+
<version>1.0</version>
158+
<scope>test</scope>
159+
</dependency>
160+
</dependencies>
161+
162+
<build>
163+
<plugins>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-failsafe-plugin</artifactId>
167+
<version>${maven.failsafe.plugin.version}</version>
168+
<configuration>
169+
<excludedGroups>net.ggtools.junit.categories.Slow</excludedGroups>
170+
</configuration>
171+
</plugin>
172+
173+
<plugin>
174+
<groupId>com.mycila</groupId>
175+
<artifactId>license-maven-plugin</artifactId>
176+
</plugin>
177+
</plugins>
178+
</build>
179+
180+
<profiles>
181+
<profile>
182+
<!-- Profile that also runs the slower integration tests that can take several minutes. -->
183+
<id>it-slow</id>
184+
<activation>
185+
<property>
186+
<name>it-slow</name>
187+
</property>
188+
</activation>
189+
<build>
190+
<plugins>
191+
<plugin>
192+
<groupId>org.apache.maven.plugins</groupId>
193+
<artifactId>maven-failsafe-plugin</artifactId>
194+
<version>${maven.failsafe.plugin.version}</version>
195+
<configuration combine.self="override">
196+
<excludedGroups />
197+
<groups>net.ggtools.junit.categories.Slow</groups>
198+
</configuration>
199+
</plugin>
200+
</plugins>
201+
</build>
202+
</profile>
203+
</profiles>
204+
</project>

‎release.properties

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#release configuration
2+
#Mon Aug 10 09:33:40 CEST 2020
3+
scm.commentPrefix=[maven-release-plugin]
4+
pushChanges=true
5+
project.dev.org.lable.oss.uniqueid\:uniqueid=3.1-SNAPSHOT
6+
scm.tag=v3.0
7+
remoteTagging=true
8+
project.scm.org.lable.oss.uniqueid\:uniqueid-core.empty=true
9+
exec.additionalArguments=-Dit
10+
project.dev.org.lable.oss.uniqueid\:uniqueid-etcd=3.1-SNAPSHOT
11+
project.rel.org.lable.oss.uniqueid\:uniqueid=3.0
12+
project.dev.org.lable.oss.uniqueid\:uniqueid-core=3.1-SNAPSHOT
13+
projectVersionPolicyId=default
14+
project.rel.org.lable.oss.uniqueid\:uniqueid-etcd=3.0
15+
project.rel.org.lable.oss.uniqueid\:uniqueid-core=3.0
16+
scm.url=scm\:git\:[email protected]\:LableOrg/java-uniqueid.git
17+
scm.tagNameFormat=v@{project.version}
18+
project.rel.org.lable.oss.uniqueid\:uniqueid-zookeeper=3.0
19+
project.scm.org.lable.oss.uniqueid\:uniqueid.developerConnection=scm\:git\:[email protected]\:LableOrg/java-uniqueid.git
20+
project.scm.org.lable.oss.uniqueid\:uniqueid-zookeeper.empty=true
21+
preparationGoals=clean verify
22+
project.scm.org.lable.oss.uniqueid\:uniqueid.tag=HEAD
23+
project.scm.org.lable.oss.uniqueid\:uniqueid-etcd.empty=true
24+
project.dev.org.lable.oss.uniqueid\:uniqueid-zookeeper=3.1-SNAPSHOT
25+
exec.snapshotReleasePluginAllowed=false
26+
project.scm.org.lable.oss.uniqueid\:uniqueid.url=https\://github.com/LableOrg/java-uniqueid
27+
project.scm.org.lable.oss.uniqueid\:uniqueid.connection=scm\:git\:[email protected]\:LableOrg/java-uniqueid.git
28+
completedPhase=end-release

‎uniqueid-core/pom.xml.releaseBackup

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (C) 2014 Lable ([email protected])
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<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">
20+
<parent>
21+
<artifactId>uniqueid</artifactId>
22+
<groupId>org.lable.oss.uniqueid</groupId>
23+
<version>2.6-beta5-SNAPSHOT</version>
24+
</parent>
25+
<modelVersion>4.0.0</modelVersion>
26+
27+
<artifactId>uniqueid-core</artifactId>
28+
<name>UniqueID :: Core</name>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<artifactId>maven-failsafe-plugin</artifactId>
34+
</plugin>
35+
36+
<plugin>
37+
<groupId>org.jacoco</groupId>
38+
<artifactId>jacoco-maven-plugin</artifactId>
39+
</plugin>
40+
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-jar-plugin</artifactId>
44+
<version>2.6</version>
45+
<executions>
46+
<execution>
47+
<goals>
48+
<goal>test-jar</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
</plugins>
54+
</build>
55+
</project>

‎uniqueid-core/src/main/java/org/lable/oss/uniqueid/Clock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
/**
1919
* Abstraction for the clock implementation. This allows for use of this library in deterministic systems and tests.
20-
*
21-
* @implNote Clocks should at a minimum progress once every millisecond.
20+
* <p>
21+
* Implementation note: clocks should at a minimum progress once every millisecond.
2222
*/
2323
@FunctionalInterface
2424
public interface Clock {

0 commit comments

Comments
 (0)