Skip to content

Commit 508255e

Browse files
katysaintinkatysaintin
committed
Roll back to original pom
1 parent c508ab9 commit 508255e

File tree

2 files changed

+162
-182
lines changed

2 files changed

+162
-182
lines changed

‎app/alarm/ui/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@
4444
<artifactId>app-alarm-model</artifactId>
4545
<version>4.6.10-SNAPSHOT</version>
4646
</dependency>
47-
<dependency>
48-
<groupId>org.phoebus</groupId>
49-
<artifactId>core-security</artifactId>
50-
<version>4.6.10-SNAPSHOT</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.phoebus</groupId>
54-
<artifactId>core-security</artifactId>
55-
<version>4.6.10-SNAPSHOT</version>
56-
</dependency>
5747
<dependency>
5848
<groupId>net.sf.sociaal</groupId>
5949
<artifactId>freetts</artifactId>

‎services/alarm-server/pom.xml‎

Lines changed: 162 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,169 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<parent>
4-
<groupId>org.phoebus</groupId>
5-
<artifactId>services</artifactId>
6-
<version>4.6.10-SNAPSHOT</version>
7-
</parent>
8-
<modelVersion>4.0.0</modelVersion>
9-
<artifactId>service-alarm-server</artifactId>
10-
<dependencies>
1+
<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">
2+
<parent>
3+
<groupId>org.phoebus</groupId>
4+
<artifactId>services</artifactId>
5+
<version>4.6.10-SNAPSHOT</version>
6+
</parent>
7+
<modelVersion>4.0.0</modelVersion>
8+
<artifactId>service-alarm-server</artifactId>
9+
<dependencies>
1110

12-
<dependency>
13-
<groupId>junit</groupId>
14-
<artifactId>junit</artifactId>
15-
<version>${junit.version}</version>
16-
<scope>test</scope>
17-
</dependency>
18-
<dependency>
19-
<groupId>org.hamcrest</groupId>
20-
<artifactId>hamcrest-all</artifactId>
21-
<version>1.3</version>
22-
<scope>test</scope>
23-
</dependency>
11+
<dependency>
12+
<groupId>junit</groupId>
13+
<artifactId>junit</artifactId>
14+
<version>${junit.version}</version>
15+
<scope>test</scope>
16+
</dependency>
17+
<dependency>
18+
<groupId>org.hamcrest</groupId>
19+
<artifactId>hamcrest-all</artifactId>
20+
<version>1.3</version>
21+
<scope>test</scope>
22+
</dependency>
2423

25-
<dependency>
26-
<groupId>org.phoebus</groupId>
27-
<artifactId>core-framework</artifactId>
28-
<version>4.6.10-SNAPSHOT</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.phoebus</groupId>
32-
<artifactId>core-util</artifactId>
33-
<version>4.6.10-SNAPSHOT</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.phoebus</groupId>
37-
<artifactId>core-pv</artifactId>
38-
<version>4.6.10-SNAPSHOT</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.phoebus</groupId>
42-
<artifactId>core-formula</artifactId>
43-
<version>4.6.10-SNAPSHOT</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.phoebus</groupId>
47-
<artifactId>core-email</artifactId>
48-
<version>4.6.10-SNAPSHOT</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.phoebus</groupId>
52-
<artifactId>app-alarm-model</artifactId>
53-
<version>4.6.10-SNAPSHOT</version>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.phoebus</groupId>
57-
<artifactId>core-vtype</artifactId>
58-
<version>4.6.10-SNAPSHOT</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.epics</groupId>
62-
<artifactId>vtype</artifactId>
63-
<version>1.0.4</version>
64-
</dependency>
24+
<dependency>
25+
<groupId>org.phoebus</groupId>
26+
<artifactId>core-framework</artifactId>
27+
<version>4.6.10-SNAPSHOT</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.phoebus</groupId>
31+
<artifactId>core-util</artifactId>
32+
<version>4.6.10-SNAPSHOT</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.phoebus</groupId>
36+
<artifactId>core-pv</artifactId>
37+
<version>4.6.10-SNAPSHOT</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.phoebus</groupId>
41+
<artifactId>core-formula</artifactId>
42+
<version>4.6.10-SNAPSHOT</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.phoebus</groupId>
46+
<artifactId>core-email</artifactId>
47+
<version>4.6.10-SNAPSHOT</version>
48+
</dependency>
6549

