summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorCGantert345 <57003061+CGantert345@users.noreply.github.com>2021-07-01 11:39:27 +0200
committerCGantert345 <57003061+CGantert345@users.noreply.github.com>2021-07-01 11:39:27 +0200
commitfb445995ed59b2053910ccfcdded4b434ec2976d (patch)
treee822edbc5195026e0f3f88d9a4f9b5e0284187cd /pom.xml
parentversion number updated (diff)
downloadUIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar.gz
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar.bz2
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar.lz
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar.xz
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.tar.zst
UIC-barcode-fb445995ed59b2053910ccfcdded4b434ec2976d.zip
Diffstat (limited to '')
-rw-r--r--pom.xml69
1 files changed, 69 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 15f9ffd..8c45312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.uic.barcode</groupId>
@@ -64,3 +65,71 @@
</license>
</licenses>
</project>
+=======
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.uic.barcode</groupId>
+ <artifactId>org.uic.barcode</artifactId>
+ <version>1.2.6-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIC barcode</name>
+ <description>encoding and decoding of bar code content according to UIC IRS 90918-9</description>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
+>>>>>>> refs/heads/FCB_version_3.0.0