Skip to content

Commit 2c20172

Browse files
fixed merge conflicts in pom
1 parent 68dc55f commit 2c20172

File tree

1 file changed

+0
-126
lines changed

1 file changed

+0
-126
lines changed

pom.xml

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
<?xml version="1.0" encoding="UTF-8"?>
32
<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">
43
<modelVersion>4.0.0</modelVersion>
@@ -132,129 +131,4 @@
132131
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
133132
</repository>
134133
</distributionManagement>
135-
=======
136-
<?xml version="1.0" encoding="UTF-8"?>
137-
<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">
138-
<modelVersion>4.0.0</modelVersion>
139-
140-
<groupId>com.github.bastiaanjansen</groupId>
141-
<artifactId>jwt-java</artifactId>
142-
<version>1.1-SNAPSHOT</version>
143-
<url>https://github.com/BastiaanJansen/JWT-Java</url>
144-
145-
<name>JWT-Java</name>
146-
<description>JSON Web Token implementation for Java according to RFC 7519. Easily create, parse and validate JSON Web Tokens using a fluent API.</description>
147-
148-
<licenses>
149-
<license>
150-
<name>MIT Licence</name>
151-
<url>https://github.com/BastiaanJansen/JWT-Java/blob/main/LICENSE</url>
152-
<distribution>repo</distribution>
153-
</license>
154-
</licenses>
155-
156-
<properties>
157-
<maven.compiler.source>1.8</maven.compiler.source>
158-
<maven.compiler.target>1.8</maven.compiler.target>
159-
</properties>
160-
161-
<scm>
162-
<connection>scm:git:https://github.com/BastiaanJansen/JWT-Java.git</connection>
163-
<url>http://github.com/BastiaanJansen/JWT-Java</url>
164-
<developerConnection>scm:git:https://github.com/BastiaanJansen/JWT-Java.git</developerConnection>
165-
<tag>HEAD</tag>
166-
</scm>
167-
168-
<developers>
169-
<developer>
170-
<id>BastiaanJansen</id>
171-
<name>Bastiaan Jansen</name>
172-
</developer>
173-
</developers>
174-
175-
<dependencies>
176-
<dependency>
177-
<groupId>org.json</groupId>
178-
<artifactId>json</artifactId>
179-
<version>20180130</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.junit.jupiter</groupId>
183-
<artifactId>junit-jupiter</artifactId>
184-
<version>5.7.0</version>
185-
<scope>test</scope>
186-
</dependency>
187-
</dependencies>
188-
189-
<build>
190-
<plugins>
191-
<plugin>
192-
<groupId>org.apache.maven.plugins</groupId>
193-
<artifactId>maven-source-plugin</artifactId>
194-
<version>3.2.0</version>
195-
<executions>
196-
<execution>
197-
<id>attach-sources</id>
198-
<goals>
199-
<goal>jar-no-fork</goal>
200-
</goals>
201-
</execution>
202-
</executions>
203-
</plugin>
204-
<plugin>
205-
<groupId>org.apache.maven.plugins</groupId>
206-
<artifactId>maven-javadoc-plugin</artifactId>
207-
<version>2.9.1</version>
208-
<configuration>
209-
<source>8</source>
210-
</configuration>
211-
<executions>
212-
<execution>
213-
<id>attach-javadocs</id>
214-
<goals>
215-
<goal>jar</goal>
216-
</goals>
217-
</execution>
218-
</executions>
219-
</plugin>
220-
<plugin>
221-
<groupId>org.apache.maven.plugins</groupId>
222-
<artifactId>maven-gpg-plugin</artifactId>
223-
<version>1.5</version>
224-
<executions>
225-
<execution>
226-
<id>sign-artifacts</id>
227-
<phase>verify</phase>
228-
<goals>
229-
<goal>sign</goal>
230-
</goals>
231-
</execution>
232-
</executions>
233-
</plugin>
234-
<plugin>
235-
<groupId>org.sonatype.plugins</groupId>
236-
<artifactId>nexus-staging-maven-plugin</artifactId>
237-
<version>1.6.7</version>
238-
<extensions>true</extensions>
239-
<configuration>
240-
<serverId>ossrh</serverId>
241-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
242-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
243-
</configuration>
244-
</plugin>
245-
</plugins>
246-
</build>
247-
248-
<distributionManagement>
249-
<snapshotRepository>
250-
<id>ossrh</id>
251-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
252-
</snapshotRepository>
253-
<repository>
254-
<id>ossrh</id>
255-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
256-
</repository>
257-
</distributionManagement>
258-
259-
>>>>>>> main
260134
</project>

0 commit comments

Comments
 (0)