66-
<!--JUL bindings for sfl4j -->
67-
<dependency>
68-
<groupId>org.slf4j</groupId>
69-
<artifactId>slf4j-jdk14</artifactId>
70-
<version>1.7.28</version>
71-
</dependency>
72-
</dependencies>
73-
<build>
74-
<plugins>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-dependency-plugin</artifactId>
78-
<executions>
79-
<execution>
80-
<id>copy-dependencies</id>
81-
<phase>prepare-package</phase>
82-
<goals>
83-
<goal>copy-dependencies</goal>
84-
</goals>
85-
<configuration>
86-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
87-
<overWriteReleases>false</overWriteReleases>
88-
<overWriteSnapshots>false</overWriteSnapshots>
89-
<overWriteIfNewer>true</overWriteIfNewer>
90-
</configuration>
91-
</execution>
92-
</executions>
93-
</plugin>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-jar-plugin</artifactId>
97-
<version>3.1.0</version>
98-
<configuration>
99-
<archive>
100-
<manifest>
101-
<addClasspath>true</addClasspath>
102-
<classpathPrefix>lib</classpathPrefix>
103-
<mainClass>org.phoebus.applications.alarm.server.AlarmServerMain</mainClass>
104-
</manifest>
105-
</archive>
106-
</configuration>
107-
</plugin>
50+
<dependency>
51+
<groupId>org.phoebus</groupId>
52+
<artifactId>app-alarm-model</artifactId>
53+
<version>4.6.10-SNAPSHOT</version>
54+
</dependency>
55+
<!--JUL bindings for sfl4j-->
56+
<dependency>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-jdk14</artifactId>
59+
<version>1.7.28</version>
60+
</dependency>
61+
</dependencies>
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-dependency-plugin</artifactId>
67+
<executions>
68+
<execution>
69+
<id>copy-dependencies</id>
70+
<phase>prepare-package</phase>
71+
<goals>
72+
<goal>copy-dependencies</goal>
73+
</goals>
74+
<configuration>
75+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
76+
<overWriteReleases>false</overWriteReleases>
77+
<overWriteSnapshots>false</overWriteSnapshots>
78+
<overWriteIfNewer>true</overWriteIfNewer>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-jar-plugin</artifactId>
86+
<version>3.1.0</version>
87+
<configuration>
88+
<archive>
89+
<manifest>
90+
<addClasspath>true</addClasspath>
91+
<classpathPrefix>lib</classpathPrefix>
92+
<mainClass>org.phoebus.applications.alarm.server.AlarmServerMain</mainClass>
93+
</manifest>
94+
</archive>
95+
</configuration>
96+
</plugin>
10897

