Skip to content

Commit b74445c

Browse files
SylvainJugeSylvainJuge
authored
Revert broken release (#3106)
* Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 639c473. * Revert "[maven-release-plugin] prepare release v1.36.1" This reverts commit ca9a6f0.
1 parent 639c473 commit b74445c

File tree

180 files changed

+238
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+238
-208
lines changed

‎apm-agent-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>apm-agent-parent</artifactId>
77
<groupId>co.elastic.apm</groupId>
8-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apm-agent-api</artifactId>

‎apm-agent-attach-cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>apm-agent-parent</artifactId>
55
<groupId>co.elastic.apm</groupId>
6-
<version>1.36.2-SNAPSHOT</version>
6+
<version>1.36.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎apm-agent-attach/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>apm-agent-parent</artifactId>
77
<groupId>co.elastic.apm</groupId>
8-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apm-agent-attach</artifactId>

‎apm-agent-benchmarks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>apm-agent-parent</artifactId>
77
<groupId>co.elastic.apm</groupId>
8-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apm-agent-benchmarks</artifactId>

‎apm-agent-bootstrap/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>apm-agent-parent</artifactId>
77
<groupId>co.elastic.apm</groupId>
8-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apm-agent-bootstrap</artifactId>

‎apm-agent-builds/apm-agent-java8/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
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
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
67
<groupId>co.elastic.apm</groupId>
78
<artifactId>apm-agent-builds</artifactId>
8-
<version>1.36.2-SNAPSHOT</version>
9+
<version>1.36.1-SNAPSHOT</version>
910
</parent>
1011

1112
<artifactId>apm-agent-java8</artifactId>

‎apm-agent-builds/apm-agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>co.elastic.apm</groupId>
77
<artifactId>apm-agent-builds</artifactId>
8-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apm-agent</artifactId>

‎apm-agent-builds/pom.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
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"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<parent>
46
<artifactId>apm-agent-parent</artifactId>
57
<groupId>co.elastic.apm</groupId>
6-
<version>1.36.2-SNAPSHOT</version>
8+
<version>1.36.1-SNAPSHOT</version>
79
</parent>
810
<modelVersion>4.0.0</modelVersion>
911

@@ -524,14 +526,18 @@
524526

525527
</relocations>
526528
<transformers>
527-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
528-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
529+
<transformer
530+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
531+
<transformer
532+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
529533
<manifestEntries>
530534
<Automatic-Module-Name>${project.groupId}.agent</Automatic-Module-Name>
531535
</manifestEntries>
532536
</transformer>
533-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
534-
<transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
537+
<transformer
538+
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
539+
<transformer
540+
implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer"/>
535541
</transformers>
536542
</configuration>
537543
</execution>

‎apm-agent-cached-lookup-key/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>apm-agent-parent</artifactId>
55
<groupId>co.elastic.apm</groupId>
6-
<version>1.36.2-SNAPSHOT</version>
6+
<version>1.36.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎apm-agent-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>apm-agent-parent</artifactId>
55
<groupId>co.elastic.apm</groupId>
6-
<version>1.36.2-SNAPSHOT</version>
6+
<version>1.36.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

0 commit comments

Comments
 (0)