Skip to content

Commit 69a86a5

Browse files
jekhjekh
authored
Merge pull request #574 from jekh/remove-ossrh-parent-pom
Remove ossrh parent pom
2 parents 092d369 + 32051f6 commit 69a86a5

File tree

3 files changed

+141
-93
lines changed

3 files changed

+141
-93
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@ The BrowserMobProxyServer implementation uses native DNS resolution by default,
398398

399399
## Building the latest from source
400400

401-
You'll need maven (`brew install maven` if you're on OS X); use the `release` profile to generate the batch files from this repository.
401+
You'll need maven (`brew install maven` if you're on OS X):
402402

403-
[~]$ mvn -DskipTests -P release
403+
[~]$ mvn -DskipTests
404404

405405
You'll find the standalone BrowserMob Proxy distributable zip at `browsermob-dist/target/browsermob-proxy-2.1.3-SNAPSHOT-bin.zip`. Unzip the contents and run the `browsermob-proxy` or `browsermob-proxy.bat` files in the `bin` directory.
406406

‎browsermob-dist/pom.xml

Lines changed: 61 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<parent>
45
<artifactId>browsermob-proxy</artifactId>
56
<groupId>net.lightbody.bmp</groupId>
@@ -77,93 +78,75 @@
7778
<build>
7879
<defaultGoal>package</defaultGoal>
7980
<plugins>
80-
<!-- Don't create an empty browsermob-proxy-dist jar file unless we are releasing -->
81+
<!-- Don't install the executable jar in the maven repo -->
8182
<plugin>
8283
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-jar-plugin</artifactId>
84+
<artifactId>maven-install-plugin</artifactId>
8485
<configuration>
85-
<skipIfEmpty>true</skipIfEmpty>
86+
<skip>true</skip>
8687
</configuration>
8788
</plugin>
88-
<!-- Don't install the executable jar in the maven repo -->
89+
<!-- Always create the jar file when releasing, to avoid problems with the shade plugin trying to re-shade a shaded jar -->
8990
<plugin>
9091
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-install-plugin</artifactId>
92+
<artifactId>maven-jar-plugin</artifactId>
93+
<version>${maven-jar-plugin.version}</version>
9294
<configuration>
93-
<skip>true</skip>
95+
<forceCreation>true</forceCreation>
96+
<skipIfEmpty>false</skipIfEmpty>
9497
</configuration>
9598
</plugin>
96-
97-
</plugins>
98-
</build>
99-
100-
<profiles>
101-
<profile>
102-
<id>release</id>
103-
<build>
104-
<plugins>
105-
<!-- Always create the jar file when releasing, to avoid problems with the shade plugin trying to re-shade a shaded jar -->
106-
<plugin>
107-
<groupId>org.apache.maven.plugins</groupId>
108-
<artifactId>maven-jar-plugin</artifactId>
109-
<version>${maven-jar-plugin.version}</version>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-shade-plugin</artifactId>
102+
<version>2.4.3</version>
103+
<executions>
104+
<execution>
105+
<phase>package</phase>
106+
<goals>
107+
<goal>shade</goal>
108+
</goals>
109+
<configuration>
110+
<filters>
111+
<filter>
112+
<artifact>*:*</artifact>
113+
<excludes>
114+
<exclude>META-INF/*.SF</exclude>
115+
<exclude>META-INF/*.DSA</exclude>
116+
<exclude>META-INF/*.RSA</exclude>
117+
</excludes>
118+
</filter>
119+
</filters>
120+
<transformers>
121+
<transformer
122+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
123+
<mainClass>net.lightbody.bmp.proxy.Main</mainClass>
124+
</transformer>
125+
</transformers>
126+
<shadedArtifactAttached>false</shadedArtifactAttached>
127+
</configuration>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
<plugin>
132+
<artifactId>maven-assembly-plugin</artifactId>
133+
<version>3.0.0</version>
134+
<executions>
135+
<execution>
136+
<id>make-bundles</id>
137+
<goals>
138+
<goal>single</goal>
139+
</goals>
140+
<phase>package</phase>
110141
<configuration>
111-
<forceCreation>true</forceCreation>
112-
<skipIfEmpty>false</skipIfEmpty>
142+
<descriptors>
143+
<descriptor>assembly.xml</descriptor>
144+
</descriptors>
145+
<finalName>${zip.name}</finalName>
113146
</configuration>
114-
</plugin>
115-
<plugin>
116-
<groupId>org.apache.maven.plugins</groupId>
117-
<artifactId>maven-shade-plugin</artifactId>
118-
<version>2.4.3</version>
119-
<executions>
120-
<execution>
121-
<phase>package</phase>
122-
<goals>
123-
<goal>shade</goal>
124-
</goals>
125-
<configuration>
126-
<filters>
127-
<filter>
128-
<artifact>*:*</artifact>
129-
<excludes>
130-
<exclude>META-INF/*.SF</exclude>
131-
<exclude>META-INF/*.DSA</exclude>
132-
<exclude>META-INF/*.RSA</exclude>
133-
</excludes>
134-
</filter>
135-
</filters>
136-
<transformers>
137-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
138-
<mainClass>net.lightbody.bmp.proxy.Main</mainClass>
139-
</transformer>
140-
</transformers>
141-
<shadedArtifactAttached>false</shadedArtifactAttached>
142-
</configuration>
143-
</execution>
144-
</executions>
145-
</plugin>
146-
<plugin>
147-
<artifactId>maven-assembly-plugin</artifactId>
148-
<version>3.0.0</version>
149-
<executions>
150-
<execution>
151-
<id>make-bundles</id>
152-
<goals>
153-
<goal>single</goal>
154-
</goals>
155-
<phase>package</phase>
156-
<configuration>
157-
<descriptors>
158-
<descriptor>assembly.xml</descriptor>
159-
</descriptors>
160-
<finalName>${zip.name}</finalName>
161-
</configuration>
162-
</execution>
163-
</executions>
164-
</plugin>
165-
</plugins>
166-
</build>
167-
</profile>
168-
</profiles>
147+
</execution>
148+
</executions>
149+
</plugin>
150+
</plugins>
151+
</build>
169152
</project>

‎pom.xml

Lines changed: 78 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,9 @@
1616
<packaging>pom</packaging>
1717

1818
<prerequisites>
19-
<maven>3.0.1</maven>
19+
<maven>3.0.4</maven>
2020
</prerequisites>
2121

22-
<parent>
23-
<groupId>org.sonatype.oss</groupId>
24-
<artifactId>oss-parent</artifactId>
25-
<version>9</version>
26-
</parent>
27-
2822
<licenses>
2923
<license>
3024
<name>The Apache Software License, Version 2.0</name>
@@ -52,6 +46,17 @@
5246
<tag>HEAD</tag>
5347
</scm>
5448

49+
<distributionManagement>
50+
<snapshotRepository>
51+
<id>ossrh</id>
52+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
53+
</snapshotRepository>
54+
<repository>
55+
<id>ossrh</id>
56+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
57+
</repository>
58+
</distributionManagement>
59+
5560
<properties>
5661
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5762
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -128,7 +133,7 @@
128133
<plugin>
129134
<groupId>org.apache.maven.plugins</groupId>
130135
<artifactId>maven-resources-plugin</artifactId>
131-
<version>3.0.1</version>
136+
<version>3.0.2</version>
132137
</plugin>
133138
<plugin>
134139
<groupId>org.apache.maven.plugins</groupId>
@@ -175,11 +180,6 @@
175180
<artifactId>maven-dependency-plugin</artifactId>
176181
<version>2.10</version>
177182
</plugin>
178-
<plugin>
179-
<groupId>org.apache.maven.plugins</groupId>
180-
<artifactId>maven-gpg-plugin</artifactId>
181-
<version>1.6</version>
182-
</plugin>
183183
</plugins>
184184
</pluginManagement>
185185
<plugins>
@@ -441,6 +441,71 @@
441441
</plugins>
442442
</pluginManagement>
443443
<plugins>
444+
<!-- Skipping tests when preparing a release -->
445+
<plugin>
446+
<groupId>org.apache.maven.plugins</groupId>
447+
<artifactId>maven-surefire-plugin</artifactId>
448+
<version>2.19.1</version>
449+
<configuration>
450+
<skipTests>true</skipTests>
451+
</configuration>
452+
</plugin>
453+
<plugin>
454+
<groupId>org.apache.maven.plugins</groupId>
455+
<artifactId>maven-source-plugin</artifactId>
456+
<version>3.0.1</version>
457+
<executions>
458+
<execution>
459+
<id>attach-sources</id>
460+
<phase>package</phase>
461+
<goals>
462+
<goal>jar-no-fork</goal>
463+
</goals>
464+
</execution>
465+
</executions>
466+
</plugin>
467+
<plugin>
468+
<groupId>org.apache.maven.plugins</groupId>
469+
<artifactId>maven-javadoc-plugin</artifactId>
470+
<version>2.10.4</version>
471+
<executions>
472+
<execution>
473+
<id>attach-javadocs</id>
474+
<phase>package</phase>
475+
<goals>
476+
<goal>jar</goal>
477+
</goals>
478+
<configuration>
479+
<additionalparam>${javadoc.opts}</additionalparam>
480+
</configuration>
481+
</execution>
482+
</executions>
483+
</plugin>
484+
<plugin>
485+
<groupId>org.apache.maven.plugins</groupId>
486+
<artifactId>maven-gpg-plugin</artifactId>
487+
<version>1.6</version>
488+
<executions>
489+
<execution>
490+
<id>sign-artifacts</id>
491+
<phase>verify</phase>
492+
<goals>
493+
<goal>sign</goal>
494+
</goals>
495+
</execution>
496+
</executions>
497+
</plugin>
498+
<plugin>
499+
<groupId>org.sonatype.plugins</groupId>
500+
<artifactId>nexus-staging-maven-plugin</artifactId>
501+
<version>1.6.7</version>
502+
<extensions>true</extensions>
503+
<configuration>
504+
<serverId>ossrh</serverId>
505+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
506+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
507+
</configuration>
508+
</plugin>
444509
<plugin>
445510
<groupId>org.apache.maven.plugins</groupId>
446511
<artifactId>maven-release-plugin</artifactId>

0 commit comments

Comments
 (0)