109-
<!-- Above commands built the product.jar. Need to list all lib/* jars
110-
in the manifest classpath (this adds for example the caj and pvaccess.jar
111-
that's in lib/, but not added by maven-jar-plugin to manifest because it's
112-
a system scope) -->
113-
<plugin>
114-
<artifactId>maven-assembly-plugin</artifactId>
115-
<version>3.1.1</version>
116-
<configuration>
117-
<tarLongFileMode>posix</tarLongFileMode>
118-
<descriptors>
119-
<descriptor>src/main/assembly/assembly.xml</descriptor>
120-
</descriptors>
121-
</configuration>
122-
<executions>
123-
<execution>
124-
<id>make-assembly</id>
125-
<phase>package</phase>
126-
<goals>
127-
<goal>single</goal>
128-
</goals>
129-
</execution>
130-
</executions>
131-
</plugin>
132-
<plugin>
133-
<artifactId>maven-antrun-plugin</artifactId>
134-
<executions>
135-
<execution>
136-
<phase>verify</phase>
137-
<configuration>
138-
<failOnError>true</failOnError>
139-
<tasks>
140-
<echo message="Adding dependencies to product" />
141-
<manifestclasspath property="manifest-classpath"
142-
jarfile="${project.build.directory}/service-alarm-server-${project.version}.jar">
143-
<classpath>
144-
<path>
145-
<fileset dir="${project.build.directory}/lib">
146-
<include name="*.jar" />
147-
</fileset>
148-
</path>
149-
</classpath>
150-
</manifestclasspath>
98+
<!-- Above commands built the product.jar.
99+
Need to list all lib/* jars in the manifest classpath
100+
(this adds for example the caj and pvaccess.jar
101+
that's in lib/, but not added by maven-jar-plugin
102+
to manifest because it's a system scope)
103+
-->
104+
<plugin>
105+
<artifactId>maven-assembly-plugin</artifactId>
106+
<version>3.1.1</version>
107+
<configuration>
108+
<tarLongFileMode>posix</tarLongFileMode>
109+
<descriptors>
110+
<descriptor>src/main/assembly/assembly.xml</descriptor>
111+
</descriptors>
112+
</configuration>
113+
<executions>
114+
<execution>
115+
<id>make-assembly</id>
116+
<phase>package</phase>
117+
<goals>
118+
<goal>single</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
<plugin>
124+
<artifactId>maven-antrun-plugin</artifactId>
125+
<executions>
126+
<execution>
127+
<phase>verify</phase>
128+
<configuration>
129+
<failOnError>true</failOnError>
130+
<tasks>
131+
<echo message="Adding dependencies to product" />
132+
<manifestclasspath property="manifest-classpath" jarfile="${project.build.directory}/service-alarm-server-${project.version}.jar">
133+
<classpath>
134+
<path>
135+
<fileset dir="${project.build.directory}/lib">
136+
<include name="*.jar" />
137+
</fileset>
138+
</path>
139+
</classpath>
140+
</manifestclasspath>
151141

152-
<!-- -->
153-
<echo message="Manifest classpath: ${manifest-classpath}" />
142+
<!--
143+
-->
144+
<echo message="Manifest classpath: ${manifest-classpath}" />
154145

155-
<jar update="true"
156-
destfile="${project.build.directory}/service-alarm-server-${project.version}.jar">
157-
<manifest>
158-
<attribute name="Class-Path" value="${manifest-classpath}" />
159-
</manifest>
160-
</jar>
161-
</tasks>
162-
</configuration>
163-
<goals>
164-
<goal>run</goal>
165-
</goals>
166-
</execution>
167-
</executions>
168-
</plugin>
169-
<plugin>
170-
<groupId>org.sonatype.plugins</groupId>
171-
<artifactId>nexus-staging-maven-plugin</artifactId>
172-
<version>1.6.8</version>
173-
<configuration>
174-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
175-
</configuration>
176-
</plugin>
177-
</plugins>
178-
</build>
146+
<jar update="true" destfile="${project.build.directory}/service-alarm-server-${project.version}.jar">
147+
<manifest>
148+
<attribute name="Class-Path" value="${manifest-classpath}" />
149+
</manifest>
150+
</jar>
151+
</tasks>
152+
</configuration>
153+
<goals>
154+
<goal>run</goal>
155+
</goals>
156+
</execution>
157+
</executions>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.sonatype.plugins</groupId>
161+
<artifactId>nexus-staging-maven-plugin</artifactId>
162+
<version>1.6.8</version>
163+
<configuration>
164+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
165+
</configuration>
166+
</plugin>
167+
</plugins>
168+
</build>
179169
</project>

0 commit comments

Comments
 (0)