octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2025-01-03 15:17:23 +00:00
Code Issues Releases Wiki Activity

Restore the use of manifest.txt as discussed

Browse Source 
Resolve Git conflicts
This commit is contained in:
Stephan Fuhrmann 2021-11-18 15:45:49 +01:00
parent 036f7edf01
commit e20db045cd
1 changed files with 245 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -32,12 +32,10 @@
--> -->
<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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.plantuml</groupId> <groupId>net.sourceforge.plantuml</groupId>
<artifactId>plantuml</artifactId> <artifactId>plantuml</artifactId>
<version>1.2021.15-SNAPSHOT</version> <version>1.2021.15-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>PlantUML</name> <name>PlantUML</name>
<description> <description>
PlantUML is a component that allows to quickly write : PlantUML is a component that allows to quickly write :
@ -50,13 +48,11 @@
* object diagram * object diagram
</description> </description>
<url>https://plantuml.com</url> <url>https://plantuml.com</url>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>7</version> <version>7</version>
</parent> </parent>
<properties> <properties>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
@ -65,7 +61,6 @@
<maven.compiler.testTarget>1.8</maven.compiler.testTarget> <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<main.class>net.sourceforge.plantuml.Run</main.class> <main.class>net.sourceforge.plantuml.Run</main.class>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -77,8 +72,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
@ -104,7 +97,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<licenses> <licenses>
<license> <license>
<name>The GNU General Public License</name> <name>The GNU General Public License</name>
@ -112,18 +104,15 @@
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<scm> <scm>
<connection>scm:svn:svn://svn.code.sf.net/p/plantuml/code/trunk</connection> <connection>scm:svn:svn://svn.code.sf.net/p/plantuml/code/trunk</connection>
<developerConnection>scm:svn:https://svn.code.sf.net/p/plantuml/code/trunk</developerConnection> <developerConnection>scm:svn:https://svn.code.sf.net/p/plantuml/code/trunk</developerConnection>
<url>svn://svn.code.sf.net/p/plantuml/code/trunk</url> <url>svn://svn.code.sf.net/p/plantuml/code/trunk</url>
</scm> </scm>
<issueManagement> <issueManagement>
<system>Sourceforge</system> <system>Sourceforge</system>
<url>http://sourceforge.net/tracker/?group_id=259736</url> <url>http://sourceforge.net/tracker/?group_id=259736</url>
</issueManagement> </issueManagement>
<developers> <developers>
<developer> <developer>
<id>arnaud.roques</id> <id>arnaud.roques</id>
@ -131,7 +120,6 @@
<email>plantuml@gmail.com</email> <email>plantuml@gmail.com</email>
</developer> </developer>
</developers> </developers>
<build> <build>
<finalName>${finalName}</finalName> <finalName>${finalName}</finalName>
<sourceDirectory>${project.basedir}/src</sourceDirectory> <sourceDirectory>${project.basedir}/src</sourceDirectory>
@ -203,18 +191,11 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.2.0</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifestFile>manifest.txt</manifestFile>
<addClasspath>true</addClasspath>
<useUniqueVersions>false</useUniqueVersions>
<mainClass>${main.class}</mainClass>
<addBuildEnvironmentEntries>true</addBuildEnvironmentEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
@ -244,7 +225,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- <!--