Skip to content

Commit

Permalink
update dependencies and prepare for new release
Browse files Browse the repository at this point in the history
  • Loading branch information
@astrapi69
astrapi69 committed Jan 22, 2017
1 parent 07f9213 commit a78bbf2
Show file tree
Hide file tree
Showing 10 changed files with 445 additions and 300 deletions.
2 changes: 1 addition & 1 deletion auth-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>de.alpharogroup</groupId>
<artifactId>mystic-crypt</artifactId>
<version>4.18.0</version>
<version>4.19.0</version>
</parent>

<artifactId>auth-security</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion crypt-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.alpharogroup</groupId>
<artifactId>mystic-crypt</artifactId>
<version>4.18.0</version>
<version>4.19.0</version>
</parent>

<artifactId>crypt-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion crypt-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.alpharogroup</groupId>
<artifactId>mystic-crypt</artifactId>
<version>4.18.0</version>
<version>4.19.0</version>
</parent>

<artifactId>crypt-data</artifactId>
Expand Down
209 changes: 203 additions & 6 deletions mystic-crypt-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>de.alpharogroup</groupId>
<artifactId>mvn-ui-parent</artifactId>
<version>1.6.1</version>
<version>1.7.0</version>
<relativePath></relativePath>
</parent>

<artifactId>mystic-crypt-ui</artifactId>
<version>4.18.0</version>
<version>4.19.0</version>

<properties>
<miglayout-swing.version>5.0</miglayout-swing.version>
Expand Down Expand Up @@ -340,8 +340,8 @@
<configuration>
<archive>
<manifest>
<mainClass>de.alpharogroup.duplicate.files.desktoppane.MainApplication</mainClass>
<packageName>de.alpharogroup.duplicate.files.desktoppane</packageName>
<mainClass>de.alpharogroup.mystic.crypt.MainApplication</mainClass>
<packageName>de.alpharogroup.mystic.crypt</packageName>
</manifest>
<manifestEntries>
<mode>development</mode>
Expand All @@ -362,7 +362,7 @@
</descriptorRefs>
<archive>
<manifest>
<mainClass>de.alpharogroup.duplicate.files.desktoppane.MainApplication</mainClass>
<mainClass>de.alpharogroup.mystic.crypt.MainApplication</mainClass>
</manifest>
</archive>
</configuration>
Expand All @@ -373,7 +373,7 @@
<phase>package</phase>
<!-- append to the packaging phase. -->
<goals>
<goal>attached</goal>
<goal>single</goal>
<!-- goals == mojos -->
</goals>
</execution>
Expand All @@ -385,6 +385,7 @@
</pluginManagement>

<plugins>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
Expand Down Expand Up @@ -523,8 +524,204 @@

</pluginManagement>

<plugins>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
</plugin>

</plugins>

</build>

</profile>



<profile>
<id>prepare-and-release-and-izpack</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>

<build>

<pluginManagement>

<plugins>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>de.alpharogroup.mystic.crypt.MainApplication</mainClass>
<packageName>de.alpharogroup.mystic.crypt</packageName>
</manifest>
<manifestEntries>
<mode>development</mode>
<url>${pom.url}</url>
</manifestEntries>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<!-- NOTE: We don't need a groupId specification because the group
is org.apache.maven.plugins ...which is assumed by default. -->
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>de.alpharogroup.mystic.crypt.MainApplication</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- append to the packaging phase. -->
<goals>
<goal>single</goal>
<!-- goals == mojos -->
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>create-staging-area</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy todir="${izpack.staging}">
<fileset dir="${basedir}/src/izpack" />
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<excludeTransitive>false</excludeTransitive>
<!-- reference our custom panels jar in our installer descriptor
without its version -->
<stripVersion>true</stripVersion>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<excludeScope>system</excludeScope>
</configuration>
<executions>
<execution>
<!-- copy *application* jars to izpack staging lib -->
<id>copy-product-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${izpack.staging}/lib</outputDirectory>
<excludeScope>system</excludeScope>
<!-- this excludes tools.jar, e.g. -->
<excludeArtifactIds>${project.artifactId}</excludeArtifactIds>
<!-- IMPORTANT: don't copy custom panels where our application
jars live -->
<excludeGroupIds>org.codehaus.izpack</excludeGroupIds>
<!-- IMPORTANT: we don't want to copy the IzPack dependency where
our application jars live -->
</configuration>
</execution>
<execution>
<!-- copy izpack custom (custom panels, etc.) jars to izpack staging
custom -->
<id>copy-izpack-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${izpack.staging}/custom</outputDirectory>
<includeArtifactIds>${project.artifactId}</includeArtifactIds>
<!-- IMPORTANT: this causes *only* our custom panels to be copied -->
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>izpack</goal>
</goals>
<configuration>
<!-- base for relative paths in izpack descriptor -->
<baseDir>${izpack.staging}</baseDir>
<installFile>${izpack.dir.app}/install.xml</installFile>
</configuration>
</execution>
</executions>
<dependencies>

<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-panel</artifactId>
<version>${izpack.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>
</plugin>

</plugins>

</pluginManagement>

<plugins>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions mystic-crypt-ui/src/main/java/de/alpharogroup/mystic/crypt/MainFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import org.jdesktop.swingx.JXFrame;

import de.alpharogroup.mystic.crypt.panels.GenerateKeysPanel;
//
//import de.alpharogroup.duplicate.files.controller.FindDuplicateFilesController;
//import de.alpharogroup.duplicate.files.gen.view.FindDuplicateFilesView;
Expand Down Expand Up @@ -101,8 +102,9 @@ private void initComponents() {
// create internal frame
internalFrame = JComponentFactory.newInternalFrame("Random generator", true, true, true, true);

// final FindDuplicateFilesView view = new FindDuplicateFilesView(new FindDuplicateFilesController());
// JInternalFrameExtensions.setViewAndControllerForJInternalFrame(internalFrame, view);

final GenerateKeysPanel component = new GenerateKeysPanel();
JInternalFrameExtensions.addComponentToFrame(internalFrame, component);

JInternalFrameExtensions.addJInternalFrame(desktopPane, internalFrame);

Expand Down
Loading

0 comments on commit a78bbf2

Please sign in to comment.