Skip to content

Commit

Permalink
Remove unsupported Javadoc tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdhoek
jdhoek committed Aug 10, 2020
1 parent d8ca817 commit 7d6215e
Show file tree
Hide file tree
Showing 6 changed files with 463 additions and 2 deletions.
204 changes: 204 additions & 0 deletions pom.xml.releaseBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2014 Lable (info@lable.nl)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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>

<parent>
<groupId>org.lable.oss</groupId>
<artifactId>parent</artifactId>
<version>1.7</version>
</parent>

<groupId>org.lable.oss.uniqueid</groupId>
<artifactId>uniqueid</artifactId>
<version>2.6-beta5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>UniqueID</name>
<description>A unique ID generator that specialises in small IDs.</description>
<inceptionYear>2014</inceptionYear>
<url>https://github.com/LableOrg/java-uniqueid</url>

<modules>
<module>uniqueid-core</module>
<module>uniqueid-zookeeper</module>
<module>uniqueid-etcd</module>
</modules>

<properties>
<java.language.level>1.8</java.language.level>

<dynamicconfig.version>2.9-beta4</dynamicconfig.version>
<zookeeper.version>3.4.6</zookeeper.version>
<jetcd-version>0.4.1</jetcd-version>
<slf4j.version>1.7.21</slf4j.version>

<!-- For testing only. -->
<log4j.version>2.7</log4j.version>
<hamcrest.optional>1.0</hamcrest.optional>
</properties>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<scm>
<connection>scm:git:git@github.com:LableOrg/java-uniqueid.git</connection>
<developerConnection>scm:git:git@github.com:LableOrg/java-uniqueid.git</developerConnection>
<url>https://github.com/LableOrg/java-uniqueid</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>jdhoek</id>
<name>Jeroen Hoek</name>
<email>jeroen.hoek@lable.nl</email>
<organization>Lable</organization>
<organizationUrl>http://lable.nl</organizationUrl>
</developer>
</developers>

<dependencyManagement>
<dependencies>
<dependency>
<artifactId>uniqueid-core</artifactId>
<groupId>org.lable.oss.uniqueid</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
<exclusions>
<!-- Cf. http://stackoverflow.com/questions/4908651/the-following-artifacts-could-not-be-resolved-javax-jmsjmsjar1-1 -->
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- Testing dependencies. -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.ggtools.junit</groupId>
<artifactId>junit-categories</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.plugin.version}</version>
<configuration>
<excludedGroups>net.ggtools.junit.categories.Slow</excludedGroups>
</configuration>
</plugin>

<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<!-- Profile that also runs the slower integration tests that can take several minutes. -->
<id>it-slow</id>
<activation>
<property>
<name>it-slow</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.plugin.version}</version>
<configuration combine.self="override">
<excludedGroups />
<groups>net.ggtools.junit.categories.Slow</groups>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
28 changes: 28 additions & 0 deletions release.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#release configuration
#Mon Aug 10 09:33:40 CEST 2020
scm.commentPrefix=[maven-release-plugin]
pushChanges=true
project.dev.org.lable.oss.uniqueid\:uniqueid=3.1-SNAPSHOT
scm.tag=v3.0
remoteTagging=true
project.scm.org.lable.oss.uniqueid\:uniqueid-core.empty=true
exec.additionalArguments=-Dit
project.dev.org.lable.oss.uniqueid\:uniqueid-etcd=3.1-SNAPSHOT
project.rel.org.lable.oss.uniqueid\:uniqueid=3.0
project.dev.org.lable.oss.uniqueid\:uniqueid-core=3.1-SNAPSHOT
projectVersionPolicyId=default
project.rel.org.lable.oss.uniqueid\:uniqueid-etcd=3.0
project.rel.org.lable.oss.uniqueid\:uniqueid-core=3.0
scm.url=scm\:git\:git@github.com\:LableOrg/java-uniqueid.git
scm.tagNameFormat=v@{project.version}
project.rel.org.lable.oss.uniqueid\:uniqueid-zookeeper=3.0
project.scm.org.lable.oss.uniqueid\:uniqueid.developerConnection=scm\:git\:git@github.com\:LableOrg/java-uniqueid.git
project.scm.org.lable.oss.uniqueid\:uniqueid-zookeeper.empty=true
preparationGoals=clean verify
project.scm.org.lable.oss.uniqueid\:uniqueid.tag=HEAD
project.scm.org.lable.oss.uniqueid\:uniqueid-etcd.empty=true
project.dev.org.lable.oss.uniqueid\:uniqueid-zookeeper=3.1-SNAPSHOT
exec.snapshotReleasePluginAllowed=false
project.scm.org.lable.oss.uniqueid\:uniqueid.url=https\://github.com/LableOrg/java-uniqueid
project.scm.org.lable.oss.uniqueid\:uniqueid.connection=scm\:git\:git@github.com\:LableOrg/java-uniqueid.git
completedPhase=end-release
55 changes: 55 additions & 0 deletions uniqueid-core/pom.xml.releaseBackup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2014 Lable (info@lable.nl)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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">
<parent>
<artifactId>uniqueid</artifactId>
<groupId>org.lable.oss.uniqueid</groupId>
<version>2.6-beta5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>uniqueid-core</artifactId>
<name>UniqueID :: Core</name>

<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
4 changes: 2 additions & 2 deletions uniqueid-core/src/main/java/org/lable/oss/uniqueid/Clock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

/**
* Abstraction for the clock implementation. This allows for use of this library in deterministic systems and tests.
*
* @implNote Clocks should at a minimum progress once every millisecond.
* <p>
* Implementation note: clocks should at a minimum progress once every millisecond.
*/
@FunctionalInterface
public interface Clock {
Expand Down
Loading

0 comments on commit 7d6215e

Please sign in to comment.