Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Http Client #400

Merged
merged 3 commits into from
Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 48 additions & 39 deletions lang-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<artifactId>commons-compress</artifactId>
<scope>test</scope>
</dependency>

<!-- Used to mock REST services -->
<dependency>
<groupId>com.xebialabs.restito</groupId>
Expand All @@ -110,18 +110,48 @@

<build>
<plugins>
<!-- Plugin configuration to create a JAR archive that can be used for
instrumentation. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>


<!-- Include changedistiller, which is not available on Maven Central -->
<execution>
<id>1</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>ch.uzh.ifi.seal:changedistiller</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>ch.uzh.ifi.seal:changedistiller</artifact>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>


<!-- For instrumentation with the -agent option, incl. a repackaged
version of httpclient -->
<execution>
<id>2</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
Expand All @@ -132,18 +162,29 @@
</transformers>
<artifactSet>
<includes>
<include>com.sap.research.security.vulas:vulas-core</include>
<include>ch.uzh.ifi.seal:changedistiller</include>
<include>*:*</include>
</includes>
<excludes>
<exclude>ch.uzh.ifi.seal:changedistiller</exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>ch.uzh.ifi.seal:changedistiller</artifact>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/**</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.apache.http</pattern>
<shadedPattern>org.eclipse.steady.repackaged.org.apache.http</shadedPattern>
<includes>
<include>org.apache.http.*</include>
</includes>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand All @@ -164,38 +205,6 @@
</execution>
</executions>
</plugin>

<!-- Plugin configuration to create an assembly with all necessary files. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<index>true</index>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<!-- Required so that the Agent can be used for instrumentation -->
<premain-class>com.sap.psr.vulas.monitor.DynamicTransformer</premain-class>
</manifestEntries>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
39 changes: 0 additions & 39 deletions lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,45 +190,6 @@
</configuration>
</plugin>

<!-- Plugin configuration to create a JAR archive that can be used for
instrumentation. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<premain-class>com.sap.psr.vulas.monitor.DynamicTransformer</premain-class>
</manifestEntries>
</transformer>
</transformers>
<artifactSet>
<includes>
<include>com.sap.research.security.vulas:vulas-core</include>
<include>ch.uzh.ifi.seal:changedistiller</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>ch.uzh.ifi.seal:changedistiller</artifact>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>

<!-- Include Impl and Spec entries in the Manifest. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Loading