This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new f965e49 remove redunant plugins
f965e49 is described below
commit f965e4917e440327abeb067c6d24ce9292f77f23
Author: Alexey Markevich <[email protected]>
AuthorDate: Thu Feb 13 22:09:42 2020 +0300
remove redunant plugins
---
osgi/bundle/compatible/pom.xml | 56 ------------------------
osgi/bundle/pom.xml | 96 ------------------------------------------
pom.xml | 5 ---
3 files changed, 157 deletions(-)
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index ef6eeea..03006be 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -211,61 +211,5 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.7,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- properties-maven-plugin
- </artifactId>
- <versionRange>
- [1.0-alpha-2,)
- </versionRange>
- <goals>
- <goal>
- read-project-properties
- </goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml
index 3cee8bb..b83fc8f 100644
--- a/osgi/bundle/pom.xml
+++ b/osgi/bundle/pom.xml
@@ -30,102 +30,6 @@
<version>3.4.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <cxf.version>${project.version}</cxf.version>
- <createSourcesJar>false</createSourcesJar>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>create-prop</id>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
- <property name="ant.regexp.regexpimpl"
value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
- <property name="mv" value="${project.version}"
/>
- <echo message="Maven version: ${mv}" />
- <propertyregex property="ov.p1" input="${mv}"
regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1"
defaultValue="0" />
- <propertyregex property="ov.p2" input="${mv}"
regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2"
defaultValue=".0" />
- <propertyregex property="ov.p3" input="${mv}"
regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3"
defaultValue=".0" />
- <propertyregex property="ov.p4" input="${mv}"
regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4"
defaultValue="" />
- <propertyregex property="ov.p1a"
input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2a"
input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p3a"
input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p4a"
input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
- <property name="ov"
value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
- <property name="os" value="${ov.p1a}${ov.p2a}"
/>
- <echo message="OSGi version: ${ov}" />
- <mkdir dir="target" />
- <echo file="target/cxf.osgi.version.txt">
-cxf.osgi.version.clean = ${ov}
-cxf.schema.version = ${os}
- </echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>target/cxf.osgi.version.txt</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Bundle-SymbolicName>${bundle.symbolic.name}.source</Bundle-SymbolicName>
-
<Eclipse-SourceBundle>${bundle.symbolic.name};version="${cxf.osgi.version.clean}"</Eclipse-SourceBundle>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </build>
<modules>
<module>compatible</module>
</modules>
diff --git a/pom.xml b/pom.xml
index 2906f0f..e36981b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,11 +425,6 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin </artifactId>
- <version>1.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
