Skip to content

Commit 5f7940e

Browse files
ralphlangeralphlange
committed
Java build reorganization; use parent pom
1 parent 9e3f4ca commit 5f7940e

1 file changed

Lines changed: 10 additions & 122 deletions

File tree

‎normativeTypesJava/pom.xml‎

Lines changed: 10 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -2,135 +2,23 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>org.epics</groupId>
6-
<artifactId>normativeTypesJava</artifactId>
7-
<version>0.2.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
5+
<parent>
6+
<groupId>org.epics</groupId>
7+
<artifactId>epics-parent</artifactId>
8+
<version>4.6.0-SNAPSHOT</version>
9+
</parent>
910

10-
<name>normativeTypes - Java</name>
11-
<!--<url>https://github.com/epics-base/normativeTypesJava</url>-->
11+
<artifactId>epics-ntypes</artifactId>
12+
<version>0.2.0-SNAPSHOT</version>
1213

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
</properties>
14+
<name>normativeTypesJava</name>
15+
<url>https://github.com/epics-base/normativeTypesJava</url>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>junit</groupId>
20-
<artifactId>junit</artifactId>
21-
<version>4.12</version>
22-
<scope>test</scope>
23-
</dependency>
2418
<dependency>
2519
<groupId>${project.groupId}</groupId>
26-
<artifactId>pvDataJava</artifactId>
27-
<version>5.1.0-SNAPSHOT</version>
20+
<artifactId>epics-pvdata</artifactId>
2821
</dependency>
2922
</dependencies>
30-
31-
<distributionManagement>
32-
<!-- To be able to deploy, set login/passwd in your m2 settings.xml, <servers> section
33-
(id values there should match ids below) -->
34-
<repository>
35-
<id>epics.releases</id>
36-
<name>EPICS Repository</name>
37-
<url>scp://shell.sourceforge.net/home/project-web/epics/htdocs/maven2</url>
38-
</repository>
39-
</distributionManagement>
40-
41-
<repositories>
42-
<repository>
43-
<id>epics</id>
44-
<name>EPICS Repository</name>
45-
<url>http://epics.sourceforge.net/maven2/</url>
46-
</repository>
47-
</repositories>
48-
49-
<build>
50-
<sourceDirectory>src</sourceDirectory>
51-
<testSourceDirectory>test</testSourceDirectory>
52-
53-
<plugins>
54-
55-
<!-- Includes the OSGi manifest -->
56-
<plugin>
57-
<groupId>org.apache.felix</groupId>
58-
<artifactId>maven-bundle-plugin</artifactId>
59-
<version>2.5.3</version>
60-
<extensions>true</extensions>
61-
<executions>
62-
<execution>
63-
<id>bundle-manifest</id>
64-
<phase>process-classes</phase>
65-
<goals>
66-
<goal>manifest</goal>
67-
</goals>
68-
</execution>
69-
</executions>
70-
</plugin>
71-
<plugin>
72-
<artifactId>maven-jar-plugin</artifactId>
73-
<version>2.5</version>
74-
<configuration>
75-
<archive>
76-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
77-
</archive>
78-
</configuration>
79-
</plugin>
80-
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>3.2</version>
85-
<configuration>
86-
<source>1.7</source>
87-
<target>1.7</target>
88-
</configuration>
89-
</plugin>
90-
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-source-plugin</artifactId>
94-
<version>2.4</version>
95-
<executions>
96-
<execution>
97-
<id>attach-sources</id>
98-
<goals>
99-
<goal>jar</goal>
100-
</goals>
101-
</execution>
102-
</executions>
103-
</plugin>
104-
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-javadoc-plugin</artifactId>
108-
<version>2.10.1</version>
109-
<executions>
110-
<execution>
111-
<id>attach-javadocs</id>
112-
<goals>
113-
<goal>jar</goal>
114-
</goals>
115-
</execution>
116-
</executions>
117-
<configuration>
118-
<overview>documentation/ntJava.html</overview>
119-
</configuration>
120-
</plugin>
121-
122-
<plugin>
123-
<artifactId>maven-deploy-plugin</artifactId>
124-
<version>2.8.2</version>
125-
<dependencies>
126-
<dependency>
127-
<groupId>org.apache.maven.wagon</groupId>
128-
<artifactId>wagon-ssh</artifactId>
129-
<version>2.8</version>
130-
</dependency>
131-
</dependencies>
132-
</plugin>
13323

134-
</plugins>
135-
</build>
13624
</project>

0 commit comments

Comments
 (0)