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.

Sign up for GitHub

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

Jump to bottom

Maven fixes #38

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Maven fixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6df1877
jradius-18; Updating BouncyCastle to v.1.56 (2016) from v.1.44 (2009)
David-Greene-Imprivata Feb 20, 2017
709f20e
Fixes to parent pom.xml
winterheart Jul 25, 2019
1911839
Simplify maven-compiler-plugin configuration
winterheart Jul 25, 2019
5fc9e2d
Remove inherited from parent groupId
winterheart Jul 25, 2019
3626389
replace maven-antrun-plugin with exec-maven-plugin
winterheart Jul 25, 2019
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
1 change: 0 additions & 1 deletion applet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-applet</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.5-SNAPSHOT</version>
Expand Down
11 changes: 0 additions & 11 deletions apps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-apps</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand Down Expand Up @@ -39,16 +38,6 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
9 changes: 0 additions & 9 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-client</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand Down Expand Up @@ -38,14 +37,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
20 changes: 0 additions & 20 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-core</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand Down Expand Up @@ -71,15 +70,6 @@
</exclusion>
</exclusions>
</dependency>

<!--
<dependency>
<groupId>org.gnu</groupId>
<artifactId>gnu-crypto</artifactId>
<version>2.0.1</version>
</dependency>
-->

</dependencies>

<build>
Expand All @@ -91,16 +81,6 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
49 changes: 19 additions & 30 deletions dictionary-min/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-dictionary-min</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand All @@ -26,35 +25,25 @@
<sourceDirectory>target/dictionary-src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<tasks>
<java fork="false" classname="net.jradius.freeradius.RadiusDictionary" maxmemory="800m" failonerror="true">
<classpath>
<path refid="maven.compile.classpath" />
</classpath>
<arg value="net.jradius.dictionary" />
<arg value="${basedir}/../freeradius/dict-min" />
<arg value="${basedir}/target/dictionary-src" />
</java>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>net.jradius.freeradius.RadiusDictionary</mainClass>
<arguments>
<argument>net.jradius.dictionary</argument>
<argument>${basedir}/../freeradius/dict-min</argument>
<argument>${basedir}/target/dictionary-src</argument>
</arguments>
</configuration>
</plugin>
</plugins>

Expand Down
53 changes: 21 additions & 32 deletions dictionary/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-dictionary</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand All @@ -25,37 +24,27 @@
<build>
<sourceDirectory>target/dictionary-src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<configuration>
<tasks>
<java fork="false" classname="net.jradius.freeradius.RadiusDictionary" maxmemory="800m" failonerror="true">
<classpath>
<path refid="maven.compile.classpath" />
</classpath>
<arg value="net.jradius.dictionary" />
<arg value="${basedir}/../freeradius/dict" />
<arg value="${basedir}/target/dictionary-src" />
</java>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>net.jradius.freeradius.RadiusDictionary</mainClass>
<arguments>
<argument>net.jradius.dictionary</argument>
<argument>${basedir}/../freeradius/dict</argument>
<argument>${basedir}/target/dictionary-src</argument>
</arguments>
</configuration>
</plugin>
</plugins>

<pluginManagement>
Expand Down
9 changes: 0 additions & 9 deletions example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-example</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand Down Expand Up @@ -38,14 +37,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
18 changes: 2 additions & 16 deletions extended/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<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>
<groupId>net.jradius</groupId>
<artifactId>jradius-extended</artifactId>
<name>${project.artifactId}-${project.version}</name>
<version>1.1.6-SNAPSHOT</version>
Expand Down Expand Up @@ -30,23 +29,10 @@

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.44</version>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.56</version>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
Loading