Skip to content

Commit

Permalink
Merge pull request #5 from chrismathis/flatten
Browse files Browse the repository at this point in the history 
Use the flatten-maven-plugin to make the plugins downloadable again
  • Loading branch information
@ghaith
ghaith authored Jan 24, 2020
2 parents 51b4682 + 4c3df03 commit 40bdb17
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 84 deletions.
150 changes: 89 additions & 61 deletions plugins/jnario-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,54 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>jnario-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Jnario Maven Plugin</name>
<groupId>org.jnario</groupId>

<parent>
<relativePath>../..</relativePath>
<groupId>org.jnario</groupId>
<artifactId>jnario</artifactId>
<version>${revision}</version>
</parent>
<relativePath>../..</relativePath>
<groupId>org.jnario</groupId>
<artifactId>jnario</artifactId>
<version>${revision}</version>
</parent>


<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<version.maven>3.6.2</version.maven>
</properties>
<repositories>
<repository>
<id>xtend.release</id>
<url>https://oss.sonatype.org/content/repositories/central/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>xtend.release</id>
<url>https://oss.sonatype.org/content/repositories/central/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-maven-plugin</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.smap</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-maven-plugin</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.smap</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.jnario</groupId>
<artifactId>org.jnario.standalone</artifactId>
Expand All @@ -61,26 +62,24 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.4</version>
<scope>provided</scope>
<version>3.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${version.maven}</version>
</dependency>
<!--
See https://github.com/eclipse/xtext/issues/1231
Prevents mvn build exception:
- SecurityException: class "org.eclipse.core.runtime.OperationCanceledException"'s signer information does not match signer information of other classes in the same package
-->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${version.maven}</version>
</dependency>
<!-- See https://github.com/eclipse/xtext/issues/1231 Prevents mvn build
exception: - SecurityException: class "org.eclipse.core.runtime.OperationCanceledException"'s
signer information does not match signer information of other classes in
the same package -->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -113,12 +112,12 @@
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5.2</version>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
</executions>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
</executions>
<configuration>
<goalPrefix>jnario</goalPrefix>
</configuration>
Expand Down Expand Up @@ -160,10 +159,36 @@
<target>1.8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</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.-->
<!--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>
Expand Down Expand Up @@ -201,19 +226,22 @@
<license>
<name>Eclipse Public License v1.0</name>
<comments>
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.htm
</comments>
All rights reserved. This program and the accompanying
materials are made available under the terms of the Eclipse Public
License v1.0 which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.htm
</comments>
</license>
</licenses>
<url>
http://www.jnario.org/
</url>
http://www.jnario.org/
</url>
<inceptionYear>2012</inceptionYear>
<issueManagement>
<system>Github Issues</system>
<url>
https://github.com/sebastianbenz/Jnario/issues
</url>
https://github.com/sebastianbenz/Jnario/issues
</url>
</issueManagement>
<organization>
<name>BMW Car IT</name>
Expand Down
68 changes: 47 additions & 21 deletions plugins/jnario-maven-report-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>report</artifactId>
<packaging>maven-plugin</packaging>
<name>Jnario Maven Report Plugin</name>
<groupId>org.jnario</groupId>

<parent>
<relativePath>../..</relativePath>
<groupId>org.jnario</groupId>
<artifactId>jnario</artifactId>
<version>${revision}</version>
</parent>
<parent>
<relativePath>../..</relativePath>
<groupId>org.jnario</groupId>
<artifactId>jnario</artifactId>
<version>${revision}</version>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -43,7 +44,7 @@
<artifactId>jnario-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down Expand Up @@ -79,26 +80,50 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5.2</version>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
</executions>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -167,7 +192,8 @@
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<!--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>
Expand Down
25 changes: 25 additions & 0 deletions plugins/org.jnario.standalone.maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,33 @@
</exclusions>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
Expand Down
2 changes: 0 additions & 2 deletions plugins/org.jnario.standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@
<artifactId>org.jnario.standalone</artifactId>
<groupId>org.jnario.plugin</groupId>
<packaging>eclipse-plugin</packaging>


</project>

0 comments on commit 40bdb17

Please sign in to comment.